2.6.25-rc7

 Documentation

diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
index c417877..508e2a2 100644
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
@@ -34,6 +34,7 @@ parameter is applicable:
    ALSA   ALSA sound support is enabled.
    APIC   APIC support is enabled.
    APM   Advanced Power Management support is enabled.
+   AVR32   AVR32 architecture is enabled.
    AX25   Appropriate AX.25 support is enabled.
    BLACKFIN Blackfin architecture is enabled.
    DRM   Direct Rendering Management support is enabled.
@@ -137,7 +138,7 @@ and is between 256 and 4096 characters. It is defined in the file
          strict -- Be less tolerant of platforms that are not
             strictly ACPI specification compliant.
 
-         See also Documentation/pm.txt, pci=noacpi
+         See also Documentation/power/pm.txt, pci=noacpi
 
    acpi_apic_instance=   [ACPI, IOAPIC]
          Format: <int>
@@ -146,8 +147,10 @@ and is between 256 and 4096 characters. It is defined in the file
          default: 0
 
    acpi_sleep=   [HW,ACPI] Sleep options
-         Format: { s3_bios, s3_mode }
-         See Documentation/power/video.txt
+         Format: { s3_bios, s3_mode, s3_beep }
+         See Documentation/power/video.txt for s3_bios and s3_mode.
+         s3_beep is for debugging; it makes the PC's speaker beep
+         as soon as the kernel's real-mode entry point is called.
 
    acpi_sci=   [HW,ACPI] ACPI System Control Interrupt trigger mode
          Format: { level | edge | high | low }
@@ -167,6 +170,11 @@ and is between 256 and 4096 characters. It is defined in the file
    acpi_irq_isa=   [HW,ACPI] If irq_balance, mark listed IRQs used by ISA
          Format: <irq>,<irq>...
 
+   acpi_new_pts_ordering [HW,ACPI]
+         Enforce the ACPI 2.0 ordering of the _PTS control
+         method wrt putting devices into low power states
+         default: pre ACPI 2.0 ordering of _PTS
+
    acpi_no_auto_ssdt   [HW,ACPI] Disable automatic loading of SSDT
 
    acpi_os_name=   [HW,ACPI] Tell ACPI BIOS the name of the OS
@@ -369,7 +377,8 @@ and is between 256 and 4096 characters. It is defined in the file
          configured.  Potentially dangerous and should only be
          used if you are entirely sure of the consequences.
 
-   chandev=   [HW,NET] Generic channel device initialisation
+   ccw_timeout_log [S390]
+         See Documentation/s390/CommonIO for details.
 
    checkreqprot   [SELINUX] Set initial checkreqprot flag value.
          Format: { "0" | "1" }
@@ -381,6 +390,12 @@ and is between 256 and 4096 characters. It is defined in the file
          Value can be changed at runtime via
             /selinux/checkreqprot.
 
+   cio_ignore=   [S390]
+         See Documentation/s390/CommonIO for details.
+
+   cio_msg=   [S390]
+         See Documentation/s390/CommonIO for details.
+
    clock=      [BUGS=X86-32, HW] gettimeofday clocksource override.
          [Deprecated]
          Forces specified clocksource (if available) to be used
@@ -408,8 +423,21 @@ and is between 256 and 4096 characters. It is defined in the file
          [SPARC64] tick
          [X86-64] hpet,tsc
 
-   code_bytes   [IA32] How many bytes of object code to print in an
-         oops report.
+   clearcpuid=BITNUM [X86]
+         Disable CPUID feature X for the kernel. See
+         include/asm-x86/cpufeature.h for the valid bit numbers.
+         Note the Linux specific bits are not necessarily
+         stable over kernel options, but the vendor specific
+         ones should be.
+         Also note that user programs calling CPUID directly
+         or using the feature without checking anything
+         will still see it. This just prevents it from
+         being used by the kernel or shown in /proc/cpuinfo.
+         Also note the kernel might malfunction if you disable
+         some critical bits.
+
+   code_bytes   [IA32/X86_64] How many bytes of object code to print
+         in an oops report.
          Range: 0 - 8192
          Default: 64
 
