diff options
author | Michael Neuling <mikey@neuling.org> | 2013-01-10 09:25:34 -0500 |
---|---|---|
committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2013-01-15 13:25:47 -0500 |
commit | b9818c3312da66f4b83a4a2e8650628be1237cb5 (patch) | |
tree | 3facf032be97c0373ba03ee9bce55bb2955d1f55 /arch/powerpc/kernel/signal.c | |
parent | fa5924640341f714af7757194d5da7ecd66abe2b (diff) |
powerpc: Rename set_break to avoid naming conflict
With allmodconfig we are getting:
drivers/tty/synclink_gt.c:160:12: error: conflicting types for 'set_break'
arch/powerpc/include/asm/debug.h:49:5: note: previous declaration of 'set_break' was here
drivers/tty/synclinkmp.c:526:12: error: conflicting types for 'set_break'
arch/powerpc/include/asm/debug.h:49:5: note: previous declaration of 'set_break' was here
This renames set_break to set_breakpoint to avoid this naming conflict
Signed-off-by: Michael Neuling <mikey@neuling.org>
Reported-by: Fengguang Wu <fengguang.wu@intel.com>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Diffstat (limited to 'arch/powerpc/kernel/signal.c')
-rw-r--r-- | arch/powerpc/kernel/signal.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/kernel/signal.c b/arch/powerpc/kernel/signal.c index 1f26956d3913..3003d890e9ef 100644 --- a/arch/powerpc/kernel/signal.c +++ b/arch/powerpc/kernel/signal.c | |||
@@ -132,7 +132,7 @@ static int do_signal(struct pt_regs *regs) | |||
132 | */ | 132 | */ |
133 | if (current->thread.hw_brk.address && | 133 | if (current->thread.hw_brk.address && |
134 | current->thread.hw_brk.type) | 134 | current->thread.hw_brk.type) |
135 | set_break(¤t->thread.hw_brk); | 135 | set_breakpoint(¤t->thread.hw_brk); |
136 | #endif | 136 | #endif |
137 | /* Re-enable the breakpoints for the signal stack */ | 137 | /* Re-enable the breakpoints for the signal stack */ |
138 | thread_change_pc(current, regs); | 138 | thread_change_pc(current, regs); |