diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-07-13 16:23:51 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-07-13 16:23:51 -0400 |
| commit | 327309e899662b482c58cf25f574513d38b5788c (patch) | |
| tree | 069de438aa0e92dd9b6ba28e6b207e2cd07151a5 /arch/i386/kernel/kprobes.c | |
| parent | 0c168775709faa74c1b87f1e61046e0c51ade7f3 (diff) | |
| parent | c32511e2718618f0b53479eb36e07439aa363a74 (diff) | |
Merge upstream 2.6.13-rc3 into ieee80211 branch of netdev-2.6.
Diffstat (limited to 'arch/i386/kernel/kprobes.c')
| -rw-r--r-- | arch/i386/kernel/kprobes.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/i386/kernel/kprobes.c b/arch/i386/kernel/kprobes.c index fc8b17521761..a6d8c45961d3 100644 --- a/arch/i386/kernel/kprobes.c +++ b/arch/i386/kernel/kprobes.c | |||
| @@ -537,7 +537,7 @@ static struct kprobe trampoline_p = { | |||
| 537 | .pre_handler = trampoline_probe_handler | 537 | .pre_handler = trampoline_probe_handler |
| 538 | }; | 538 | }; |
| 539 | 539 | ||
| 540 | int __init arch_init(void) | 540 | int __init arch_init_kprobes(void) |
| 541 | { | 541 | { |
| 542 | return register_kprobe(&trampoline_p); | 542 | return register_kprobe(&trampoline_p); |
| 543 | } | 543 | } |