@@ -523,7 +551,7 @@ and is between 256 and 4096 characters. It is defined in the file
          1 will print _a lot_ more information - normally
          only useful to kernel developers.
 
-   decnet=      [HW,NET]
+   decnet.addr=   [HW,NET]
          Format: <area>[,<node>]
          See also Documentation/networking/decnet.txt.
 
@@ -562,6 +590,12 @@ and is between 256 and 4096 characters. It is defined in the file
          See drivers/char/README.epca and
          Documentation/digiepca.txt.
 
+   disable_mtrr_trim [X86, Intel and AMD only]
+         By default the kernel will trim any uncacheable
+         memory out of your available memory pool based on
+         MTRR settings.  This parameter disables that behavior,
+         possibly causing your machine to run very slowly.
+
    dmasound=   [HW,OSS] Sound subsystem buffers
 
    dscc4.setup=   [NET]
@@ -652,6 +686,10 @@ and is between 256 and 4096 characters. It is defined in the file
 
    gamma=      [HW,DRM]
 
+   gart_fix_e820=  [X86_64] disable the fix e820 for K8 GART
+         Format: off | on
+         default: on
+
    gdth=      [HW,SCSI]
          See header of drivers/scsi/gdth.c.
 
@@ -671,7 +709,7 @@ and is between 256 and 4096 characters. It is defined in the file
          Format: <cyl>,<head>,<sect>
 
    hd?=      [HW] (E)IDE subsystem
-   hd?lun=      See Documentation/ide.txt.
+   hd?lun=      See Documentation/ide/ide.txt.
 
    highmem=nn[KMG]   [KNL,BOOT] forces the highmem zone to have an exact
          size of <nn>. This works even on boxes that have no
@@ -686,6 +724,7 @@ and is between 256 and 4096 characters. It is defined in the file
          See Documentation/isdn/README.HiSax.
 
    hugepages=   [HW,X86-32,IA-64] Maximal number of HugeTLB pages.
+   hugepagesz=   [HW,IA-64,PPC] The size of the HugeTLB pages.
 
    i8042.direct   [HW] Put keyboard port into non-translated mode
    i8042.dumbkbd   [HW] Pretend that controller can only read data from
