Merge commit 'v2.6.34-rc7' into perf/nmi

Merge reason: catch up with latest softlockup detector changes.

1 files changed, 52 insertions, 8 deletions

diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
index 736d45602886..839b21b0699a 100644
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
@@ -54,6 +54,7 @@ parameter is applicable:
         IMA     Integrity measurement architecture is enabled.
         IOSCHED More than one I/O scheduler is enabled.
         IP_PNP  IP DHCP, BOOTP, or RARP is enabled.
+        IPV6    IPv6 support is enabled.
         ISAPNP  ISA PnP code is enabled.
         ISDN    Appropriate ISDN support is enabled.
         JOY     Appropriate joystick support is enabled.
@@ -311,14 +312,14 @@ and is between 256 and 4096 characters. It is defined in the file
         aic79xx=        [HW,SCSI]
                         See Documentation/scsi/aic79xx.txt.
 
+        alignment=      [KNL,ARM]
+                        Allow the default userspace alignment fault handler
+                        behaviour to be specified.  Bit 0 enables warnings,
+                        bit 1 enables fixups, and bit 2 sends a segfault.
+
         amd_iommu=      [HW,X86-84]
                         Pass parameters to the AMD IOMMU driver in the system.
                         Possible values are:
-                        isolate - enable device isolation (each device, as far
-                                  as possible, will get its own protection
-                                  domain) [default]
-                        share - put every device behind one IOMMU into the
-                                same protection domain
                         fullflush - enable flushing of IO/TLB entries when
                                     they are unmapped. Otherwise they are
                                     flushed before they will be reused, which
@@ -347,6 +348,9 @@ and is between 256 and 4096 characters. It is defined in the file
                         Change the amount of debugging information output
                         when initialising the APIC and IO-APIC components.
 
+        autoconf=       [IPV6]
+                        See Documentation/networking/ipv6.txt.
+
         show_lapic=     [APIC,X86] Advanced Programmable Interrupt Controller
                         Limit apic dumping. The parameter defines the maximal
                         number of local apics being dumped. Also it is possible
@@ -629,6 +633,12 @@ and is between 256 and 4096 characters. It is defined in the file
                         See drivers/char/README.epca and
                         Documentation/serial/digiepca.txt.
 
+        disable=        [IPV6]
+                        See Documentation/networking/ipv6.txt.
+
+        disable_ipv6=   [IPV6]
+                        See Documentation/networking/ipv6.txt.
+
         disable_mtrr_cleanup [X86]
                         The kernel tries to adjust MTRR layout from continuous
                         to discrete, to make X server driver able to add WB
@@ -1184,7 +1194,7 @@ and is between 256 and 4096 characters. It is defined in the file
 
         libata.force=   [LIBATA] Force configurations.  The format is comma
                         separated list of "[ID:]VAL" where ID is
-                        PORT[:DEVICE].  PORT and DEVICE are decimal numbers
+                        PORT[.DEVICE].  PORT and DEVICE are decimal numbers
                         matching port, link or device.  Basically, it matches
                         the ATA ID string printed on console by libata.  If
                         the whole ID part is omitted, the last PORT and DEVICE
@@ -1729,6 +1739,9 @@ and is between 256 and 4096 characters. It is defined in the file
         nomfgpt         [X86-32] Disable Multi-Function General Purpose
                         Timer usage (for AMD Geode machines).
 
+        nopat           [X86] Disable PAT (page attribute table extension of
+                        pagetables) support.
+
         norandmaps      Don't use address space randomization.  Equivalent to
                         echo 0 > /proc/sys/kernel/randomize_va_space
 
@@ -1772,6 +1785,12 @@ and is between 256 and 4096 characters. It is defined in the file
                         purges which is reported from either PAL_VM_SUMMARY or
                         SAL PALO.
 
+        nr_cpus=        [SMP] Maximum number of processors that an SMP kernel
+                        could support.  nr_cpus=n : n >= 1 limits the kernel to
+                        supporting 'n' processors. Later in runtime you can not
+                        use hotplug cpu feature to put more cpu back to online.
+                        just like you compile the kernel NR_CPUS=n
+
         nr_uarts=       [SERIAL] maximum number of UARTs to be registered.
 
         numa_zonelist_order= [KNL, BOOT] Select zonelist order for NUMA.
@@ -1939,8 +1958,12 @@ and is between 256 and 4096 characters. It is defined in the file
                                 IRQ routing is enabled.
                 noacpi          [X86] Do not use ACPI for IRQ routing
                                 or for PCI scanning.
-                use_crs         [X86] Use _CRS for PCI resource
-                                allocation.
+                use_crs         [X86] Use PCI host bridge window information
+                                from ACPI.  On BIOSes from 2008 or later, this
+                                is enabled by default.  If you need to use this,
+                                please report a bug.
+                nocrs           [X86] Ignore PCI host bridge windows from ACPI.
+                                If you need to use this, please report a bug.
                 routeirq        Do IRQ routing for all PCI devices.
                                 This is normally done in pci_enable_device(),
                                 so this option is a temporary workaround
@@ -1989,6 +2012,14 @@ and is between 256 and 4096 characters. It is defined in the file
                 force   Enable ASPM even on devices that claim not to support it.
                         WARNING: Forcing ASPM on may cause system lockups.
 
+        pcie_pme=       [PCIE,PM] Native PCIe PME signaling options:
+                off     Do not use native PCIe PME signaling.
+                force   Use native PCIe PME signaling even if the BIOS refuses
+                        to allow the kernel to control the relevant PCIe config
+                        registers.
+                nomsi   Do not use MSI for native PCIe PME signaling (this makes
+                        all PCIe root ports use INTx for everything).
+
         pcmv=           [HW,PCMCIA] BadgePAD 4
 
         pd.             [PARIDE]
@@ -2694,6 +2725,13 @@ and is between 256 and 4096 characters. It is defined in the file
                                         medium is write-protected).
                         Example: quirks=0419:aaf5:rl,0421:0433:rc
 
+        userpte=
+                        [X86] Flags controlling user PTE allocations.
+
+                                nohigh = do not allocate PTE pages in
+                                        HIGHMEM regardless of setting
+                                        of CONFIG_HIGHPTE.
+
         vdso=           [X86,SH]
                         vdso=2: enable compat VDSO (default with COMPAT_VDSO)
                         vdso=1: enable VDSO (default)
@@ -2787,6 +2825,12 @@ and is between 256 and 4096 characters. It is defined in the file
                         default x2apic cluster mode on platforms
                         supporting x2apic.
 
+        x86_mrst_timer= [X86-32,APBT]
+                        Choose timer option for x86 Moorestown MID platform.
+                        Two valid options are apbt timer only and lapic timer
+                        plus one apbt timer for broadcast timer.
+                        x86_mrst_timer=apbt_only | lapic_and_apbt
+
         xd=             [HW,XT] Original XT pre-IDE (RLL encoded) disks.
         xd_geo=         See header of drivers/block/xd.c.