tree 4fca9c26cf3bfe6d7834a0fe38dad0a295bbce7d
parent 98959948a7ba33cf8c708626e0d2a1456397e1c6
parent a9cfccee6604854aebc70215610b9788667f4fec
parent b08ee5f7e4135d64b8edd769367f8964a725122e
parent 3bab13b015a255b4b812c02670384d7d99a9ca34
author Linus Torvalds <torvalds@linux-foundation.org> 1407196576 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1407196576 -0700

Merge branches 'x86-build-for-linus', 'x86-cleanups-for-linus' and 'x86-debug-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

Pull x86 build/cleanup/debug updates from Ingo Molnar:
 "Robustify the build process with a quirk to avoid GCC reordering
  related bugs.

  Two code cleanups.

  Simplify entry_64.S CFI annotations, by Jan Beulich"

* 'x86-build-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86, build: Change code16gcc.h from a C header to an assembly header

* 'x86-cleanups-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86: Simplify __HAVE_ARCH_CMPXCHG tests
  x86/tsc: Get rid of custom DIV_ROUND() macro

* 'x86-debug-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/debug: Drop several unnecessary CFI annotations