Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 93811d94 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'x86-fixes-for-linus' of... 

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
parents ea81e272 d6be118a

arch/x86/Kconfig.cpu

+8 −5
Original line number Original line Diff line number Diff line
@@ -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

arch/x86/kernel/e820.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -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

drivers/xen/balloon.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -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'. */