git://git.onelab.eu
/
procprotect.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of ssh://git.planet-lab.org/git/procprotect
[procprotect.git]
/
procprotect.c
diff --git
a/procprotect.c
b/procprotect.c
index
1ceea46
..
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/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>
#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
#error "This code does not support your architecture"
#endif
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,8,0)
static char *aclpath = "procprotect";
static char *aclpath = "procprotect";
+#else
+static char *aclpath __devinitdata = "procprotect";
+#endif
+
static struct qstr aclqpath;
module_param(aclpath, charp, 0);
static struct qstr aclqpath;
module_param(aclpath, charp, 0);
@@
-283,11
+289,12
@@
int procfile_write(struct file *file, const char *buffer, unsigned long count, v
static int __init procprotect_init(void)
{
static int __init procprotect_init(void)
{
- printk("Procprotect: starting procprotect version %s with ACLs at path %s.\n",
- VERSION_STR, aclpath);
int ret;
int i;
int ret;
int i;
+ printk("Procprotect: starting procprotect version %s with ACLs at path %s.\n",
+ VERSION_STR, aclpath);
+
for(i=0;i<HASH_SIZE;i++) {
INIT_HLIST_HEAD(&procprotect_hash[i]);
}
for(i=0;i<HASH_SIZE;i++) {
INIT_HLIST_HEAD(&procprotect_hash[i]);
}