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

Commit 0b887d03 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: (30 commits)
  ACPI: work around duplicate name "VID" problem on T61
  acpiphp_ibm: add missing '\n' to error message
  ACPI: add dump_stack() to trace acpi_format_exception programming errors
  make drivers/acpi/scan.c:create_modalias() static
  ACPI: Fix a warning of discarding qualifiers from pointer target type
  ACPI: "ACPI handle has no context!" should be KERN_DEBUG
  ACPI video hotkey: export missing ACPI video hotkey events via input layer
  ACPI: Validate XSDT, use RSDT if XSDT fails
  ACPI: /proc/acpi/thermal_zone trip points are now read-only, mark them as such
  ACPI: fix ia64 allnoconfig build
  PNP: remove null pointer checks
  PNP: remove MODULE infrastructure
  ISAPNP: removed unused isapnp_detected and ISAPNP_DEBUG
  PNPACPI: remove unnecessary casts of "void *"
  PNPACPI: simplify irq_flags()
  PNP: fix up after Lindent
  ACPI: enable GPEs before calling _WAK on resume
  asus-laptop: Fix rmmod of asus_laptop
  sony-laptop: call sonypi_compat_init earlier
  sony-laptop: enable Vaio FZ events
  ...
parents d1caeb02 136c4bbf

Documentation/feature-removal-schedule.txt

+8 −0
Original line number Diff line number Diff line
@@ -197,6 +197,14 @@ Who: Len Brown <len.brown@intel.com> 


---------------------------



What:	/proc/acpi/event

When:	February 2008

Why:	/proc/acpi/event has been replaced by events via the input layer

	and netlink since 2.6.23.

Who:	Len Brown <len.brown@intel.com>



---------------------------



What:	Compaq touchscreen device emulation

When:	Oct 2007

Files:	drivers/input/tsdev.c

Documentation/kernel-parameters.txt

+10 −9
Original line number Diff line number Diff line
@@ -952,14 +952,10 @@ and is between 256 and 4096 characters. It is defined in the file 
			Format: <1-256>



	maxcpus=	[SMP] Maximum number of processors that	an SMP kernel

			should make use of.

			Using "nosmp" or "maxcpus=0" will disable SMP

			entirely (the MPS table probe still happens, though).

			A command-line option of "maxcpus=<NUM>", where <NUM>

			is an integer greater than 0, limits the maximum number

			of CPUs activated in SMP mode to <NUM>.

			Using "maxcpus=1" on an SMP kernel is the trivial

			case of an SMP kernel with only one CPU.

			should make use of.  maxcpus=n : n >= 0 limits the

			kernel to using 'n' processors.  n=0 is a special case,

			it is equivalent to "nosmp", which also disables

			the IO APIC.



	max_addr=[KMG]	[KNL,BOOT,ia64] All physical memory greater than or

			equal to this physical address is ignored.
@@ -1184,7 +1180,8 @@ and is between 256 and 4096 characters. It is defined in the file 


	nosep		[BUGS=X86-32] Disables x86 SYSENTER/SYSEXIT support.



	nosmp		[SMP] Tells an SMP kernel to act as a UP kernel.

	nosmp		[SMP] Tells an SMP kernel to act as a UP kernel,

			and disable the IO APIC.  legacy for "maxcpus=0".



	nosoftlockup	[KNL] Disable the soft-lockup detector.
@@ -1826,6 +1823,10 @@ and is between 256 and 4096 characters. It is defined in the file 
			-1: disable all active trip points in all thermal zones

			<degrees C>: override all lowest active trip points



	thermal.crt=	[HW,ACPI]

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

			<degrees C>: lower all critical trip points



	thermal.nocrt=	[HW,ACPI]

			Set to disable actions on ACPI thermal zone

			critical and hot trip points.

arch/i386/kernel/io_apic.c

+0 −8
Original line number Diff line number Diff line
@@ -754,14 +754,6 @@ static int pirq_entries [MAX_PIRQS]; 
static int pirqs_enabled;

int skip_ioapic_setup;



static int __init ioapic_setup(char *str)

{

	skip_ioapic_setup = 1;

	return 1;

}



__setup("noapic", ioapic_setup);



static int __init ioapic_pirq_setup(char *str)

{

	int i, max;

arch/x86_64/kernel/io_apic.c

+3 −5
Original line number Diff line number Diff line
@@ -397,14 +397,12 @@ static void clear_IO_APIC (void) 
int skip_ioapic_setup;

int ioapic_force;



/* dummy parsing: see setup.c */



static int __init disable_ioapic_setup(char *str)

static int __init parse_noapic(char *str)

{

	skip_ioapic_setup = 1;

	disable_ioapic_setup();

	return 0;

}

early_param("noapic", disable_ioapic_setup);

early_param("noapic", parse_noapic);



/* Actually the next is obsolete, but keep it for paranoid reasons -AK */

static int __init disable_timer_pin_setup(char *arg)

drivers/acpi/Kconfig

+14 −0
Original line number Diff line number Diff line
@@ -68,6 +68,20 @@ config ACPI_PROCFS 


	  Say N to delete /proc/acpi/ files that have moved to /sys/



config ACPI_PROC_EVENT

	bool "Deprecated /proc/acpi/event support"

	depends on PROC_FS

	---help---

	  A user-space daemon, acpi, typically read /proc/acpi/event

	  and handled all ACPI sub-system generated events.



	  These events are now delivered to user-space via

	  either the input layer, or as netlink events.



	  This build option enables the old code for for legacy

	  user-space implementation.  After some time, this will

	  be moved under CONFIG_ACPI_PROCFS, and then deleted.



config ACPI_AC

	tristate "AC Adapter"

	depends on X86