Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4314652b authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'release-2.6.27' of... 

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

* 'release-2.6.27' of git://git.kernel.org/pub/scm/linux/kernel/git/ak/linux-acpi-merge-2.6: (87 commits)
  Fix FADT parsing
  Add the ability to reset the machine using the RESET_REG in ACPI's FADT table.
  ACPI: use dev_printk when possible
  PNPACPI: add support for HP vendor-specific CCSR descriptors
  PNP: avoid legacy IDE IRQs
  PNP: convert resource options to single linked list
  ISAPNP: handle independent options following dependent ones
  PNP: remove extra 0x100 bit from option priority
  PNP: support optional IRQ resources
  PNP: rename pnp_register_*_resource() local variables
  PNPACPI: ignore _PRS interrupt numbers larger than PNP_IRQ_NR
  PNP: centralize resource option allocations
  PNP: remove redundant pnp_can_configure() check
  PNP: make resource assignment functions return 0 (success) or -EBUSY (failure)
  PNP: in debug resource dump, make empty list obvious
  PNP: improve resource assignment debug
  PNP: increase I/O port & memory option address sizes
  PNP: introduce pnp_irq_mask_t typedef
  PNP: make resource option structures private to PNP subsystem
  PNP: define PNP-specific IORESOURCE_IO_* flags alongside IRQ, DMA, MEM
  ...
parents d442cc44 01a5bba5

Documentation/ABI/testing/sysfs-firmware-acpi

+87 −40
Original line number Original line Diff line number Diff line
@@ -30,45 +30,45 @@ Description: 
		$ cd /sys/firmware/acpi/interrupts

		$ cd /sys/firmware/acpi/interrupts

		$ grep . *

		$ grep . *

		error:	     0

		error:	     0

		ff_gbl_lock:0

		ff_gbl_lock:	   0   enable

		ff_pmtimer:0

		ff_pmtimer:	  0  invalid

		ff_pwr_btn:0

		ff_pwr_btn:	  0   enable

		ff_rt_clk:0

		ff_rt_clk:	 2  disable

		ff_slp_btn:0

		ff_slp_btn:	  0  invalid

		gpe00:0

		gpe00:	     0	invalid

		gpe01:0

		gpe01:	     0	 enable

		gpe02:0

		gpe02:	   108	 enable

		gpe03:0

		gpe03:	     0	invalid

		gpe04:0

		gpe04:	     0	invalid

		gpe05:0

		gpe05:	     0	invalid

		gpe06:0

		gpe06:	     0	 enable

		gpe07:0

		gpe07:	     0	 enable

		gpe08:0

		gpe08:	     0	invalid

		gpe09:174

		gpe09:	     0	invalid

		gpe0A:0

		gpe0A:	     0	invalid

		gpe0B:0

		gpe0B:	     0	invalid

		gpe0C:0

		gpe0C:	     0	invalid

		gpe0D:0

		gpe0D:	     0	invalid

		gpe0E:0

		gpe0E:	     0	invalid

		gpe0F:0

		gpe0F:	     0	invalid

		gpe10:0

		gpe10:	     0	invalid

		gpe11:60

		gpe11:	     0	invalid

		gpe12:0

		gpe12:	     0	invalid

		gpe13:0

		gpe13:	     0	invalid

		gpe14:0

		gpe14:	     0	invalid

		gpe15:0

		gpe15:	     0	invalid

		gpe16:0

		gpe16:	     0	invalid

		gpe17:0

		gpe17:	  1084	 enable

		gpe18:0

		gpe18:	     0	 enable

		gpe19:7

		gpe19:	     0	invalid

		gpe1A:0

		gpe1A:	     0	invalid

		gpe1B:0

		gpe1B:	     0	invalid

		gpe1C:0

		gpe1C:	     0	invalid

		gpe1D:0

		gpe1D:	     0	invalid

		gpe1E:0

		gpe1E:	     0	invalid

		gpe1F:0

		gpe1F:	     0	invalid

		gpe_all:241

		gpe_all:    1192

		sci:241

		sci:	1194





		sci - The total number of times the ACPI SCI

		sci - The total number of times the ACPI SCI

		has claimed an interrupt.

		has claimed an interrupt.
