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

Commit 2245ba2a 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:
  gcc-4.6: ACPI: fix unused but set variables in ACPI
  ACPI thermal: make procfs I/F depend on CONFIG_ACPI_PROCFS
  ACPI video: make procfs I/F depend on CONFIG_ACPI_PROCFS
  ACPI processor: remove deprecated ACPI procfs I/F
  ACPI power_resource: remove unused procfs I/F
  ACPI: remove deprecated ACPI procfs I/F
  ACPI: introduce drivers/acpi/sysfs.c
  ACPI: introduce module parameter acpi.aml_debug_output
  ACPI: introduce drivers/acpi/debugfs.c
  ACPI, APEI, ERST debug support
  ACPI, APEI, Manage GHES as platform devices
  ACPI, APEI, Rename CPER and GHES severity constants
  ACPI, APEI, Fix a typo of error path of apei_resources_request
  ACPI / ACPICA: Fix reference counting problems with GPE handlers
  ACPI: Add the check of ADR flag in course of finding ACPI handle for PCI device
  ACPI / Sleep: Drop acpi_suspend_finish()
  ACPI / Sleep: Consolidate suspend and hibernation routines
  ACPI / Wakeup: Simplify enabling of wakeup devices
  ACPI / Sleep: Rework enabling wakeup devices
  ACPI / Sleep: Free NVS copy if suspending of devices fails

Fixed up totally buggered "ACPI: fix unused but set variables in ACPI"
patch that doesn't even compile in the merge.

Thanks to Sedat Dilek <sedat.dilek@googlemail.com> for noticing the
breakage before I even pulled.  And a big "Grrr.." at Len for not even
bothering to compile the tree before asking me to pull.
parents e2e96c66 95ee46aa

Documentation/acpi/method-customizing.txt

+2 −0
Original line number Original line Diff line number Diff line
@@ -19,6 +19,8 @@ Note: Only ACPI METHOD can be overridden, any other object types like 
      "Device", "OperationRegion", are not recognized.

      "Device", "OperationRegion", are not recognized.

Note: The same ACPI control method can be overridden for many times,

Note: The same ACPI control method can be overridden for many times,

      and it's always the latest one that used by Linux/kernel.

      and it's always the latest one that used by Linux/kernel.

Note: To get the ACPI debug object output (Store (AAAA, Debug)),

      please run "echo 1 > /sys/module/acpi/parameters/aml_debug_output".





1. override an existing method

1. override an existing method

   a) get the ACPI table via ACPI sysfs I/F. e.g. to get the DSDT,

   a) get the ACPI table via ACPI sysfs I/F. e.g. to get the DSDT,

arch/x86/kernel/cpu/mcheck/mce-apei.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -80,7 +80,7 @@ int apei_write_mce(struct mce *m) 
	rcd.hdr.revision = CPER_RECORD_REV;

	rcd.hdr.revision = CPER_RECORD_REV;

	rcd.hdr.signature_end = CPER_SIG_END;

	rcd.hdr.signature_end = CPER_SIG_END;

	rcd.hdr.section_count = 1;

	rcd.hdr.section_count = 1;

	rcd.hdr.error_severity = CPER_SER_FATAL;

	rcd.hdr.error_severity = CPER_SEV_FATAL;

	/* timestamp, platform_id, partition_id are all invalid */

	/* timestamp, platform_id, partition_id are all invalid */

	rcd.hdr.validation_bits = 0;

	rcd.hdr.validation_bits = 0;

	rcd.hdr.record_length = sizeof(rcd);

	rcd.hdr.record_length = sizeof(rcd);
@@ -96,7 +96,7 @@ int apei_write_mce(struct mce *m) 
	rcd.sec_hdr.validation_bits = 0;

	rcd.sec_hdr.validation_bits = 0;

	rcd.sec_hdr.flags = CPER_SEC_PRIMARY;

	rcd.sec_hdr.flags = CPER_SEC_PRIMARY;

	rcd.sec_hdr.section_type = CPER_SECTION_TYPE_MCE;

	rcd.sec_hdr.section_type = CPER_SECTION_TYPE_MCE;

	rcd.sec_hdr.section_severity = CPER_SER_FATAL;

	rcd.sec_hdr.section_severity = CPER_SEV_FATAL;





	memcpy(&rcd.mce, m, sizeof(*m));

	memcpy(&rcd.mce, m, sizeof(*m));

