Merge ../to-linus-stable/
authorLen Brown <len.brown@intel.com>
Mon, 15 Aug 2005 19:49:00 +0000 (15:49 -0400)
committerLen Brown <len.brown@intel.com>
Mon, 15 Aug 2005 19:49:00 +0000 (15:49 -0400)
1  2 
Documentation/kernel-parameters.txt
drivers/acpi/osl.c

index a998a8c2f95baee78ec3080a244a4ff8fa280fa6,3c684ef6352ed820270fbcabd33beffe6cffdbff..3d5cd7a09b2fc1aa56b6c197ee8d35df7116ec4d
@@@ -37,7 -37,7 +37,7 @@@ restrictions referred to are that the r
        IA-32   IA-32 aka i386 architecture is enabled.
        IA-64   IA-64 architecture is enabled.
        IOSCHED More than one I/O scheduler is enabled.
 -      IP_PNP  IP DCHP, BOOTP, or RARP is enabled.
 +      IP_PNP  IP DHCP, BOOTP, or RARP is enabled.
        ISAPNP  ISA PnP code is enabled.
        ISDN    Appropriate ISDN support is enabled.
        JOY     Appropriate joystick support is enabled.
@@@ -159,6 -159,11 +159,11 @@@ running once the system is up
  
        acpi_fake_ecdt  [HW,ACPI] Workaround failure due to BIOS lacking ECDT
  
+       acpi_generic_hotkey [HW,ACPI]
+                       Allow consolidated generic hotkey driver to
+                       over-ride platform specific driver.
+                       See also Documentation/acpi-hotkey.txt.
        ad1816=         [HW,OSS]
                        Format: <io>,<irq>,<dma>,<dma2>
                        See also Documentation/sound/oss/AD1816.
        cpia_pp=        [HW,PPT]
                        Format: { parport<nr> | auto | none }
  
 +      crashkernel=nn[KMG]@ss[KMG]
 +                      [KNL] Reserve a chunk of physical memory to
 +                      hold a kernel to switch to with kexec on panic.
 +
        cs4232=         [HW,OSS]
                        Format: <io>,<irq>,<dma>,<dma2>,<mpuio>,<mpuirq>
  
                        Format: {"as"|"cfq"|"deadline"|"noop"}
                        See Documentation/block/as-iosched.txt
                        and Documentation/block/deadline-iosched.txt for details.
 +      elfcorehdr=     [IA-32]
 +                      Specifies physical address of start of kernel core image
 +                      elf header.
 +                      See Documentation/kdump.txt for details.
  
        enforcing       [SELINUX] Set initial enforcing status.
                        Format: {"0" | "1"}
  
        i810=           [HW,DRM]
  
 +      i8k.ignore_dmi  [HW] Continue probing hardware even if DMI data
 +                      indicates that the driver is running on unsupported
 +                      hardware.
        i8k.force       [HW] Activate i8k driver even if SMM BIOS signature
                        does not match list of supported models.
        i8k.power_status
        ips=            [HW,SCSI] Adaptec / IBM ServeRAID controller
                        See header of drivers/scsi/ips.c.
  
 +      irqfixup        [HW]
 +                      When an interrupt is not handled search all handlers
 +                      for it. Intended to get systems with badly broken
 +                      firmware running.
 +
 +      irqpoll         [HW]
 +                      When an interrupt is not handled search all handlers
 +                      for it. Also check all handlers each timer
 +                      interrupt. Intended to get systems with badly broken
 +                      firmware running.
 +
        isapnp=         [ISAPNP]
                        Format: <RDP>, <reset>, <pci_scan>, <verbosity>
  
        maxcpus=        [SMP] Maximum number of processors that an SMP kernel
                        should make use of
  
 +      max_addr=[KMG]  [KNL,BOOT,ia64] All physical memory greater than or
 +                      equal to this physical address is ignored.
 +
        max_luns=       [SCSI] Maximum number of LUNs to probe
                        Should be between 1 and 2^32-1.
  
                irqmask=0xMMMM          [IA-32] Set a bit mask of IRQs allowed to be assigned
                                        automatically to PCI devices. You can make the kernel
                                        exclude IRQs of your ISA cards this way.
 +              pirqaddr=0xAAAAA        [IA-32] Specify the physical address
 +                                      of the PIRQ table (normally generated
 +                                      by the BIOS) if it is outside the
 +                                      F0000h-100000h range.
                lastbus=N               [IA-32] Scan all buses till bus #N. Can be useful
                                        if the kernel is unable to find your secondary buses
                                        and you want to tell it explicitly which ones they are.
                        See Documentation/ramdisk.txt.
  
        psmouse.proto=  [HW,MOUSE] Highest PS2 mouse protocol extension to
 -                      probe for (bare|imps|exps).
 +                      probe for (bare|imps|exps|lifebook|any).
        psmouse.rate=   [HW,MOUSE] Set desired mouse report rate, in reports
                        per second.
        psmouse.resetafter=
diff --combined drivers/acpi/osl.c
index 7289da3c4db6a28778628337f26e79015de7139d,cb16cc11fee88ad7a27c28af650edbb6697e098a..0d11d6e6abd6d652efab6c2831a81b340c7a50f7
@@@ -71,7 -71,7 +71,7 @@@ EXPORT_SYMBOL(acpi_in_debugger)
  extern char line_buf[80];
  #endif /*ENABLE_DEBUGGER*/
  
- int acpi_specific_hotkey_enabled;
+ int acpi_specific_hotkey_enabled = TRUE;
  EXPORT_SYMBOL(acpi_specific_hotkey_enabled);
  
  static unsigned int acpi_irq_irq;
@@@ -145,14 -145,10 +145,14 @@@ acpi_os_vprintf(const char *fmt, va_lis
  #endif
  }
  
 +extern int acpi_in_resume;
  void *
  acpi_os_allocate(acpi_size size)
  {
 -      return kmalloc(size, GFP_KERNEL);
 +      if (acpi_in_resume)
 +              return kmalloc(size, GFP_ATOMIC);
 +      else
 +              return kmalloc(size, GFP_KERNEL);
  }
  
  void
@@@ -1162,11 -1158,11 +1162,11 @@@ __setup("acpi_wake_gpes_always_on", acp
  int __init
  acpi_hotkey_setup(char *str)
  {
-       acpi_specific_hotkey_enabled = TRUE;
+       acpi_specific_hotkey_enabled = FALSE;
        return 1;
  }
  
- __setup("acpi_specific_hotkey", acpi_hotkey_setup);
+ __setup("acpi_generic_hotkey", acpi_hotkey_setup);
  
  /*
   * max_cstate is defined in the base kernel so modules can