diff options
author | 2008-07-11 21:57:40 +1000 | |
---|---|---|
committer | 2008-07-11 21:57:40 +1000 | |
commit | 0306d5efbf897c7d410fd30b89fc7d97372aa501 (patch) | |
tree | 668811bca39ca7c1585da88d52ec2f0a43216c0e /kernel/kprobes.c | |
parent | Merge branch 'for-2.6.26' into for-next (diff) | |
parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6 (diff) | |
download | linux-dev-0306d5efbf897c7d410fd30b89fc7d97372aa501.tar.xz linux-dev-0306d5efbf897c7d410fd30b89fc7d97372aa501.zip |
Merge branch 'master' into for-next
Diffstat (limited to 'kernel/kprobes.c')
-rw-r--r-- | kernel/kprobes.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/kprobes.c b/kernel/kprobes.c index d4998f81e229..1485ca8d0e00 100644 --- a/kernel/kprobes.c +++ b/kernel/kprobes.c @@ -79,7 +79,7 @@ static DEFINE_PER_CPU(struct kprobe *, kprobe_instance) = NULL; * * For such cases, we now have a blacklist */ -struct kprobe_blackpoint kprobe_blacklist[] = { +static struct kprobe_blackpoint kprobe_blacklist[] = { {"preempt_schedule",}, {NULL} /* Terminator */ }; |