Re: TAKE - Sync kdb v2.0-2.4.17 i386 code with xfs

[Keith Owens <kaos@xxxxxxx>]

On Fri, 4 Jan 2002 16:34:38 -0600, 
Florin Iucha <florin@xxxxxxxxx> wrote:
>I was prompted as expected for "PAGEBUF" and "XFS", but not for kdb. When
>compiling, however, compiling kdb failed. I went into "Kernel Haking" and
>enabled "Kernel Hacking" and disabled kdb.

I missed one set of ifdef during the merge.  Updated in ptools, it will
be in CVS in a couple of hours.

--- linux/arch/i386/kernel/traps.c_1.41 Sat Jan  5 13:30:06 2002
+++ linux/arch/i386/kernel/traps.c_1.42 Sat Jan  5 13:30:06 2002
@@ -581,7 +581,9 @@
                return;
        }
 #endif
+#ifdef CONFIG_KDB
        (void)kdb(KDB_REASON_NMI, reason, regs);
+#endif /* CONFIG_KDB */
        printk("Uhhuh. NMI received for unknown reason %02x.\n", reason);
        printk("Dazed and confused, but trying to continue\n");
        printk("Do you have a strange power saving mode enabled?\n");