Prev: [PATCH 04/13] x86: removing redundant ifdef
Next: [PATCH 02/13] ia64: removing redundant ifdef
From: Jiri Olsa on 6 May 2010 13:40
wbr,
jirka


Signed-off-by: Jiri Olsa <jolsa(a)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

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo(a)vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
 | 
Pages: 1
Prev: [PATCH 04/13] x86: removing redundant ifdef
Next: [PATCH 02/13] ia64: removing redundant ifdef