]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branches 'x86-build-for-linus', 'x86-cleanups-for-linus' and 'x86-debug-for...
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 4 Aug 2014 23:56:16 +0000 (16:56 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 4 Aug 2014 23:56:16 +0000 (16:56 -0700)
commitbe6bbc10e99cc54c2ec257866988c996a5890262
tree4fca9c26cf3bfe6d7834a0fe38dad0a295bbce7d
parent83a8d741f0df5347dca9ba19494c6793335d3549
parenta4b61f75e5caaba4288dc21ca2f12f1d27650d44
parent5d4c2c914dd551fd4eb6807e6eab049a729f6dcc
parent97613d956d209ee92e70c971bb4b34587dbe07f1
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
arch/x86/Makefile
arch/x86/kernel/entry_64.S
arch/x86/kernel/tsc.c