Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
x86: fix memmap=exactmap boot argument
x86: disable static NOPLs on 32 bits
xen: fix 2.6.27-rc5 xen balloon driver warnings
+10
-7
+8
-5
arch/x86/Kconfig.cpu
+8
-5
arch/x86/Kconfig.cpu
···
382
382
# P6_NOPs are a relatively minor optimization that require a family >=
383
383
# 6 processor, except that it is broken on certain VIA chips.
384
384
# Furthermore, AMD chips prefer a totally different sequence of NOPs
385
-
# (which work on all CPUs). As a result, disallow these if we're
386
-
# compiling X86_GENERIC but not X86_64 (these NOPs do work on all
387
-
# x86-64 capable chips); the list of processors in the right-hand clause
388
-
# are the cores that benefit from this optimization.
385
+
# (which work on all CPUs). In addition, it looks like Virtual PC
386
+
# does not understand them.
387
+
#
388
+
# As a result, disallow these if we're not compiling for X86_64 (these
389
+
# NOPs do work on all x86-64 capable chips); the list of processors in
390
+
# the right-hand clause are the cores that benefit from this optimization.
389
391
#
390
392
config X86_P6_NOP
391
393
def_bool y
392
-
depends on (X86_64 || !X86_GENERIC) && (M686 || MPENTIUMII || MPENTIUMIII || MPENTIUMM || MCORE2 || MPENTIUM4 || MPSC)
394
+
depends on X86_64
395
+
depends on (MCORE2 || MPENTIUM4 || MPSC)
393
396
394
397
config X86_TSC
395
398
def_bool y
+1
-1
arch/x86/kernel/e820.c
+1
-1
arch/x86/kernel/e820.c