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

Commit 4a225331 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: sleep: init_set_sci_en_on_resume for Dell Studio 155x
  ACPI: fix acpi_hest_firmware_first_pci() caused oops
  sbshc: acpi_device_class "smbus_host_controller" too long
  power_meter: acpi_device_class "power_meter_resource" too long
  acpi_pad: "processor_aggregator" name too long
  PNP: don't check for conflicts with bridge windows
  ACPI: DMI init_set_sci_en_on_resume for multiple Lenovo ThinkPads
  PNPACPI: compute Address Space length rather than using _LEN
  ACPI: silence kmemcheck false positive
parents 417a9ef1 1468cf05

drivers/acpi/acpi_pad.c

+1 −1
Original line number Diff line number Diff line
@@ -31,7 +31,7 @@ 
#include <acpi/acpi_bus.h>

#include <acpi/acpi_drivers.h>



#define ACPI_PROCESSOR_AGGREGATOR_CLASS	"processor_aggregator"

#define ACPI_PROCESSOR_AGGREGATOR_CLASS	"acpi_pad"

#define ACPI_PROCESSOR_AGGREGATOR_DEVICE_NAME "Processor Aggregator"

#define ACPI_PROCESSOR_AGGREGATOR_NOTIFY 0x80

static DEFINE_MUTEX(isolated_cpus_lock);

drivers/acpi/bus.c

+1 −1
Original line number Diff line number Diff line
@@ -527,7 +527,7 @@ int acpi_bus_generate_proc_event4(const char *device_class, const char *bus_id, 
	if (!event_is_open)

		return 0;



	event = kmalloc(sizeof(struct acpi_bus_event), GFP_ATOMIC);

	event = kzalloc(sizeof(struct acpi_bus_event), GFP_ATOMIC);

	if (!event)

		return -ENOMEM;

drivers/acpi/hest.c

+4 −0
Original line number Diff line number Diff line
@@ -123,6 +123,10 @@ int acpi_hest_firmware_first_pci(struct pci_dev *pci) 
{

	acpi_status status = AE_NOT_FOUND;

	struct acpi_table_header *hest = NULL;



	if (acpi_disabled)

		return 0;



	status = acpi_get_table(ACPI_SIG_HEST, 1, &hest);



	if (ACPI_SUCCESS(status)) {

drivers/acpi/power_meter.c

+1 −1
Original line number Diff line number Diff line
@@ -35,7 +35,7 @@ 
#define ACPI_POWER_METER_NAME		"power_meter"

ACPI_MODULE_NAME(ACPI_POWER_METER_NAME);

#define ACPI_POWER_METER_DEVICE_NAME	"Power Meter"

#define ACPI_POWER_METER_CLASS		"power_meter_resource"

#define ACPI_POWER_METER_CLASS		"pwr_meter_resource"



#define NUM_SENSORS			17

drivers/acpi/sbshc.c

+1 −1
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ 


#define PREFIX "ACPI: "



#define ACPI_SMB_HC_CLASS	"smbus_host_controller"

#define ACPI_SMB_HC_CLASS	"smbus_host_ctl"

#define ACPI_SMB_HC_DEVICE_NAME	"ACPI SMBus HC"



struct acpi_smb_hc {