]> nv-tegra.nvidia Code Review - linux-2.6.git/blobdiff - arch/x86/kernel/setup.c
Merge commit 'v2.6.31-rc8' into x86/txt
[linux-2.6.git] / arch / x86 / kernel / setup.c
index 63f32d220ef22e2d681078ec556698e15ff7645f..61f86f24142068146377c797edc6cf260ea4c217 100644 (file)
@@ -66,6 +66,7 @@
 
 #include <linux/percpu.h>
 #include <linux/crash_dump.h>
+#include <linux/tboot.h>
 
 #include <video/edid.h>
 
@@ -977,6 +978,8 @@ void __init setup_arch(char **cmdline_p)
        paravirt_pagetable_setup_done(swapper_pg_dir);
        paravirt_post_allocator_init();
 
+       tboot_probe();
+
 #ifdef CONFIG_X86_64
        map_vsyscall();
 #endif