@@ -693,6 +732,8 @@ and is between 256 and 4096 characters. It is defined in the file
               (Don't attempt to blink the leds)
    i8042.noaux   [HW] Don't check for auxiliary (== mouse) port
    i8042.nokbd   [HW] Don't check/create keyboard port
+   i8042.noloop   [HW] Disable the AUX Loopback command while probing
+              for the AUX port
    i8042.nomux   [HW] Don't check presence of an active multiplexing
               controller
    i8042.nopnp   [HW] Don't use ACPIPnP / PnPBIOS to discover KBD/AUX
@@ -724,14 +765,14 @@ and is between 256 and 4096 characters. It is defined in the file
 
    ide=      [HW] (E)IDE subsystem
          Format: ide=nodma or ide=doubler or ide=reverse
-         See Documentation/ide.txt.
+         See Documentation/ide/ide.txt.
 
    ide?=      [HW] (E)IDE subsystem
          Format: ide?=noprobe or chipset specific parameters.
-         See Documentation/ide.txt.
+         See Documentation/ide/ide.txt.
 
    idebus=      [HW] (E)IDE subsystem - VLB/PCI bus speed
-         See Documentation/ide.txt.
+         See Documentation/ide/ide.txt.
 
    idle=      [X86]
          Format: idle=poll or idle=mwait
@@ -743,6 +784,9 @@ and is between 256 and 4096 characters. It is defined in the file
          loop use the MONITOR/MWAIT idle loop anyways. Performance should be the same
          as idle=poll.
 
+   ide-pci-generic.all-generic-ide [HW] (E)IDE subsystem
+         Claim all unknown PCI IDE storage controllers.
+
    ignore_loglevel   [KNL]
          Ignore loglevel setting - this will print /all/
          kernel messages to the console. Useful for debugging.
@@ -786,6 +830,16 @@ and is between 256 and 4096 characters. It is defined in the file
          for translation below 32 bit and if not available
          then look in the higher range.
 
+   io_delay=   [X86-32,X86-64] I/O delay method
+      0x80
+         Standard port 0x80 based delay
+      0xed
+         Alternate port 0xed based delay (needed on some systems)
+      udelay
+         Simple two microseconds delay
+      none
+         No delay
+
    io7=      [HW] IO7 for Marvel based alpha systems
          See comment before marvel_specify_io7 in
          arch/alpha/kernel/core_marvel.c.
@@ -895,6 +949,41 @@ and is between 256 and 4096 characters. It is defined in the file
          when set.
          Format: <int>
 
+   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
+         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
+         values are used.  If ID hasn't been specified yet, the
+         configuration applies to all ports, links and devices.
+
+         If only DEVICE is omitted, the parameter applies to
+         the port and all links and devices behind it.  DEVICE
+         number of 0 either selects the first device or the
+         first fan-out link behind PMP device.  It does not
+         select the host link.  DEVICE number of 15 selects the
+         host link and device attached to it.
+
+         The VAL specifies the configuration to force.  As long
+         as there's no ambiguity shortcut notation is allowed.
+         For example, both 1.5 and 1.5G would work for 1.5Gbps.
+         The following configurations can be forced.
+
+         * Cable type: 40c, 80c, short40c, unk, ign or sata.
+           Any ID with matching PORT is used.
+
+         * SATA link speed limit: 1.5Gbps or 3.0Gbps.
+
+         * Transfer mode: pio[0-7], mwdma[0-4] and udma[0-7].
+           udma[/][16,25,33,44,66,100,133] notation is also
+           allowed.
+
+         * [no]ncq: Turn on or off NCQ.
+
+         If there are multiple matching configurations changing
+         the same attribute, the last one is used.
+
    load_ramdisk=   [RAM] List of ramdisks to load from floppy
          See Documentation/ramdisk.txt.
 
@@ -1001,8 +1090,6 @@ and is between 256 and 4096 characters. It is defined in the file
          [SCSI] Maximum number of LUNs received.
          Should be between 1 and 16384.
 
-   mca-pentium   [BUGS=X86-32]
-
    mcatest=   [IA-64]
 
    mce      [X86-32] Machine Check Exception
@@ -1043,6 +1130,10 @@ and is between 256 and 4096 characters. It is defined in the file
    memmap=nn[KMG]$ss[KMG]
          [KNL,ACPI] Mark specific memory as reserved.
          Region of memory to be used, from ss to ss+nn.
+         Example: Exclude memory from 0x18690000-0x1869ffff
+                  memmap=64K$0x18690000
+                  or
+                  memmap=0x10000$0x18690000
 
    meye.*=      [HW] Set MotionEye Camera parameters
          See Documentation/video4linux/meye.txt.
@@ -1051,6 +1142,11 @@ and is between 256 and 4096 characters. It is defined in the file
          Multi-Function General Purpose Timers on AMD Geode
          platforms.
 
+   mfgptfix   [X86-32] Fix MFGPT timers on AMD Geode platforms when
+         the BIOS has incorrectly applied a workaround. TinyBIOS
+         version 0.98 is known to be affected, 0.99 fixes the
+         problem by letting the user disable the workaround.
+
    mga=      [HW,DRM]
 
    mousedev.tap_time=
@@ -1123,6 +1219,10 @@ and is between 256 and 4096 characters. It is defined in the file
          of returning the full 64-bit number.
          The default is to return 64-bit inode numbers.
 
+   nmi_debug=   [KNL,AVR32] Specify one or more actions to take
+         when a NMI is triggered.
+         Format: [state][,regs][,debounce][,die]
+
    nmi_watchdog=   [KNL,BUGS=X86-32] Debugging features for SMP kernels
 
    no387      [BUGS=X86-32] Tells the kernel to use the 387 maths
@@ -1147,6 +1247,8 @@ and is between 256 and 4096 characters. It is defined in the file
 
    nodisconnect   [HW,SCSI,M68K] Disables SCSI disconnects.
 
+   noefi      [X86-32,X86-64] Disable EFI runtime services support.
+
    noexec      [IA-64]
 
    noexec      [X86-32,X86-64]
@@ -1157,6 +1259,8 @@ and is between 256 and 4096 characters. It is defined in the file
          register save and restore. The kernel will only save
          legacy floating-point registers on task switch.
 
+   noclflush   [BUGS=X86] Don't use the CLFLUSH instruction
+
    nohlt      [BUGS=ARM]
 
    no-hlt      [BUGS=X86-32] Tells the kernel that the hlt
@@ -1501,14 +1605,17 @@ and is between 256 and 4096 characters. It is defined in the file
    ramdisk_size=   [RAM] Sizes of RAM disks in kilobytes
          See Documentation/ramdisk.txt.
 
-   rcu.blimit=   [KNL,BOOT] Set maximum number of finished
-         RCU callbacks to process in one batch.
+   rcupdate.blimit=   [KNL,BOOT]
+         Set maximum number of finished RCU callbacks to process
+         in one batch.
 
-   rcu.qhimark=   [KNL,BOOT] Set threshold of queued
+   rcupdate.qhimark=   [KNL,BOOT]
+         Set threshold of queued
          RCU callbacks over which batch limiting is disabled.
 
-   rcu.qlowmark=   [KNL,BOOT] Set threshold of queued
-         RCU callbacks below which batch limiting is re-enabled.
+   rcupdate.qlowmark=   [KNL,BOOT]
+         Set threshold of queued RCU callbacks below which
+         batch limiting is re-enabled.
 
    rdinit=      [KNL]
          Format: <full_path>
@@ -1593,7 +1700,13 @@ and is between 256 and 4096 characters. It is defined in the file
          Format: <vendor>:<model>:<flags>
          (flags are integer value)
 
-   scsi_logging=   [SCSI]
+   scsi_logging_level=   [SCSI] a bit mask of logging levels
+         See drivers/scsi/scsi_logging.h for bits.  Also
+         settable via sysctl at dev.scsi.logging_level
+         (/proc/sys/dev/scsi/logging_level).
+         There is also a nice 'scsi_logging_level' script in the
+         S390-tools package, available for download at
+         http://www-128.ibm.com/developerworks/linux/linux390/s390-tools-1.5.4.html
 
    scsi_mod.scan=   [SCSI] sync (default) scans SCSI busses as they are
          discovered.  async scans them in kernel threads,
@@ -1822,9 +1935,6 @@ and is between 256 and 4096 characters. It is defined in the file
    st=      [HW,SCSI] SCSI tape parameters (buffers, etc.)
          See Documentation/scsi/st.txt.
 
-   st0x=      [HW,SCSI]
-         See header of drivers/scsi/seagate.c.
-
    sti=      [PARISC,HW]
          Format: <num>
          Set the STI (builtin display/keyboard on the HP-PARISC
@@ -1899,9 +2009,6 @@ and is between 256 and 4096 characters. It is defined in the file
          <deci-seconds>: poll all this frequency
          0: no polling (default)
 
-   time      Show timing data prefixed to each printk message line
-         [deprecated, see 'printk.time']
-
    tipar.timeout=   [HW,PPT]
          Set communications timeout in tenths of a second
          (default 15).
@@ -1909,9 +2016,6 @@ and is between 256 and 4096 characters. It is defined in the file
    tipar.delay=   [HW,PPT]
          Set inter-bit delay in microseconds (default 10).
 
-   tmc8xx=      [HW,SCSI]
-         See header of drivers/scsi/seagate.c.
-
    tmscsim=   [HW,SCSI]
          See comment before function dc390_setup() in
          drivers/scsi/tmscsim.c.
@@ -1960,6 +2064,11 @@ and is between 256 and 4096 characters. It is defined in the file
          vdso=1: enable VDSO (default)
          vdso=0: disable VDSO mapping
 
+   vdso32=      [X86-32,X86-64]
+         vdso32=2: enable compat VDSO (default with COMPAT_VDSO)
+         vdso32=1: enable 32-bit VDSO (default)
+         vdso32=0: disable 32-bit VDSO mapping
+
    vector=      [IA-64,SMP]
          vector=percpu: enable percpu vector domain