diff options
| author | Shane Wang <shane.wang@intel.com> | 2009-09-02 03:25:07 +0200 |
|---|---|---|
| committer | H. Peter Anvin <hpa@zytor.com> | 2009-09-02 03:25:07 +0200 |
| commit | 69575d388603365f2afbf4166df93152df59b165 (patch) | |
| tree | ca3d66668c8ec47befc0adbfa62cf135229bda59 /arch/x86/kernel/reboot.c | |
| parent | x86, intel_txt: Handle ACPI_SLEEP without X86_TRAMPOLINE (diff) | |
| download | linux-69575d388603365f2afbf4166df93152df59b165.tar.xz linux-69575d388603365f2afbf4166df93152df59b165.zip | |
x86, intel_txt: clean up the impact on generic code, unbreak non-x86
Move tboot.h from asm to linux to fix the build errors of intel_txt
patch on non-X86 platforms. Remove the tboot code from generic code
init/main.c and kernel/cpu.c.
Signed-off-by: Shane Wang <shane.wang@intel.com>
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
Diffstat (limited to 'arch/x86/kernel/reboot.c')
| -rw-r--r-- | arch/x86/kernel/reboot.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/x86/kernel/reboot.c b/arch/x86/kernel/reboot.c index 9de01c5d9794..18ce5c04242a 100644 --- a/arch/x86/kernel/reboot.c +++ b/arch/x86/kernel/reboot.c @@ -3,6 +3,7 @@ #include <linux/init.h> #include <linux/pm.h> #include <linux/efi.h> +#include <linux/tboot.h> #include <acpi/reboot.h> #include <asm/io.h> #include <asm/apic.h> @@ -24,8 +25,6 @@ # include <asm/iommu.h> #endif -#include <asm/tboot.h> - /* * Power off function, if any */ |