Commit 765426e8 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6 

* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6: (123 commits)
  dock: make dock driver not a module
  ACPI: fix ia64 build warning
  ACPI: hack around sysfs warning with link order
  ACPI suspend: fix build warning when CONFIG_ACPI_SLEEP=n
  intel_menlo: fix build warning
  panasonic-laptop: fix build
  ACPICA: Update version to 20080926
  ACPICA: Add support for zero-length buffer-to-string conversions
  ACPICA: New: Validation for predefined ACPI methods/objects
  ACPICA: Fix for implicit return compatibility
  ACPICA: Fixed a couple memory leaks associated with "implicit return"
  ACPICA: Optimize buffer allocation procedure
  ACPICA: Fix possible memory leak, error exit path
  ACPICA: Fix fault after mem allocation failure in AML parser
  ACPICA: Remove unused ACPI register bit definition
  ACPICA: Update version to 20080829
  ACPICA: Fix possible memory leak in acpi_ns_get_external_pathname
  ACPICA: Cleanup for internal Reference Object
  ACPICA: Update comments - no functional changes
  ACPICA: Update for Reference ACPI_OPERAND_OBJECT
  ...
parents 36ec8918 898b054f

Documentation/kernel-parameters.txt

+46 −15
Original line number Diff line number Diff line
@@ -218,21 +218,48 @@ and is between 256 and 4096 characters. It is defined in the file 
	acpi.debug_level=	[HW,ACPI]

			Format: <int>

			Each bit of the <int> indicates an ACPI debug level,

			1: enable, 0: disable. It is useful for boot time

			debugging. After system has booted up, it can be set

			via /sys/module/acpi/parameters/debug_level.

			CONFIG_ACPI_DEBUG must be enabled for this to produce any output.

			Available bits (add the numbers together) to enable different

			debug output levels of the ACPI subsystem:

			0x01 error 0x02 warn 0x04 init 0x08 debug object

			0x10 info 0x20 init names 0x40 parse 0x80 load

			0x100 dispatch 0x200 execute 0x400 names 0x800 operation region

			0x1000 bfield 0x2000 tables 0x4000 values 0x8000 objects

			0x10000 resources 0x20000 user requests 0x40000 package.

			which corresponds to the level in an ACPI_DEBUG_PRINT

			statement.  After system has booted up, this mask

			can be set via /sys/module/acpi/parameters/debug_level.



			CONFIG_ACPI_DEBUG must be enabled for this to produce

			any output.  The number can be in decimal or prefixed

			with 0x in hex.  Some of these options produce so much

			output that the system is unusable.



			The following global components are defined by the

			ACPI CA:

			       0x01 error

			       0x02 warn

			       0x04 init

			       0x08 debug object

			       0x10 info

			       0x20 init names

			       0x40 parse

			       0x80 load

			      0x100 dispatch

			      0x200 execute

			      0x400 names

			      0x800 operation region

			     0x1000 bfield

			     0x2000 tables

			     0x4000 values

			     0x8000 objects

			    0x10000 resources

			    0x20000 user requests

			    0x40000 package

 			The number can be in decimal or prefixed with 0x in hex.

 			Warning: Many of these options can produce a lot of

 			output and make your system unusable. Be very careful.



 	acpi.power_nocheck=	[HW,ACPI]

 			Format: 1/0 enable/disable the check of power state.

 			On some bogus BIOS the _PSC object/_STA object of

 			power resource can't return the correct device power

 			state. In such case it is unneccessary to check its

 			power state again in power transition.

 			1 : disable the power state check



	acpi_pm_good	[X86-32,X86-64]

			Override the pmtimer bug detection: force the kernel

			to assume that this machine's pmtimer latches its value
@@ -1711,6 +1738,10 @@ and is between 256 and 4096 characters. It is defined in the file 
			Override pmtimer IOPort with a hex value.

			e.g. pmtmr=0x508



	pnp.debug	[PNP]

			Enable PNP debug messages.  This depends on the

			CONFIG_PNP_DEBUG_MESSAGES option.



	pnpacpi=	[ACPI]

			{ off }
@@ -2208,7 +2239,7 @@ and is between 256 and 4096 characters. It is defined in the file 


	thermal.crt=	[HW,ACPI]

			-1: disable all critical trip points in all thermal zones

			<degrees C>: lower all critical trip points

			<degrees C>: override all critical trip points



	thermal.nocrt=	[HW,ACPI]

			Set to disable actions on ACPI thermal zone

Documentation/laptops/acer-wmi.txt

+4 −24
Original line number Diff line number Diff line 
Acer Laptop WMI Extras Driver

http://code.google.com/p/aceracpi

Version 0.1

9th February 2008

Version 0.2

18th August 2008



Copyright 2007-2008 Carlos Corbacho <carlos@strangeworlds.co.uk>
@@ -87,17 +87,7 @@ acer-wmi come with built-in wireless. However, should you feel so inclined to 
ever wish to remove the card, or swap it out at some point, please get in touch

with me, as we may well be able to gain some data on wireless card detection.



