diff options
| author | Tony Luck <tony.luck@intel.com> | 2005-07-06 18:35:18 -0400 |
|---|---|---|
| committer | Tony Luck <tony.luck@intel.com> | 2005-07-06 18:35:18 -0400 |
| commit | 67d340f440f389e9d56201fb7c7aaa92f262feb1 (patch) | |
| tree | a96c26a370beb23282a561ddd936e5d0aa93adde /arch/ia64/kernel | |
| parent | 2ba3e3e65cf182436757ba13ea8d564e2950fb56 (diff) | |
| parent | 159f597a8bd0f1d7650d5e580c93a2666c9c26d1 (diff) | |
Auto merge with /home/aegl/GIT/linus
Diffstat (limited to 'arch/ia64/kernel')
| -rw-r--r-- | arch/ia64/kernel/kprobes.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/ia64/kernel/kprobes.c b/arch/ia64/kernel/kprobes.c index 3aa3167edbec..884f5cd27d8a 100644 --- a/arch/ia64/kernel/kprobes.c +++ b/arch/ia64/kernel/kprobes.c | |||
| @@ -713,7 +713,7 @@ static struct kprobe trampoline_p = { | |||
| 713 | .pre_handler = trampoline_probe_handler | 713 | .pre_handler = trampoline_probe_handler |
| 714 | }; | 714 | }; |
| 715 | 715 | ||
| 716 | int __init arch_init(void) | 716 | int __init arch_init_kprobes(void) |
| 717 | { | 717 | { |
| 718 | trampoline_p.addr = | 718 | trampoline_p.addr = |
| 719 | (kprobe_opcode_t *)((struct fnptr *)kretprobe_trampoline)->ip; | 719 | (kprobe_opcode_t *)((struct fnptr *)kretprobe_trampoline)->ip; |