Merge branch 'master' of ssh://git.planet-lab.org/git/procprotect

diff --git a/Makefile b/Makefile
index a328711..f703516 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
 obj-m += procprotect.o
 
 all:
-       make -C /lib/modules/$(shell uname -r)/build M=$(PWD) modules
+       make -C /lib/modules/3.8.1-201.fc18.x86_64/build M=$(PWD) modules
 
 clean:
-       make -C /lib/modules/$(shell uname -r)/build M=$(PWD) clean
+       make -C /lib/modules/3.8.1-201.fc18.x86_64/build M=$(PWD) clean

diff --git a/procprotect.c b/procprotect.c
index 88e88be..2e8cd13 100644 (file)
--- a/procprotect.c
+++ b/procprotect.c
@@ -2,6 +2,7 @@
 #include <linux/moduleparam.h>
 #include <linux/types.h>
 #include <linux/kernel.h>
+#include <linux/version.h>
 #include <linux/fs_struct.h>
 #include <linux/fs.h>
 #include <linux/mm.h>
@@ -33,7 +34,12 @@
 #error "This code does not support your architecture"
 #endif
 
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,8,0)
+static char *aclpath = "procprotect";
+#else
 static char *aclpath __devinitdata = "procprotect";
+#endif
+
 static struct qstr aclqpath;
 
 module_param(aclpath, charp, 0);