From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 6 Nov 2008 23:57:24 +0000 (-0800)
Subject: Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: v2.6.28-rc4~23
X-Git-Url: http://www.pilppa.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=a15a82f42c5ee519d28f08c932803a9fd5168fc4;hp=-c;p=linux-2.6-omap-h63xx.git

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:
  Revert "x86: default to reboot via ACPI"
  x86: align DirectMap in /proc/meminfo
  AMD IOMMU: fix lazy IO/TLB flushing in unmap path
  x86: add smp_mb() before sending INVALIDATE_TLB_VECTOR
  x86: remove VISWS and PARAVIRT around NR_IRQS puzzle
  x86: mention ACPI in top-level Kconfig menu
  x86: size NR_IRQS on 32-bit systems the same way as 64-bit
  x86: don't allow nr_irqs > NR_IRQS
  x86/docs: remove noirqbalance param docs
  x86: don't use tsc_khz to calculate lpj if notsc is passed
  x86, voyager: fix smp_intr_init() compile breakage
  AMD IOMMU: fix detection of NP capable IOMMUs
---

a15a82f42c5ee519d28f08c932803a9fd5168fc4
diff --combined Documentation/kernel-parameters.txt
index 8a8cb0ccc5f,de4de3e7bc1..c86c0745971
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
@@@ -995,15 -995,13 +995,15 @@@ and is between 256 and 4096 characters
  			Format:
  			<cpu number>,...,<cpu number>
  			or
 -			<cpu number>-<cpu number>  (must be a positive range in ascending order)
 +			<cpu number>-<cpu number>
 +			(must be a positive range in ascending order)
  			or a mixture
  			<cpu number>,...,<cpu number>-<cpu number>
 +
  			This option can be used to specify one or more CPUs
  			to isolate from the general SMP balancing and scheduling
 -			algorithms. The only way to move a process onto or off
 -			an "isolated" CPU is via the CPU affinity syscalls.
 +			algorithms. You can move a process onto or off an
 +			"isolated" CPU via the CPU affinity syscalls or cpuset.
  			<cpu number> begins at 0 and the maximum value is
  			"number of CPUs in system - 1".
  
@@@ -1472,8 -1470,6 +1472,6 @@@
  			Valid arguments: on, off
  			Default: on
  
- 	noirqbalance	[X86-32,SMP,KNL] Disable kernel irq balancing
- 
  	noirqdebug	[X86-32] Disables the code which attempts to detect and
  			disable unhandled interrupt sources.
  
diff --combined arch/x86/Kconfig
index e60c59b81bd,5d6aa4013dc..4cf0ab13d18
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@@ -1494,7 -1494,7 +1494,7 @@@ config HAVE_ARCH_EARLY_PFN_TO_NI
  	def_bool X86_64
  	depends on NUMA
  
- menu "Power management options"
+ menu "Power management and ACPI options"
  	depends on !X86_VOYAGER
  
  config ARCH_HIBERNATION_HEADER
@@@ -1894,10 -1894,6 +1894,10 @@@ config SYSVIPC_COMPA
  endmenu
  
  
 +config HAVE_ATOMIC_IOMAP
 +	def_bool y
 +	depends on X86_32
 +
  source "net/Kconfig"
  
  source "drivers/Kconfig"