Commit:     7dbb922cea70897dd0e76c6cf8a300b061ca2531
Parent:     1f7d4f8395093021ed2262296179cfe71bd5e2ec
Author:     Olof Johansson <[EMAIL PROTECTED]>
AuthorDate: Thu Jan 31 14:34:47 2008 +1100
Committer:  Paul Mackerras <[EMAIL PROTECTED]>
CommitDate: Thu Feb 7 11:40:18 2008 +1100

    [POWERPC] Fix compilation for CONFIG_DEBUGGER=n and CONFIG_KEXEC=y
    Looks like "[POWERPC] kdump shutdown hook support" broke builds when
    CONFIG_DEBUGGER=n and CONFIG_KEXEC=y, such as in g5_defconfig:
    arch/powerpc/kernel/crash.c: In function 'default_machine_crash_shutdown':
    arch/powerpc/kernel/crash.c:388: error: '__debugger_fault_handler' 
undeclared (first use in this function)
    arch/powerpc/kernel/crash.c:388: error: (Each undeclared identifier is 
reported only once
    arch/powerpc/kernel/crash.c:388: error: for each function it appears in.)
    Move the debugger hooks to under CONFIG_DEBUGGER || CONFIG_KEXEC, since
    that's when the crash code is enabled.
    (I should have caught this with my build-script pre-merge, my bad. :( )
    Signed-off-by: Olof Johansson <[EMAIL PROTECTED]>
    Signed-off-by: Paul Mackerras <[EMAIL PROTECTED]>
 arch/powerpc/kernel/traps.c  |    2 +-
 include/asm-powerpc/system.h |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch/powerpc/kernel/traps.c b/arch/powerpc/kernel/traps.c
index 848a204..4b5b7ff 100644
--- a/arch/powerpc/kernel/traps.c
+++ b/arch/powerpc/kernel/traps.c
@@ -54,7 +54,7 @@
 #include <asm/kexec.h>
+#if defined(CONFIG_DEBUGGER) || defined(CONFIG_KEXEC)
 int (*__debugger)(struct pt_regs *regs);
 int (*__debugger_ipi)(struct pt_regs *regs);
 int (*__debugger_bpt)(struct pt_regs *regs);
diff --git a/include/asm-powerpc/system.h b/include/asm-powerpc/system.h
index bc9739d..8d37283 100644
--- a/include/asm-powerpc/system.h
+++ b/include/asm-powerpc/system.h
@@ -65,7 +65,7 @@
 struct task_struct;
 struct pt_regs;
+#if defined(CONFIG_DEBUGGER) || defined(CONFIG_KEXEC)
 extern int (*__debugger)(struct pt_regs *regs);
 extern int (*__debugger_ipi)(struct pt_regs *regs);
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at

Reply via email to