x86/reboot changes for v3.5

Linus,

Please pull the latest x86-reboot-for-linus git tree from:

git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git x86-reboot-for-linus

HEAD: 3aac27aba79b7c52e709ef6de0f7d8139caedc01 x86/reboot: Update nonmi_ipi parameter

The biggest change is a gentler method of rebooting/stopping via IRQs first and then via NMIs. There are several cleanups in the tree as well.

Thanks,

Ingo

------------------>
Don Zickus (3):
Revert "x86, reboot: Use NMI instead of REBOOT_VECTOR to stop cpus" x86/reboot: Use NMI to assist in shutting down if IRQ fails x86/reboot: Update nonmi_ipi parameter

He Chunhui (1):
x86, boot: Fix port argument to inl() function

Michael D Labriola (2):
x86/reboot: Reduce to a single DMI table for reboot quirks x86/reboot: Clean up coding style

 arch/x86/boot/boot.h     |   2 +-
 arch/x86/kernel/reboot.c | 277 ++++++++++++++++++++++++-----------------------
 arch/x86/kernel/smp.c    | 100 ++++++++---------
 3 files changed, 186 insertions(+), 193 deletions(-)

index c7093bd..18997e5 100644
@@ -67,7 +67,7 @@ static inline void outl(u32 v, u16 port)
 {
 	asm volatile("outl %0,%1" : : "a" (v), "dN" (port));
 }
-static inline u32 inl(u32 port)
+static inline u32 inl(u16 port)
 {
 	u32 v;
 	asm volatile("inl %1,%0" : "=a" (v) : "dN" (port));