summaryrefslogtreecommitdiff
path: root/kernel/sys.c
diff options
context:
space:
mode:
authorJeff Garzik <jgarzik@pobox.com>2005-12-12 22:03:53 -0500
committerJeff Garzik <jgarzik@pobox.com>2005-12-12 22:03:53 -0500
commit9da305eb089c94c535d1790fd2dec16f44c1689f (patch)
treef37f07f148fd7a793233c7f15c0fa9f46212049d /kernel/sys.c
parentd96212ed87d032d2d830e265aae14038dc1f8ad8 (diff)
parent14ee0a1414536d27bc29373bf23c106b8ef8ce0b (diff)
Merge branch 'master'
Diffstat (limited to 'kernel/sys.c')
-rw-r--r--kernel/sys.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/kernel/sys.c b/kernel/sys.c
index bce933ebb29f..eecf84526afe 100644
--- a/kernel/sys.c
+++ b/kernel/sys.c
@@ -32,6 +32,7 @@
#include <linux/compat.h>
#include <linux/syscalls.h>
+#include <linux/kprobes.h>
#include <asm/uaccess.h>
#include <asm/io.h>
@@ -168,7 +169,7 @@ EXPORT_SYMBOL(notifier_chain_unregister);
* of the last notifier function called.
*/
-int notifier_call_chain(struct notifier_block **n, unsigned long val, void *v)
+int __kprobes notifier_call_chain(struct notifier_block **n, unsigned long val, void *v)
{
int ret=NOTIFY_DONE;
struct notifier_block *nb = *n;