[PATCH] Another small x86-64 merge

 - Remove obsolete wrong do_magic prototype
 - Remove the dependency between ACPI_SLEEP and SOFTWARE_SUSPEND
   some people complained about. Works the same as i386 now.
 - Fix another gcc 3.3 warning in reboot.c
 - Default NMI watchdog to LOCAL_APIC because that works on more
   boxes

arch/x86_64/kernel/Makefile

@@ -16,7 +16,8 @@ obj-$(CONFIG_X86_CPUID)		+= cpuid.o
 obj-$(CONFIG_SMP)		+= smp.o smpboot.o trampoline.o
 obj-$(CONFIG_X86_LOCAL_APIC)	+= apic.o  nmi.o
 obj-$(CONFIG_X86_IO_APIC)	+= io_apic.o mpparse.o
-obj-$(CONFIG_SOFTWARE_SUSPEND)	+= suspend.o suspend_asm.o
+obj-$(CONFIG_PM)		+= suspend.o
+obj-$(CONFIG_SOFTWARE_SUSPEND)	+= suspend_asm.o
 obj-$(CONFIG_EARLY_PRINTK)	+= early_printk.o
 obj-$(CONFIG_GART_IOMMU)	+= pci-gart.o aperture.o
 obj-$(CONFIG_DUMMY_IOMMU)	+= pci-nommu.o pci-dma.o

arch/x86_64/kernel/nmi.c

@@ -42,7 +42,7 @@
 static int nmi_active;
 static int panic_on_timeout;
 
-unsigned int nmi_watchdog = NMI_IO_APIC;
+unsigned int nmi_watchdog = NMI_LOCAL_APIC;
 static unsigned int nmi_hz = HZ;
 unsigned int nmi_perfctr_msr;	/* the MSR to reset in NMI handler */
 int nmi_watchdog_disabled;

arch/x86_64/kernel/reboot.c

@@ -160,7 +160,7 @@ void machine_restart(char * __unused)
 		}
 
 		case BOOT_TRIPLE: 
-		__asm__ __volatile__("lidt %0": :"m" (no_idt));
+		__asm__ __volatile__("lidt (%0)": :"r" (&no_idt));
 		__asm__ __volatile__("int3");
 
 			reboot_type = BOOT_KBD;

drivers/acpi/Kconfig

@@ -69,7 +69,6 @@ config ACPI_SLEEP
 	bool "Sleep States (EXPERIMENTAL)"
 	depends on X86 && ACPI
 	depends on EXPERIMENTAL && PM
-	select SOFTWARE_SUSPEND
 	default y
 	---help---
 	  This option adds support for ACPI suspend states. 

include/asm-x86_64/suspend.h

@@ -44,7 +44,6 @@ extern unsigned long saved_context_eflags;
                        :"r" ((thread)->debugreg##register))
 
 extern void fix_processor_context(void);
-extern int do_magic(int resume);
 
 #ifdef CONFIG_ACPI_SLEEP
 extern unsigned long saved_eip;