diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-03-16 13:10:02 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-03-16 13:10:02 -0400 |
| commit | e7fd3b4669f5b835c8afce28425d9f698a558115 (patch) | |
| tree | d7f254a1d75807cc8b50f416ba3bd13010913ddc /arch/x86/Kconfig | |
| parent | fc82e1d59a24cbac01c49d4eb3b28d6abc26a5f4 (diff) | |
| parent | 2ae9d293b14d17f35eff624272cfecac7979a2ee (diff) | |
Merge branch 'x86-trampoline-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'x86-trampoline-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
x86: Fix binutils-2.21 symbol related build failures
x86-64, trampoline: Remove unused variable
x86, reboot: Fix the use of passed arguments in 32-bit BIOS reboot
x86, reboot: Move the real-mode reboot code to an assembly file
x86: Make the GDT_ENTRY() macro in <asm/segment.h> safe for assembly
x86, trampoline: Use the unified trampoline setup for ACPI wakeup
x86, trampoline: Common infrastructure for low memory trampolines
Fix up trivial conflicts in arch/x86/kernel/Makefile
Diffstat (limited to 'arch/x86/Kconfig')
| -rw-r--r-- | arch/x86/Kconfig | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig index fe6a5f8c9568..e1f65c46bc93 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig | |||
| @@ -221,10 +221,6 @@ config X86_HT | |||
| 221 | def_bool y | 221 | def_bool y |
| 222 | depends on SMP | 222 | depends on SMP |
| 223 | 223 | ||
| 224 | config X86_TRAMPOLINE | ||
| 225 | def_bool y | ||
| 226 | depends on SMP || (64BIT && ACPI_SLEEP) | ||
| 227 | |||
| 228 | config X86_32_LAZY_GS | 224 | config X86_32_LAZY_GS |
| 229 | def_bool y | 225 | def_bool y |
| 230 | depends on X86_32 && !CC_STACKPROTECTOR | 226 | depends on X86_32 && !CC_STACKPROTECTOR |