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

Commit daa94222 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 EC: remove redundant code
  ACPI: Add D3 cold state
  ACPI: processor: fix processor_physically_present in UP kernel
  ACPI: Split out custom_method functionality into an own driver
  ACPI: Cleanup custom_method debug stuff
  ACPI EC: enable MSI workaround for Quanta laptops
  ACPICA: Update to version 20110413
  ACPICA: Execute an orphan _REG method under the EC device
  ACPICA: Move ACPI_NUM_PREDEFINED_REGIONS to a more appropriate place
  ACPICA: Update internal address SpaceID for DataTable regions
  ACPICA: Add more methods eligible for NULL package element removal
  ACPICA: Split all internal Global Lock functions to new file - evglock
  ACPI: EC: add another DMI check for ASUS hardware
  ACPI EC: remove dead code
  ACPICA: Fix code divergence of global lock handling
  ACPICA: Use acpi_os_create_lock interface
  ACPI: osl, add acpi_os_create_lock interface
  ACPI:Fix goto flows in thermal-sys
parents f3106421 751516f0

Documentation/acpi/method-customizing.txt

+5 −0
Original line number Diff line number Diff line
@@ -66,3 +66,8 @@ Note: We can use a kernel with multiple custom ACPI method running, 
      But each individual write to debugfs can implement a SINGLE

      method override. i.e. if we want to insert/override multiple

      ACPI methods, we need to redo step c) ~ g) for multiple times.



Note: Be aware that root can mis-use this driver to modify arbitrary

      memory and gain additional rights, if root's privileges got

      restricted (for example if root is not allowed to load additional

      modules after boot).

drivers/acpi/Kconfig

+15 −0
Original line number Diff line number Diff line
@@ -369,6 +369,21 @@ config ACPI_HED 
	  which is used to report some hardware errors notified via

	  SCI, mainly the corrected errors.



config ACPI_CUSTOM_METHOD

	tristate "Allow ACPI methods to be inserted/replaced at run time"

	depends on DEBUG_FS

	default n

	help

	  This debug facility allows ACPI AML methods to me inserted and/or

	  replaced without rebooting the system. For details refer to:

	  Documentation/acpi/method-customizing.txt.



	  NOTE: This option is security sensitive, because it allows arbitrary

	  kernel memory to be written to by root (uid=0) users, allowing them

	  to bypass certain security measures (e.g. if root is not allowed to

	  load additional kernel modules after boot, this feature may be used

	  to override that restriction).



source "drivers/acpi/apei/Kconfig"



endif	# ACPI

drivers/acpi/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -61,6 +61,7 @@ obj-$(CONFIG_ACPI_SBS) += sbshc.o 
obj-$(CONFIG_ACPI_SBS)		+= sbs.o

obj-$(CONFIG_ACPI_HED)		+= hed.o

obj-$(CONFIG_ACPI_EC_DEBUGFS)	+= ec_sys.o

obj-$(CONFIG_ACPI_CUSTOM_METHOD)+= custom_method.o



# processor has its own "processor." module_param namespace

processor-y			:= processor_driver.o processor_throttling.o

drivers/acpi/acpica/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ acpi-y := dsfield.o dsmthdat.o dsopcode.o dswexec.o dswscope.o \ 


acpi-y += evevent.o  evregion.o  evsci.o    evxfevnt.o \

	 evmisc.o   evrgnini.o  evxface.o  evxfregn.o \

	 evgpe.o    evgpeblk.o evgpeinit.o  evgpeutil.o evxfgpe.o

	 evgpe.o    evgpeblk.o evgpeinit.o  evgpeutil.o evxfgpe.o evglock.o



acpi-y += exconfig.o  exfield.o  exnames.o   exoparg6.o  exresolv.o  exstorob.o\

	 exconvrt.o  exfldio.o  exoparg1.o  exprep.o    exresop.o   exsystem.o\

drivers/acpi/acpica/acconfig.h

+0 −1
Original line number Diff line number Diff line
@@ -187,7 +187,6 @@ 


/* Operation regions */



#define ACPI_NUM_PREDEFINED_REGIONS     9

#define ACPI_USER_REGION_BEGIN          0x80



/* Maximum space_ids for Operation Regions */