diff options
| author | Dave Airlie <airlied@starflyer.(none)> | 2005-07-07 06:08:27 -0400 |
|---|---|---|
| committer | Dave Airlie <airlied@linux.ie> | 2005-07-07 06:08:27 -0400 |
| commit | 717cb906bd43a9ac00631d600adda5c6546843a6 (patch) | |
| tree | f41b250e9e0fa1e664f002fa9c4608d94527f2f2 /arch/ppc64/kernel/kprobes.c | |
| parent | 22f579c621e2f264e6d093b07d75f99bc97d5df2 (diff) | |
| parent | c101f3136cc98a003d0d16be6fab7d0d950581a6 (diff) | |
Merge ../linux-2.6/
Diffstat (limited to 'arch/ppc64/kernel/kprobes.c')
| -rw-r--r-- | arch/ppc64/kernel/kprobes.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/ppc64/kernel/kprobes.c b/arch/ppc64/kernel/kprobes.c index 1d2ff6d6b0b3..a3d519518fb8 100644 --- a/arch/ppc64/kernel/kprobes.c +++ b/arch/ppc64/kernel/kprobes.c | |||
| @@ -444,7 +444,7 @@ static struct kprobe trampoline_p = { | |||
| 444 | .pre_handler = trampoline_probe_handler | 444 | .pre_handler = trampoline_probe_handler |
| 445 | }; | 445 | }; |
| 446 | 446 | ||
| 447 | int __init arch_init(void) | 447 | int __init arch_init_kprobes(void) |
| 448 | { | 448 | { |
| 449 | return register_kprobe(&trampoline_p); | 449 | return register_kprobe(&trampoline_p); |
| 450 | } | 450 | } |