From f098eb6d221b4b0ae8451cdbe0286c626ab6ee62 Mon Sep 17 00:00:00 2001 From: "Frank Ch. Eigler" Date: Sun, 23 Aug 2009 18:18:21 -0400 Subject: PR10551: build compatibility for pax/grsecurity include/linux/module.h This patch adapts to patches such as: diff -urNp linux-2.6.29.6/include/linux/module.h linux-2.6.29.6/include/linux/module.h --- linux-2.6.29.6/include/linux/module.h 2009-07-02 19:41:20.000000000 -0400 +++ linux-2.6.29.6/include/linux/module.h 2009-07-30 17:59:26.175602427 -0400 @@ -278,16 +278,16 @@ struct module int (*init)(void); /* If this is non-NULL, vfree after init() returns */ - void *module_init; + void *module_init_rx, *module_init_rw; /* Here is the actual code + data, vfree'd on unload. */ - void *module_core; + void *module_core_rx, *module_core_rw; /* Here are the sizes of the init and core sections */ - unsigned int init_size, core_size; + unsigned int init_size_rw, core_size_rw; /* The size of the executable code in each section. */ - unsigned int init_text_size, core_text_size; + unsigned int init_size_rx, core_size_rx; * runtime/autoconf-grsecurity.c: New test. * buildrun.cxx: Try it. * runtime/print.c: Use it. --- buildrun.cxx | 1 + 1 file changed, 1 insertion(+) (limited to 'buildrun.cxx') diff --git a/buildrun.cxx b/buildrun.cxx index 796663e0..1820002d 100644 --- a/buildrun.cxx +++ b/buildrun.cxx @@ -154,6 +154,7 @@ compile_pass (systemtap_session& s) output_autoconf(s, o, "autoconf-procfs-owner.c", "STAPCONF_PROCFS_OWNER", NULL); output_autoconf(s, o, "autoconf-alloc-percpu-align.c", "STAPCONF_ALLOC_PERCPU_ALIGN", NULL); output_autoconf(s, o, "autoconf-x86-gs.c", "STAPCONF_X86_GS", NULL); + output_autoconf(s, o, "autoconf-grsecurity.c", "STAPCONF_GRSECURITY", NULL); #if 0 /* NB: For now, the performance hit of probe_kernel_read/write (vs. our -- cgit