summaryrefslogtreecommitdiffstats
path: root/arch/powerpc/xmon
diff options
context:
space:
mode:
authorMichael Neuling <mikey@neuling.org>2013-01-10 14:25:34 +0000
committerBenjamin Herrenschmidt <benh@kernel.crashing.org>2013-01-16 05:25:47 +1100
commitb9818c3312da66f4b83a4a2e8650628be1237cb5 (patch)
tree3facf032be97c0373ba03ee9bce55bb2955d1f55 /arch/powerpc/xmon
parentfa5924640341f714af7757194d5da7ecd66abe2b (diff)
downloadop-kernel-dev-b9818c3312da66f4b83a4a2e8650628be1237cb5.zip
op-kernel-dev-b9818c3312da66f4b83a4a2e8650628be1237cb5.tar.gz
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/xmon')
-rw-r--r--arch/powerpc/xmon/xmon.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/xmon/xmon.c b/arch/powerpc/xmon/xmon.c
index 529c1ed..13f85de 100644
--- a/arch/powerpc/xmon/xmon.c
+++ b/arch/powerpc/xmon/xmon.c
@@ -747,7 +747,7 @@ static void insert_cpu_bpts(void)
brk.address = dabr.address;
brk.type = (dabr.enabled & HW_BRK_TYPE_DABR) | HW_BRK_TYPE_PRIV_ALL;
brk.len = 8;
- set_break(&brk);
+ set_breakpoint(&brk);
}
if (iabr && cpu_has_feature(CPU_FTR_IABR))
mtspr(SPRN_IABR, iabr->address
OpenPOWER on IntegriCloud