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

Commit 2fa298cf 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:
  ACPI: fix "acpi=ht" boot option
  ACPI, i915: blacklist Clevo M5x0N bad_lid state
  ACPI: fix High cpu temperature with 2.6.32
  ACPI: dock: properly initialize local struct dock_station in dock_add()
  ACPI: remove Asus P2B-DS from acpi=ht blacklist
  thinkpad-acpi: wrong thermal attribute_group removed in thermal_exit()
  ACPI: acpi_bus_{scan,bus,add}: return -ENODEV if no device was found
  ACPI: Add NULL pointer check in acpi_bus_start
  ACPI: processor: only evaluate _PDC once per processor
  ACPI: processor: add kernel command line support for early _PDC eval
parents 86404ab6 0e2ecbae

Documentation/kernel-parameters.txt

+4 −0
Original line number Diff line number Diff line
@@ -199,6 +199,10 @@ and is between 256 and 4096 characters. It is defined in the file 
			acpi_display_output=video

			See above.



	acpi_early_pdc_eval	[HW,ACPI] Evaluate processor _PDC methods

				early. Needed on some platforms to properly

				initialize the EC.



	acpi_irq_balance [HW,ACPI]

			ACPI will balance active IRQs

			default in APIC mode

arch/ia64/include/asm/acpi.h

+1 −0
Original line number Diff line number Diff line
@@ -94,6 +94,7 @@ ia64_acpi_release_global_lock (unsigned int *lock) 
#define acpi_noirq 0	/* ACPI always enabled on IA64 */

#define acpi_pci_disabled 0 /* ACPI PCI always enabled on IA64 */

#define acpi_strict 1	/* no ACPI spec workarounds on IA64 */

#define acpi_ht 0	/* no HT-only mode on IA64 */

#endif

#define acpi_processor_cstate_check(x) (x) /* no idle limits on IA64 :) */

static inline void disable_acpi(void) { }

arch/x86/kernel/acpi/boot.c

+0 −8
Original line number Diff line number Diff line
@@ -1342,14 +1342,6 @@ static struct dmi_system_id __initdata acpi_dmi_table[] = { 
		     DMI_MATCH(DMI_PRODUCT_NAME, "Workstation W8000"),

		     },

	 },

	{

	 .callback = force_acpi_ht,

	 .ident = "ASUS P2B-DS",

	 .matches = {

		     DMI_MATCH(DMI_BOARD_VENDOR, "ASUSTeK Computer INC."),

		     DMI_MATCH(DMI_BOARD_NAME, "P2B-DS"),

		     },

	 },

	{

	 .callback = force_acpi_ht,

	 .ident = "ASUS CUR-DLS",

drivers/acpi/dock.c

+1 −0
Original line number Diff line number Diff line
@@ -935,6 +935,7 @@ static int dock_add(acpi_handle handle) 
	struct platform_device *dd;



	id = dock_station_count;

	memset(&ds, 0, sizeof(ds));

	dd = platform_device_register_data(NULL, "dock", id, &ds, sizeof(ds));

	if (IS_ERR(dd))

		return PTR_ERR(dd);

drivers/acpi/processor_idle.c

+8 −0
Original line number Diff line number Diff line
@@ -110,6 +110,14 @@ static struct dmi_system_id __cpuinitdata processor_power_dmi_table[] = { 
	  DMI_MATCH(DMI_BIOS_VENDOR,"Phoenix Technologies LTD"),

	  DMI_MATCH(DMI_BIOS_VERSION,"SHE845M0.86C.0013.D.0302131307")},

	 (void *)2},

	{ set_max_cstate, "Pavilion zv5000", {

	  DMI_MATCH(DMI_SYS_VENDOR, "Hewlett-Packard"),

	  DMI_MATCH(DMI_PRODUCT_NAME,"Pavilion zv5000 (DS502A#ABA)")},

	 (void *)1},

	{ set_max_cstate, "Asus L8400B", {

	  DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK Computer Inc."),

	  DMI_MATCH(DMI_PRODUCT_NAME,"L8400B series Notebook PC")},

	 (void *)1},

	{},

};