Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-01 17:51:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
* '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
This commit is contained in:
Linus Torvalds 2008-09-09 12:23:41 -07:00
commit 93811d94f7
3 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
arch/x86/Kconfig.cpu
View File

@ -382,14 +382,17 @@ config X86_OOSTORE
# P6_NOPs are a relatively minor optimization that require a family >= # P6_NOPs are a relatively minor optimization that require a family >=
# 6 processor, except that it is broken on certain VIA chips. # 6 processor, except that it is broken on certain VIA chips.
# Furthermore, AMD chips prefer a totally different sequence of NOPs # Furthermore, AMD chips prefer a totally different sequence of NOPs
# (which work on all CPUs). As a result, disallow these if we're # (which work on all CPUs). In addition, it looks like Virtual PC
# compiling X86_GENERIC but not X86_64 (these NOPs do work on all # does not understand them.
# x86-64 capable chips); the list of processors in the right-hand clause #
# are the cores that benefit from this optimization. # As a result, disallow these if we're not compiling for X86_64 (these
# NOPs do work on all x86-64 capable chips); the list of processors in
# the right-hand clause are the cores that benefit from this optimization.
# #
config X86_P6_NOP config X86_P6_NOP
def_bool y def_bool y
depends on (X86_64 || !X86_GENERIC) && (M686 || MPENTIUMII || MPENTIUMIII || MPENTIUMM || MCORE2 || MPENTIUM4 || MPSC) depends on X86_64
depends on (MCORE2 || MPENTIUM4 || MPSC)
config X86_TSC config X86_TSC
def_bool y def_bool y

2
arch/x86/kernel/e820.c
View File

@ -1203,7 +1203,7 @@ static int __init parse_memmap_opt(char *p)
if (!p) if (!p)
return -EINVAL; return -EINVAL;
if (!strcmp(p, "exactmap")) { if (!strncmp(p, "exactmap", 8)) {
#ifdef CONFIG_CRASH_DUMP #ifdef CONFIG_CRASH_DUMP
/* /*
* If we are doing a crash dump, we still need to know * If we are doing a crash dump, we still need to know

2
drivers/xen/balloon.c
View File

@ -60,7 +60,7 @@
#define PAGES2KB(_p) ((_p)<<(PAGE_SHIFT-10)) #define PAGES2KB(_p) ((_p)<<(PAGE_SHIFT-10))
#define BALLOON_CLASS_NAME "memory" #define BALLOON_CLASS_NAME "xen_memory"
struct balloon_stats { struct balloon_stats {
/* We aim for 'current allocation' == 'target allocation'. */ /* We aim for 'current allocation' == 'target allocation'. */