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

* 'x86-asm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  x86: Mark atomic irq ops raw for 32bit legacy
  x86: Merge show_regs()
  x86: Macroise x86 cache descriptors
  x86-32: clean up rwsem inline asm statements
  x86: Merge asm/atomic_{32,64}.h
  x86: Sync asm/atomic_32.h and asm/atomic_64.h
  x86: Split atomic64_t functions into seperate headers
  x86-64: Modify memcpy()/memset() alternatives mechanism
  x86-64: Modify copy_user_generic() alternatives mechanism
  x86: Lift restriction on the location of FIX_BTMAP_*
  x86, core: Optimize hweight32()

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

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

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

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

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

diff --cc arch/x86/kernel/process_64.c
index 126f0b493d049f0e0393d9c5c58d2ebb43fd25fd,418f860880a292cd165fe5e9139c956779afdda3..dc9690b4c4cccf5450a8f49c0aec3bbdb1a86f78
--- 1/arch/x86/kernel/process_64.c
--- 2/arch/x86/kernel/process_64.c
+++ b/arch/x86/kernel/process_64.c
@@@ -208,15 -208,9 +208,9 @@@ void __show_regs(struct pt_regs *regs, 
        get_debugreg(d3, 3);
        get_debugreg(d6, 6);
        get_debugreg(d7, 7);
 -      printk(KERN_INFO "DR3: %016lx DR6: %016lx DR7: %016lx\n", d3, d6, d7);
 +      printk(KERN_DEFAULT "DR3: %016lx DR6: %016lx DR7: %016lx\n", d3, d6, d7);
  }
  
- void show_regs(struct pt_regs *regs)
- {
-       show_registers(regs);
-       show_trace(NULL, regs, (void *)(regs + 1), regs->bp);
- }
- 
  void release_thread(struct task_struct *dead_task)
  {
        if (dead_task->mm) {