From: Ingo Molnar <mingo@elte.hu>
Date: Fri, 13 Feb 2009 08:45:09 +0000 (+0100)
Subject: Merge branch 'core/percpu' into x86/core
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=ab639f3593f0b5e4439d549831442c18c3baf989;p=linux-beck.git

Merge branch 'core/percpu' into x86/core
---

ab639f3593f0b5e4439d549831442c18c3baf989
diff --cc arch/x86/Kconfig
index 148c112c9ca4,f760a22f95dc..1042d69b267d
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@@ -191,9 -204,13 +191,13 @@@ config X86_H
  
  config X86_TRAMPOLINE
  	bool
 -	depends on X86_SMP || (X86_VOYAGER && SMP) || (64BIT && ACPI_SLEEP)
 +	depends on SMP || (64BIT && ACPI_SLEEP)
  	default y
  
+ config X86_32_LAZY_GS
+ 	def_bool y
+ 	depends on X86_32 && !CC_STACKPROTECTOR
+ 
  config KTIME_SCALAR
  	def_bool X86_32
  source "init/Kconfig"
@@@ -1339,10 -1356,9 +1343,9 @@@ config CC_STACKPROTECTOR_AL
  
  config CC_STACKPROTECTOR
  	bool "Enable -fstack-protector buffer overflow detection (EXPERIMENTAL)"
- 	depends on X86_64
  	select CC_STACKPROTECTOR_ALL
 -	help
 -          This option turns on the -fstack-protector GCC feature. This
 +	---help---
 +	  This option turns on the -fstack-protector GCC feature. This
  	  feature puts, at the beginning of functions, a canary value on
  	  the stack just before the return address, and validates
  	  the value just before actually returning.  Stack based buffer