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

* 'x86/for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (821 commits)
  x86: make 64bit hpet_set_mapping to use ioremap too, v2
  x86: get x86_phys_bits early
  x86: max_low_pfn_mapped fix #4
  x86: change _node_to_cpumask_ptr to return const ptr
  x86: I/O APIC: remove an IRQ2-mask hack
  x86: fix numaq_tsc_disable calling
  x86, e820: remove end_user_pfn
  x86: max_low_pfn_mapped fix, #3
  x86: max_low_pfn_mapped fix, #2
  x86: max_low_pfn_mapped fix, #1
  x86_64: fix delayed signals
  x86: remove conflicting nx6325 and nx6125 quirks
  x86: Recover timer_ack lost in the merge of the NMI watchdog
  x86: I/O APIC: Never configure IRQ2
  x86: L-APIC: Always fully configure IRQ0
  x86: L-APIC: Set IRQ0 as edge-triggered
  x86: merge dwarf2 headers
  x86: use AS_CFI instead of UNWIND_INFO
  x86: use ignore macro instead of hash comment
  x86: use matching CFI_ENDPROC
  ...

diff --cc arch/x86/kernel/traps_64.c
index f1a95d1,74e9929..2696a68
--- 1/arch/x86/kernel/traps_64.c
--- 2/arch/x86/kernel/traps_64.c
+++ b/arch/x86/kernel/traps_64.c
@@@ -100,11 -103,32 +103,9 @@@ static inline void preempt_conditional_
        dec_preempt_count();
  }
  
- int kstack_depth_to_print = 12;
- 
  void printk_address(unsigned long address, int reliable)
  {
 -#ifdef CONFIG_KALLSYMS
 -      unsigned long offset = 0, symsize;
 -      const char *symname;
 -      char *modname;
 -      char *delim = ":";
 -      char namebuf[KSYM_NAME_LEN];
 -      char reliab[4] = "";
 -
 -      symname = kallsyms_lookup(address, &symsize, &offset,
 -                                      &modname, namebuf);
 -      if (!symname) {
 -              printk(" [<%016lx>]\n", address);
 -              return;
 -      }
 -      if (!reliable)
 -              strcpy(reliab, "? ");
 -
 -      if (!modname)
 -              modname = delim = "";
 -      printk(" [<%016lx>] %s%s%s%s%s+0x%lx/0x%lx\n",
 -              address, reliab, delim, modname, delim, symname, offset, symsize);
 -#else
 -      printk(" [<%016lx>]\n", address);
 -#endif
 +      printk(" [<%016lx>] %s%pS\n", address, reliable ? "": "? ", (void *) address);
  }
  
  static unsigned long *in_exception_stack(unsigned cpu, unsigned long stack,