lkml.org 
[lkml]   [2010]   [May]   [6]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
From
Subject[PATCH 08/13] powerpc: removing redundant ifdefs
Date
wbr,
jirka


Signed-off-by: Jiri Olsa <jolsa@redhat.com>
---
arch/powerpc/include/asm/vdso_datapage.h | 2 --
arch/powerpc/kernel/traps.c | 2 --
2 files changed, 0 insertions(+), 4 deletions(-)

diff --git a/arch/powerpc/include/asm/vdso_datapage.h b/arch/powerpc/include/asm/vdso_datapage.h
index 13c2c28..7c9cfe9 100644
--- a/arch/powerpc/include/asm/vdso_datapage.h
+++ b/arch/powerpc/include/asm/vdso_datapage.h
@@ -114,9 +114,7 @@ struct vdso_data {

#endif /* CONFIG_PPC64 */

-#ifdef __KERNEL__
extern struct vdso_data *vdso_data;
-#endif

#endif /* __ASSEMBLY__ */

diff --git a/arch/powerpc/kernel/traps.c b/arch/powerpc/kernel/traps.c
index 29d128e..f472ecf 100644
--- a/arch/powerpc/kernel/traps.c
+++ b/arch/powerpc/kernel/traps.c
@@ -1140,14 +1140,12 @@ void __kprobes DebugException(struct pt_regs *regs, unsigned long debug_status)

if (user_mode(regs)) {
current->thread.dbcr0 &= ~DBCR0_IC;
-#ifdef CONFIG_PPC_ADV_DEBUG_REGS
if (DBCR_ACTIVE_EVENTS(current->thread.dbcr0,
current->thread.dbcr1))
regs->msr |= MSR_DE;
else
/* Make sure the IDM bit is off */
current->thread.dbcr0 &= ~DBCR0_IDM;
-#endif
}

_exception(SIGTRAP, regs, TRAP_TRACE, regs->nip);
--
1.6.6.1


\
 
 \ /
  Last update: 2010-05-06 19:41    [W:0.110 / U:2.704 seconds]
©2003-2017 Jasper Spaans. hosted at Digital OceanAdvertise on this site