projects / platform / kernel / linux-rpi.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f1d0d14 9298b81)
Merge branch 'x86-cpufeature-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 14 Oct 2014 00:19:47 +0000 (02:19 +0200)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 14 Oct 2014 00:19:47 +0000 (02:19 +0200)
Pull x86 cpufeature updates from Ingo Molnar:
 "This tree includes the following changes:

   - Introduce DISABLED_MASK to list disabled CPU features, to simplify
     CPU feature handling and avoid excessive #ifdefs

   - Remove the lightly used cpu_has_pae() primitive"

* 'x86-cpufeature-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86: Add more disabled features
  x86: Introduce disabled-features
  x86: Axe the lightly-used cpu_has_pae

1  2 
arch/x86/include/asm/cpufeature.h patch | diff1 | diff2 | blob | history
arch/x86/kernel/cpu/common.c patch | diff1 | diff2 | blob | history

diff --cc arch/x86/include/asm/cpufeature.h
Simple merge
diff --cc arch/x86/kernel/cpu/common.c
Simple merge
Domain: System / Kernel;