linux/drivers/acpi/osl.c, branch v2.6.39-rc2

Merge branch 'linus' into release

2011-03-23T06:34:54Z

Conflicts: arch/x86/kernel/acpi/sleep.c Signed-off-by: Len Brown

Merge branches 'acpi-iomem', 'acpi-pm' and 'acpi-sci' into acpi-next

2011-02-24T19:00:44Z

ACPI: Avoid calling request_irq() many times for the same interrupt

2011-02-24T18:59:00Z

In principle acpi_os_install_interrupt_handler() may be called multiple times for different interrupts, either from acpi_ev_get_gpe_xrupt_block(), or from acpi_ev_install_sci_handler(). However, it always attempts to request the same interrupt, acpi_gbl_FADT.sci_interrupt and it doesn't check whether or not this interrupt has already been requested. Modify this function so that it refuses to request interrupts other than acpi_gbl_FADT.sci_interrupt and change acpi_os_remove_interrupt_handler() so that it refuses to free such interrupts. Use the observation that the only supported ACPI interrupt must be equal to acpi_gbl_FADT.sci_interrupt and drop an unnecessary variable acpi_irq_irq. This change has been tested on Toshiba Portege R500 and HP nx6325 without introducing any visible problems. Signed-off-by: Rafael J. Wysocki

ACPI: Introduce acpi_os_get_iomem()

2011-02-24T18:58:42Z

Introduce function acpi_os_get_iomem() that may be used by its callers to get a reference to an ACPI iomap. Signed-off-by: Rafael J. Wysocki

ACPI: Do not use krefs under a mutex in osl.c

2011-02-24T18:58:42Z

The reference counting of ACPI iomaps is carried out entirely under acpi_ioremap_lock, so it is sufficient to use simple counters instead of krefs for this purpose. Signed-off-by: Rafael J. Wysocki

ACPI: Make acpi_os_map_memory() avoid creating unnecessary mappings

2011-02-24T18:58:41Z

Modify acpi_os_map_memory() so that it doesn't call acpi_os_ioremap() unconditionally every time it is executed (except when acpi_gbl_permanent_mmap is unset), which pretty much defeats the purpose of maintaining the list of ACPI iomaps in osl.c. Signed-off-by: Rafael J. Wysocki

ACPI: Avoid walking the list of memory mappings in osl.c twice in a row

2011-02-24T18:58:41Z

Make acpi_os_unmap_generic_address() use acpi_map_lookup() to find the desired iomap and drop the reference to it directly (and eventually remove it if necessary) instead of calling acpi_os_unmap_memory(), which requires us to walk the list of ACPI iomaps twice in a row (first, to get the virtual address associated with the iomap and second, to get the iomap itself). Signed-off-by: Rafael J. Wysocki

ACPI: Change acpi_ioremap_lock into a mutex

2011-02-24T18:58:41Z

There's no reason why acpi_ioremap_lock has to be a spinlock, because all of the functions it is used in may sleep anyway and there's no reason why it should be locked with interrupts off. Use a mutex instead (that's going to allow us to put some more operations under the lock later). Signed-off-by: Rafael J. Wysocki

ACPI: Do not export functions that are only used in osl.c

2011-02-24T18:58:41Z

The functions acpi_os_map_generic_address() and acpi_os_unmap_generic_address() are only used in drivers/acpi/osl.c, so make them static and remove the extern definitions of them from include/linux/acpi_io.h. Signed-off-by: Rafael J. Wysocki

Merge branch 'master' into for-2.6.39

2011-02-21T08:43:56Z