[PACKET]: Fix sparse warnings in af_packet.c

[linux-2.6] / arch / x86 / kernel / reboot_32.c

diff --git a/arch/x86/kernel/reboot_32.c b/arch/x86/kernel/reboot_32.c
index 0d796248866cfcf892f53b5d79717aa9ecf9e10f..bb1a0f889c5ebaed7a42864a9a98ea86e9848e52 100644 (file)
--- a/arch/x86/kernel/reboot_32.c
+++ b/arch/x86/kernel/reboot_32.c
@@ -1,7 +1,3 @@
-/*
- *  linux/arch/i386/kernel/reboot.c
- */
-
 #include <linux/mm.h>
 #include <linux/module.h>
 #include <linux/delay.h>
@@ -15,6 +11,7 @@
 #include <linux/reboot.h>
 #include <asm/uaccess.h>
 #include <asm/apic.h>
+#include <asm/hpet.h>
 #include <asm/desc.h>
 #include "mach_reboot.h"
 #include <asm/reboot_fixups.h>
@@ -79,7 +76,7 @@ __setup("reboot=", reboot_setup);
 /*
  * Some machines require the "reboot=b"  commandline option, this quirk makes that automatic.
  */
-static int __init set_bios_reboot(struct dmi_system_id *d)
+static int __init set_bios_reboot(const struct dmi_system_id *d)
 {
        if (!reboot_thru_bios) {
                reboot_thru_bios = 1;
@@ -330,6 +327,9 @@ static void native_machine_shutdown(void)
 #ifdef CONFIG_X86_IO_APIC
        disable_IO_APIC();
 #endif
+#ifdef CONFIG_HPET_TIMER
+       hpet_disable();
+#endif
 }
 
 void __attribute__((weak)) mach_reboot_fixups(void)