Gitweb: http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=c596b1a38085a041464b9b2c0c200e81ff695634 Commit: c596b1a38085a041464b9b2c0c200e81ff695634 Parent: c1a13ff57ab1ce52a0aae9984594dbfcfbaf68c0 Author: Paul Mundt <[EMAIL PROTECTED]> AuthorDate: Mon Jun 4 10:39:50 2007 +0900 Committer: Paul Mundt <[EMAIL PROTECTED]> CommitDate: Mon Jun 4 10:39:50 2007 +0900
sh: Fix in_nmi symbol build error. If CONFIG_KGDB_NMI is disabled, we're left with a stray in_nmi reference that can't be resolved. Move the symbol under the ifdef, too. Signed-off-by: Paul Mundt <[EMAIL PROTECTED]> --- arch/sh/kernel/cpu/sh3/entry.S | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/arch/sh/kernel/cpu/sh3/entry.S b/arch/sh/kernel/cpu/sh3/entry.S index 659cc08..b0b59d4 100644 --- a/arch/sh/kernel/cpu/sh3/entry.S +++ b/arch/sh/kernel/cpu/sh3/entry.S @@ -320,7 +320,9 @@ skip_restore: .align 2 5: .long 0x00001000 ! DSP +#ifdef CONFIG_KGDB_NMI 6: .long in_nmi +#endif 7: .long 0x30000000 ! common exception handler - 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 http://vger.kernel.org/majordomo-info.html