Merge commit 'v2.6.32-rc3'

1 files changed, 7 insertions, 0 deletions

diff --git a/arch/x86/kernel/reboot.c b/arch/x86/kernel/reboot.c
index a06e8d101844..27349f92a6d7 100644
--- a/arch/x86/kernel/reboot.c
+++ b/arch/x86/kernel/reboot.c
@@ -4,6 +4,7 @@
 #include <linux/pm.h>
 #include <linux/efi.h>
 #include <linux/dmi.h>
+#include <linux/tboot.h>
 #include <acpi/reboot.h>
 #include <asm/io.h>
 #include <asm/apic.h>
@@ -508,6 +509,8 @@ static void native_machine_emergency_restart(void)
         if (reboot_emergency)
                 emergency_vmx_disable_all();
 
+        tboot_shutdown(TB_SHUTDOWN_REBOOT);
+
         /* Tell the BIOS if we want cold or warm reboot */
         *((unsigned short *)__va(0x472)) = reboot_mode;
 
@@ -634,6 +637,8 @@ static void native_machine_halt(void)
         /* stop other cpus and apics */
         machine_shutdown();
 
+        tboot_shutdown(TB_SHUTDOWN_HALT);
+
         /* stop this cpu */
         stop_this_cpu(NULL);
 }
@@ -645,6 +650,8 @@ static void native_machine_power_off(void)
                         machine_shutdown();
                 pm_power_off();
         }
+        /* a fallback in case there is no PM info available */
+        tboot_shutdown(TB_SHUTDOWN_HALT);
 }
 
 struct machine_ops machine_ops = {