Merge branch 'x86-percpu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

* 'x86-percpu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  x86, percpu: Collect hot percpu variables into one cacheline
  x86, percpu: Fix DECLARE/DEFINE_PER_CPU_PAGE_ALIGNED()
  x86, percpu: Add 'percpu_read_stable()' interface for cacheable accesses

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

diff --cc arch/x86/kernel/cpu/common.c
index 55a6abe4039417ec90a1e5aaf8cde29c19c00a9f,1bd88ed978bd70f32c0a3be4d14b6bc268ae02b2..2055fc2b2e6b8967040ce6d7e221c508c6e6bf4e
--- 1/arch/x86/kernel/cpu/common.c
--- 2/arch/x86/kernel/cpu/common.c
+++ b/arch/x86/kernel/cpu/common.c
@@@ -1042,8 -1049,11 +1049,11 @@@ DEFINE_PER_CPU(struct orig_ist, orig_is
  
  #else /* CONFIG_X86_64 */
  
+ DEFINE_PER_CPU(struct task_struct *, current_task) = &init_task;
+ EXPORT_PER_CPU_SYMBOL(current_task);
+ 
  #ifdef CONFIG_CC_STACKPROTECTOR
 -DEFINE_PER_CPU(unsigned long, stack_canary);
 +DEFINE_PER_CPU_ALIGNED(struct stack_canary, stack_canary);
  #endif
  
  /* Make sure %fs and %gs are initialized properly in idle threads */

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

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

diff --cc include/linux/percpu-defs.h
Simple merge