diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-09-15 12:19:20 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-09-15 12:19:20 -0400 |
| commit | 1aaf2e59135fd67321f47c11c64a54aac27014e9 (patch) | |
| tree | 633ffa4db3ac6e8d566cba549510561ffd61d8f4 /kernel | |
| parent | 66a4fe0cb80a9fde8cb173289afb863fd279466a (diff) | |
| parent | 936e894a976dd3b0f07f1f6f43c17b77b7e6146d (diff) | |
Merge branch 'x86-txt-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'x86-txt-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
x86, intel_txt: clean up the impact on generic code, unbreak non-x86
x86, intel_txt: Handle ACPI_SLEEP without X86_TRAMPOLINE
x86, intel_txt: Fix typos in Kconfig help
x86, intel_txt: Factor out the code for S3 setup
x86, intel_txt: tboot.c needs <asm/fixmap.h>
intel_txt: Force IOMMU on for Intel TXT launch
x86, intel_txt: Intel TXT Sx shutdown support
x86, intel_txt: Intel TXT reboot/halt shutdown support
x86, intel_txt: Intel TXT boot support
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/cpu.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/kernel/cpu.c b/kernel/cpu.c index 8ce10043e4ac..67a60076dd7e 100644 --- a/kernel/cpu.c +++ b/kernel/cpu.c | |||
| @@ -401,6 +401,7 @@ int disable_nonboot_cpus(void) | |||
| 401 | break; | 401 | break; |
| 402 | } | 402 | } |
| 403 | } | 403 | } |
| 404 | |||
| 404 | if (!error) { | 405 | if (!error) { |
| 405 | BUG_ON(num_online_cpus() > 1); | 406 | BUG_ON(num_online_cpus() > 1); |
| 406 | /* Make sure the CPUs won't be enabled by someone else */ | 407 | /* Make sure the CPUs won't be enabled by someone else */ |