@@ -89,6 +89,13 @@ Description: 




		error - an interrupt that can't be accounted for above.

		error - an interrupt that can't be accounted for above.





		invalid: it's either a wakeup GPE or a GPE/Fixed Event that

			doesn't have an event handler.



		disable: the GPE/Fixed Event is valid but disabled.



		enable: the GPE/Fixed Event is valid and enabled.



		Root has permission to clear any of these counters.  Eg.

		Root has permission to clear any of these counters.  Eg.

		# echo 0 > gpe11

		# echo 0 > gpe11
@@ -97,3 +104,43 @@ Description: 




		None of these counters has an effect on the function

		None of these counters has an effect on the function

		of the system, they are simply statistics.

		of the system, they are simply statistics.



		Besides this, user can also write specific strings to these files

		to enable/disable/clear ACPI interrupts in user space, which can be

		used to debug some ACPI interrupt storm issues.



		Note that only writting to VALID GPE/Fixed Event is allowed,

		i.e. user can only change the status of runtime GPE and

		Fixed Event with event handler installed.



		Let's take power button fixed event for example, please kill acpid

		and other user space applications so that the machine won't shutdown

		when pressing the power button.

		# cat ff_pwr_btn

		0

		# press the power button for 3 times;

		# cat ff_pwr_btn

		3

		# echo disable > ff_pwr_btn

		# cat ff_pwr_btn

		disable

		# press the power button for 3 times;

		# cat ff_pwr_btn

		disable

		# echo enable > ff_pwr_btn

		# cat ff_pwr_btn

		4

		/*

		 * this is because the status bit is set even if the enable bit is cleared,

		 * and it triggers an ACPI fixed event when the enable bit is set again

		 */

		# press the power button for 3 times;

		# cat ff_pwr_btn

		7

		# echo disable > ff_pwr_btn

		# press the power button for 3 times;

		# echo clear > ff_pwr_btn	/* clear the status bit */

		# echo disable > ff_pwr_btn

		# cat ff_pwr_btn

		7

Documentation/kernel-parameters.txt

+4 −1
Original line number Original line Diff line number Diff line
@@ -818,7 +818,7 @@ and is between 256 and 4096 characters. It is defined in the file 
			See Documentation/ide/ide.txt.

			See Documentation/ide/ide.txt.





	idle=		[X86]

	idle=		[X86]

			Format: idle=poll or idle=mwait

			Format: idle=poll or idle=mwait, idle=halt, idle=nomwait

			Poll forces a polling idle loop that can slightly improves the performance

			Poll forces a polling idle loop that can slightly improves the performance

			of waking up a idle CPU, but will use a lot of power and make the system

			of waking up a idle CPU, but will use a lot of power and make the system

			run hot. Not recommended.

			run hot. Not recommended.
@@ -826,6 +826,9 @@ and is between 256 and 4096 characters. It is defined in the file 
			to not use it because it doesn't save as much power as a normal idle

			to not use it because it doesn't save as much power as a normal idle

			loop use the MONITOR/MWAIT idle loop anyways. Performance should be the same

			loop use the MONITOR/MWAIT idle loop anyways. Performance should be the same

			as idle=poll.

			as idle=poll.

			idle=halt. Halt is forced to be used for CPU idle.

			In such case C2/C3 won't be used again.

			idle=nomwait. Disable mwait for CPU C-states





	ide-pci-generic.all-generic-ide [HW] (E)IDE subsystem

	ide-pci-generic.all-generic-ide [HW] (E)IDE subsystem

			Claim all unknown PCI IDE storage controllers.

			Claim all unknown PCI IDE storage controllers.

Documentation/laptops/acer-wmi.txt

+0 −2
Original line number Original line Diff line number Diff line
@@ -174,8 +174,6 @@ The LED is exposed through the LED subsystem, and can be found in: 
The mail LED is autodetected, so if you don't have one, the LED device won't

The mail LED is autodetected, so if you don't have one, the LED device won't

be registered.

be registered.





If you have a mail LED that is not green, please report this to me.



Backlight

Backlight

*********

*********

MAINTAINERS

