Merge branch 'core/percpu' into x86/core

diff --cc arch/x86/Kconfig
index 148c112c9ca4b4a05b44a13a6d61d4329cb71aae,f760a22f95dcc9cfa24d1d84b1fb5bd626da9884..1042d69b267d4489e78365b27ec158d10d06d0c7
--- 1/arch/x86/Kconfig
--- 2/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

diff --cc arch/x86/Makefile
Simple merge

diff --cc arch/x86/include/asm/processor.h
Simple merge

diff --cc arch/x86/include/asm/system.h
Simple merge

diff --cc arch/x86/kernel/cpu/common.c
Simple merge

diff --cc arch/x86/kernel/entry_32.S
Simple merge

diff --cc arch/x86/kernel/head_32.S
Simple merge

diff --cc arch/x86/kernel/traps.c
Simple merge