TAKE 904196 - merge fixups

[Nathan Scott <nathans@xxxxxxxxxxxxxxxxxxxxxxxxx>]

Put back a few odds and ends dropped in the previous kernel merge.

Date:  Tue Apr  6 21:04:16 PDT 2004
Workarea:  sherman.melbourne.sgi.com:/build/nathans/2.6.x-xfs

The following file(s) were checked into:
  bonnie.engr.sgi.com:/isms/linux/2.6.x-xfs


Modid:  2.6.x-xfs:linux:169795a
arch/i386/kernel/entry.S - 1.7
arch/i386/kernel/i8259.c - 1.8
arch/i386/kernel/io_apic.c - 1.9
arch/i386/kernel/nmi.c - 1.7
arch/i386/kernel/reboot.c - 1.7
arch/i386/kernel/smpboot.c - 1.8
arch/i386/kernel/traps.c - 1.7
fs/Kconfig - 1.9