Merge branch 'x86/uaccess' into core/percpu

diff --cc arch/x86/include/asm/paravirt.h
index c85e747,32bc6c2..ff69173
--- 1/arch/x86/include/asm/paravirt.h
--- 2/arch/x86/include/asm/paravirt.h
+++ b/arch/x86/include/asm/paravirt.h
@@@ -1466,13 -1387,8 +1466,11 @@@ static inline void __set_fixmap(unsigne
  }
  
  void _paravirt_nop(void);
 +u32 _paravirt_ident_32(u32);
 +u64 _paravirt_ident_64(u64);
 +
  #define paravirt_nop  ((void *)_paravirt_nop)
  
- void paravirt_use_bytelocks(void);
- 
  #ifdef CONFIG_SMP
  
  static inline int __raw_spin_is_locked(struct raw_spinlock *lock)

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

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

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