To read the status of the wireless radio (0=off, 1=on):

cat /sys/devices/platform/acer-wmi/wireless



To enable the wireless radio:

echo 1 > /sys/devices/platform/acer-wmi/wireless



To disable the wireless radio:

echo 0 > /sys/devices/platform/acer-wmi/wireless



To set the state of the wireless radio when loading acer-wmi, pass:

wireless=X (where X is 0 or 1)

The wireless radio is exposed through rfkill.



Bluetooth

*********
@@ -117,17 +107,7 @@ For the adventurously minded - if you want to buy an internal bluetooth 
module off the internet that is compatible with your laptop and fit it, then

it will work just fine with acer-wmi.



To read the status of the bluetooth module (0=off, 1=on):

cat /sys/devices/platform/acer-wmi/wireless



To enable the bluetooth module:

echo 1 > /sys/devices/platform/acer-wmi/bluetooth



To disable the bluetooth module:

echo 0 > /sys/devices/platform/acer-wmi/bluetooth



To set the state of the bluetooth module when loading acer-wmi, pass:

bluetooth=X (where X is 0 or 1)

Bluetooth is exposed through rfkill.



3G

**

MAINTAINERS

+13 −2
Original line number Diff line number Diff line
@@ -1433,8 +1433,8 @@ M: rdunlap@xenotime.net 
S:	Maintained



DOCKING STATION DRIVER

P:	Kristen Carlson Accardi

M:	kristen.c.accardi@intel.com

P:	Shaohua Li

M:	shaohua.li@intel.com

L:	linux-acpi@vger.kernel.org

S:	Supported
@@ -2109,6 +2109,12 @@ L: linux-ide@vger.kernel.org 
L:	linux-scsi@vger.kernel.org

S:	Orphan



IDLE-I7300

P:	Andy Henroid

M:	andrew.d.henroid@intel.com

L:	linux-pm@lists.linux-foundation.org

S:	Supported



IEEE 1394 SUBSYSTEM (drivers/ieee1394)

P:	Ben Collins

M:	ben.collins@ubuntu.com
@@ -3186,6 +3192,11 @@ M: olof@lixom.net 
L:	i2c@lm-sensors.org

S:	Maintained



PANASONIC LAPTOP ACPI EXTRAS DRIVER

P:	Harald Welte

M:	laforge@gnumonks.org

S:	Maintained



PANASONIC MN10300/AM33 PORT

P:	David Howells

M:	dhowells@redhat.com

arch/ia64/sn/kernel/io_acpi_init.c

+5 −5
Original line number Diff line number Diff line
@@ -232,7 +232,7 @@ exit: 
static unsigned int

get_host_devfn(acpi_handle device_handle, acpi_handle rootbus_handle)

{

	unsigned long adr;

	unsigned long long adr;

	acpi_handle child;

	unsigned int devfn;

	int function;
@@ -292,8 +292,8 @@ get_host_devfn(acpi_handle device_handle, acpi_handle rootbus_handle) 
static acpi_status

find_matching_device(acpi_handle handle, u32 lvl, void *context, void **rv)

{

	unsigned long bbn = -1;

	unsigned long adr;

	unsigned long long bbn = -1;

	unsigned long long adr;

	acpi_handle parent = NULL;

	acpi_status status;

	unsigned int devfn;
@@ -348,7 +348,7 @@ sn_acpi_get_pcidev_info(struct pci_dev *dev, struct pcidev_info **pcidev_info, 
	unsigned int host_devfn;

	struct sn_pcidev_match pcidev_match;

	acpi_handle rootbus_handle;

	unsigned long segment;

	unsigned long long segment;

	acpi_status status;



	rootbus_handle = PCI_CONTROLLER(dev)->acpi_handle;
@@ -357,7 +357,7 @@ sn_acpi_get_pcidev_info(struct pci_dev *dev, struct pcidev_info **pcidev_info, 
        if (ACPI_SUCCESS(status)) {

		if (segment != pci_domain_nr(dev)) {

			printk(KERN_ERR

			       "%s: Segment number mismatch, 0x%lx vs 0x%x for: ",

			       "%s: Segment number mismatch, 0x%llx vs 0x%x for: ",

			       __func__, segment, pci_domain_nr(dev));

			acpi_ns_print_node_pathname(rootbus_handle, NULL);

			printk("\n");

arch/x86/Kconfig

+5 −0
Original line number Diff line number Diff line
@@ -116,6 +116,9 @@ config GENERIC_TIME_VSYSCALL 
config ARCH_HAS_CPU_RELAX

	def_bool y



config ARCH_HAS_DEFAULT_IDLE

	def_bool y



config ARCH_HAS_CACHE_LINE_SIZE

	def_bool y
@@ -1635,6 +1638,8 @@ source "arch/x86/kernel/cpu/cpufreq/Kconfig" 


source "drivers/cpuidle/Kconfig"



source "drivers/idle/Kconfig"



endmenu

CRA Git | Maintained and supported by SUSTech CRA and CCSE