diff options
| author |   Shane Wang <shane.wang@intel.com> | 2009-09-01 18:25:07 -0700 |
|---|---|---|
| committer |   H. Peter Anvin <hpa@zytor.com> | 2009-09-01 18:25:07 -0700 |
| commit | 69575d388603365f2afbf4166df93152df59b165 (patch) | |
| tree | ca3d66668c8ec47befc0adbfa62cf135229bda59 /drivers | |
| parent | x86, intel_txt: Handle ACPI_SLEEP without X86_TRAMPOLINE (diff) | |
| download | linux-dev-69575d388603365f2afbf4166df93152df59b165.tar.xz linux-dev-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 'drivers')
| -rw-r--r-- | drivers/acpi/acpica/hwsleep.c | 2 | ||||
| -rw-r--r-- | drivers/pci/dmar.c | 2 | ||||
| -rw-r--r-- | drivers/pci/intel-iommu.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/drivers/acpi/acpica/hwsleep.c b/drivers/acpi/acpica/hwsleep.c index 8c01dd3724e0..cc22f9a585b0 100644 --- a/drivers/acpi/acpica/hwsleep.c +++ b/drivers/acpi/acpica/hwsleep.c @@ -45,7 +45,7 @@ #include <acpi/acpi.h> #include "accommon.h" #include "actables.h" -#include <asm/tboot.h> +#include <linux/tboot.h> #define _COMPONENT ACPI_HARDWARE ACPI_MODULE_NAME("hwsleep") diff --git a/drivers/pci/dmar.c b/drivers/pci/dmar.c index 0cbc5fd26c3c..ab99783dccec 100644 --- a/drivers/pci/dmar.c +++ b/drivers/pci/dmar.c @@ -33,7 +33,7 @@ #include <linux/timer.h> #include <linux/irq.h> #include <linux/interrupt.h> -#include <asm/tboot.h> +#include <linux/tboot.h> #undef PREFIX #define PREFIX "DMAR:" diff --git a/drivers/pci/intel-iommu.c b/drivers/pci/intel-iommu.c index 2dc72a6d7412..833509b53527 100644 --- a/drivers/pci/intel-iommu.c +++ b/drivers/pci/intel-iommu.c @@ -37,8 +37,8 @@ #include <linux/iommu.h> #include <linux/intel-iommu.h> #include <linux/sysdev.h> +#include <linux/tboot.h> #include <asm/cacheflush.h> -#include <asm/tboot.h> #include <asm/iommu.h> #include "pci.h" |