diff options
author | Frank Ch. Eigler <fche@elastic.org> | 2009-08-23 18:18:21 -0400 |
---|---|---|
committer | Frank Ch. Eigler <fche@elastic.org> | 2009-08-23 18:18:21 -0400 |
commit | f098eb6d221b4b0ae8451cdbe0286c626ab6ee62 (patch) | |
tree | e08522e8361a5ab88d1050a86f7a2711da93eb80 /runtime/autoconf-grsecurity.c | |
parent | 55d8c5d4673f74a3ec2865593524d5f40dfcac0c (diff) | |
download | systemtap-steved-f098eb6d221b4b0ae8451cdbe0286c626ab6ee62.tar.gz systemtap-steved-f098eb6d221b4b0ae8451cdbe0286c626ab6ee62.tar.xz systemtap-steved-f098eb6d221b4b0ae8451cdbe0286c626ab6ee62.zip |
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.
Diffstat (limited to 'runtime/autoconf-grsecurity.c')
-rw-r--r-- | runtime/autoconf-grsecurity.c | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/runtime/autoconf-grsecurity.c b/runtime/autoconf-grsecurity.c new file mode 100644 index 00000000..ee2e4e55 --- /dev/null +++ b/runtime/autoconf-grsecurity.c @@ -0,0 +1,11 @@ +/* PR10551: pax/grsecurity changes linux/module.h */ + +#include <linux/module.h> + +struct module *t; +unsigned size; + +void foo (void) +{ + size += t->init_size_rw + t->init_size_rx + t->core_size_rw + t->core_size_rx; +} |