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 /kernel/cpu.c | |
| parent | 62a3207b8cf3de35368cdc3822b30b82d59eea95 (diff) | |
| download | linux-69575d388603365f2afbf4166df93152df59b165.tar.gz | |
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 'kernel/cpu.c')
| -rw-r--r-- | kernel/cpu.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/kernel/cpu.c b/kernel/cpu.c index ff071e022a85..67a60076dd7e 100644 --- a/kernel/cpu.c +++ b/kernel/cpu.c @@ -14,7 +14,6 @@ #include <linux/kthread.h> #include <linux/stop_machine.h> #include <linux/mutex.h> -#include <asm/tboot.h> #ifdef CONFIG_SMP /* Serializes the updates to cpu_online_mask, cpu_present_mask */ @@ -377,7 +376,7 @@ static cpumask_var_t frozen_cpus; int disable_nonboot_cpus(void) { - int cpu, first_cpu, error, num_cpus = 0; + int cpu, first_cpu, error; error = stop_machine_create(); if (error) @@ -392,7 +391,6 @@ int disable_nonboot_cpus(void) for_each_online_cpu(cpu) { if (cpu == first_cpu) continue; - num_cpus++; error = _cpu_down(cpu, 1); if (!error) { cpumask_set_cpu(cpu, frozen_cpus); @@ -403,8 +401,6 @@ int disable_nonboot_cpus(void) break; } } - /* ensure all CPUs have gone into wait-for-SIPI */ - error |= tboot_wait_for_aps(num_cpus); if (!error) { BUG_ON(num_online_cpus() > 1); |