+18 −7
Original line number Original line Diff line number Diff line
@@ -216,8 +216,8 @@ W: http://code.google.com/p/aceracpi 
S:	Maintained

S:	Maintained





ACPI

ACPI

P:	Len Brown

P:	Andi Kleen

M:	len.brown@intel.com

M:	ak@linux.intel.com

M:	lenb@kernel.org

M:	lenb@kernel.org

L:	linux-acpi@vger.kernel.org

L:	linux-acpi@vger.kernel.org

W:	http://www.lesswatts.org/projects/acpi/

W:	http://www.lesswatts.org/projects/acpi/
@@ -239,8 +239,8 @@ W: http://www.lesswatts.org/projects/acpi/ 
S:	Supported

S:	Supported





ACPI FAN DRIVER

ACPI FAN DRIVER

P:	Len Brown

P:	Zhang Rui

M:	len.brown@intel.com

M:	rui.zhang@intel.com

L:	linux-acpi@vger.kernel.org

L:	linux-acpi@vger.kernel.org

W:	http://www.lesswatts.org/projects/acpi/

W:	http://www.lesswatts.org/projects/acpi/

S:	Supported

S:	Supported
@@ -252,14 +252,14 @@ L: pcihpd-discuss@lists.sourceforge.net 
S:	Supported

S:	Supported





ACPI THERMAL DRIVER

ACPI THERMAL DRIVER

P:	Len Brown

P:	Zhang Rui

M:	len.brown@intel.com

M:	rui.zhang@intel.com

L:	linux-acpi@vger.kernel.org

L:	linux-acpi@vger.kernel.org

W:	http://www.lesswatts.org/projects/acpi/

W:	http://www.lesswatts.org/projects/acpi/

S:	Supported

S:	Supported





ACPI VIDEO DRIVER

ACPI VIDEO DRIVER

P:	Rui Zhang

P:	Zhang Rui

M:	rui.zhang@intel.com

M:	rui.zhang@intel.com

L:	linux-acpi@vger.kernel.org

L:	linux-acpi@vger.kernel.org

W:	http://www.lesswatts.org/projects/acpi/

W:	http://www.lesswatts.org/projects/acpi/
@@ -1160,6 +1160,11 @@ M: scott@spiteful.org 
L:	pcihpd-discuss@lists.sourceforge.net

L:	pcihpd-discuss@lists.sourceforge.net

S:	Supported

S:	Supported





COMPAL LAPTOP SUPPORT

P:	Cezary Jackiewicz

M:	cezary.jackiewicz@gmail.com

S:	Maintained



COMPUTONE INTELLIPORT MULTIPORT CARD

COMPUTONE INTELLIPORT MULTIPORT CARD

P:	Michael H. Warfield

P:	Michael H. Warfield

M:	mhw@wittsend.com

M:	mhw@wittsend.com
@@ -1787,6 +1792,12 @@ P: David Howells 
M:	dhowells@redhat.com

M:	dhowells@redhat.com

S:	Maintained

S:	Maintained





FUJITSU LAPTOP EXTRAS

P:	Jonathan Woithe

M:	jwoithe@physics.adelaide.edu.au

L:	linux-acpi@vger.kernel.org

S:	Maintained



FUSE: FILESYSTEM IN USERSPACE

FUSE: FILESYSTEM IN USERSPACE

P:	Miklos Szeredi

P:	Miklos Szeredi

M:	miklos@szeredi.hu

M:	miklos@szeredi.hu

arch/ia64/kernel/process.c

+4 −0
Original line number Original line Diff line number Diff line
@@ -55,6 +55,10 @@ void (*ia64_mark_idle)(int); 




unsigned long boot_option_idle_override = 0;

unsigned long boot_option_idle_override = 0;

EXPORT_SYMBOL(boot_option_idle_override);

EXPORT_SYMBOL(boot_option_idle_override);

unsigned long idle_halt;

EXPORT_SYMBOL(idle_halt);

unsigned long idle_nomwait;

EXPORT_SYMBOL(idle_nomwait);





void

void

ia64_do_show_stack (struct unw_frame_info *info, void *arg)

ia64_do_show_stack (struct unw_frame_info *info, void *arg)