drivers/acpi/Kconfig

+2 −9
Original line number Original line Diff line number Diff line
@@ -54,17 +54,10 @@ config ACPI_PROCFS 
	  they have been replaced by functions in /sys.

	  they have been replaced by functions in /sys.

	  The deprecated files (and their replacements) include:

	  The deprecated files (and their replacements) include:





	  /proc/acpi/sleep (/sys/power/state)

	  /proc/acpi/info (/sys/module/acpi/parameters/acpica_version)

	  /proc/acpi/dsdt (/sys/firmware/acpi/tables/DSDT)

	  /proc/acpi/fadt (/sys/firmware/acpi/tables/FACP)

	  /proc/acpi/debug_layer (/sys/module/acpi/parameters/debug_layer)

	  /proc/acpi/debug_level (/sys/module/acpi/parameters/debug_level)

	  /proc/acpi/processor/*/power (/sys/devices/system/cpu/*/cpuidle/*)

	  /proc/acpi/processor/*/performance (/sys/devices/system/cpu/*/

		cpufreq/*)

	  /proc/acpi/processor/*/throttling (/sys/class/thermal/

	  /proc/acpi/processor/*/throttling (/sys/class/thermal/

		cooling_device*/*)

		cooling_device*/*)

	  /proc/acpi/video/*/brightness (/sys/class/backlight/)

	  /proc/acpi/thermal_zone/*/* (/sys/class/thermal/)

	  This option has no effect on /proc/acpi/ files

	  This option has no effect on /proc/acpi/ files

	  and functions which do not yet exist in /sys.

	  and functions which do not yet exist in /sys.

drivers/acpi/Makefile

+3 −2
Original line number Original line Diff line number Diff line
@@ -37,8 +37,9 @@ acpi-y += ec.o 
acpi-$(CONFIG_ACPI_DOCK)	+= dock.o

acpi-$(CONFIG_ACPI_DOCK)	+= dock.o

acpi-y				+= pci_root.o pci_link.o pci_irq.o pci_bind.o

acpi-y				+= pci_root.o pci_link.o pci_irq.o pci_bind.o

acpi-y				+= power.o

acpi-y				+= power.o

acpi-y				+= system.o event.o

acpi-y				+= event.o

acpi-$(CONFIG_ACPI_DEBUG)	+= debug.o

acpi-y				+= sysfs.o

acpi-$(CONFIG_DEBUG_FS)		+= debugfs.o

acpi-$(CONFIG_ACPI_NUMA)	+= numa.o

acpi-$(CONFIG_ACPI_NUMA)	+= numa.o

acpi-$(CONFIG_ACPI_PROCFS_POWER) += cm_sbs.o

acpi-$(CONFIG_ACPI_PROCFS_POWER) += cm_sbs.o

ifdef CONFIG_ACPI_VIDEO

ifdef CONFIG_ACPI_VIDEO

drivers/acpi/acpica/acevents.h

+4 −0
Original line number Original line Diff line number Diff line
@@ -82,6 +82,10 @@ acpi_ev_update_gpe_enable_mask(struct acpi_gpe_event_info *gpe_event_info); 




acpi_status acpi_ev_enable_gpe(struct acpi_gpe_event_info *gpe_event_info);

acpi_status acpi_ev_enable_gpe(struct acpi_gpe_event_info *gpe_event_info);





acpi_status acpi_raw_enable_gpe(struct acpi_gpe_event_info *gpe_event_info);



acpi_status acpi_raw_disable_gpe(struct acpi_gpe_event_info *gpe_event_info);



struct acpi_gpe_event_info *acpi_ev_get_gpe_event_info(acpi_handle gpe_device,

struct acpi_gpe_event_info *acpi_ev_get_gpe_event_info(acpi_handle gpe_device,

						       u32 gpe_number);

						       u32 gpe_number);