Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6772926b authored Jul 05, 2005 by Rusty Lynch Committed by Linus Torvalds Jul 05, 2005

[PATCH] kprobes: fix namespace problem and sparc64 build



The following renames arch_init, a kprobes function for performing any
architecture specific initialization, to arch_init_kprobes in order to
cleanup the namespace.

Also, this patch adds arch_init_kprobes to sparc64 to fix the sparc64 kprobes
build from the last return probe patch.

Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

parent 4b1294f9

arch/i386/kernel/kprobes.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -537,7 +537,7 @@ static struct kprobe trampoline_p = {
		.pre_handler = trampoline_probe_handler
		};

		int __init arch_init(void)
		int __init arch_init_kprobes(void)
		{
		return register_kprobe(&trampoline_p);
		}

arch/ia64/kernel/kprobes.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -713,7 +713,7 @@ static struct kprobe trampoline_p = {
		.pre_handler = trampoline_probe_handler
		};

		int __init arch_init(void)
		int __init arch_init_kprobes(void)
		{
		trampoline_p.addr =
		(kprobe_opcode_t )((struct fnptr )kretprobe_trampoline)->ip;

arch/ppc64/kernel/kprobes.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -444,7 +444,7 @@ static struct kprobe trampoline_p = {
		.pre_handler = trampoline_probe_handler
		};

		int __init arch_init(void)
		int __init arch_init_kprobes(void)
		{
		return register_kprobe(&trampoline_p);
		}

arch/sparc64/kernel/kprobes.c

+5 −0

Original line number	Diff line number	Diff line
		@@ -433,3 +433,8 @@ int longjmp_break_handler(struct kprobe p, struct pt_regs regs)
		return 0;
		}

		/* architecture specific initialization */
		int arch_init_kprobes(void)
		{
		return 0;
		}

arch/x86_64/kernel/kprobes.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -682,7 +682,7 @@ static struct kprobe trampoline_p = {
		.pre_handler = trampoline_probe_handler
		};

		int __init arch_init(void)
		int __init arch_init_kprobes(void)
		{
		return register_kprobe(&trampoline_p);
		}