diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-07-13 22:52:27 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-07-13 22:52:27 +0200 |
| commit | dbbcfb2211761fa69e831a78119c9288fb87eb9d (patch) | |
| tree | b40b103ed250e287bf3d4790f1c87001cf7cf52f /kernel/kprobes.c | |
| parent | b0356cd0e7497252a2c45ecb07b79d931390c8b2 (diff) | |
| parent | 9df2fe986770bc4c76e8fe72c20b71268eec39a7 (diff) | |
| download | kernel-crypto-dbbcfb2211761fa69e831a78119c9288fb87eb9d.tar.gz kernel-crypto-dbbcfb2211761fa69e831a78119c9288fb87eb9d.tar.xz kernel-crypto-dbbcfb2211761fa69e831a78119c9288fb87eb9d.zip | |
Merge branch 'linus' into x86/pci-ioapic-boot-irq-quirks
Conflicts:
arch/x86/mm/ioremap.c
Signed-off-by: Ingo Molnar <mingo@elte.hu>
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 d4998f81e22..1485ca8d0e0 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 */ }; |