From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 29 May 2011 18:19:16 +0000 (-0700)
Subject: Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux... 
X-Git-Tag: v3.0-rc1~12
X-Git-Url: https://repo.jachan.dev/linux.git/commitdiff_plain/daa94222b638bfe34f745d0982de7a165ce7f67c?hp=-c

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
---

daa94222b638bfe34f745d0982de7a165ce7f67c
diff --combined drivers/acpi/Kconfig
index bc2218db5ba9,d918e130bef3..de0e3df76776
--- a/drivers/acpi/Kconfig
+++ b/drivers/acpi/Kconfig
@@@ -73,6 -73,17 +73,6 @@@ config ACPI_PROCFS_POWE
  
  	  Say N to delete power /proc/acpi/ directories that have moved to /sys/
  
 -config ACPI_POWER_METER
 -	tristate "ACPI 4.0 power meter"
 -	depends on HWMON
 -	help
 -	  This driver exposes ACPI 4.0 power meters as hardware monitoring
 -	  devices.  Say Y (or M) if you have a computer with ACPI 4.0 firmware
 -	  and a power meter.
 -
 -	  To compile this driver as a module, choose M here:
 -	  the module will be called power-meter.
 -
  config ACPI_EC_DEBUGFS
  	tristate "EC read/write access through /sys/kernel/debug/ec"
  	default n
@@@ -369,6 -380,21 +369,21 @@@ config ACPI_HE
  	  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
diff --combined drivers/acpi/Makefile
index b66fbb2fc85f,cba0b2334b9b..ecb26b4f29a0
--- a/drivers/acpi/Makefile
+++ b/drivers/acpi/Makefile
@@@ -59,8 -59,10 +59,9 @@@ obj-$(CONFIG_ACPI_HOTPLUG_MEMORY) += ac
  obj-$(CONFIG_ACPI_BATTERY)	+= battery.o
  obj-$(CONFIG_ACPI_SBS)		+= sbshc.o
  obj-$(CONFIG_ACPI_SBS)		+= sbs.o
 -obj-$(CONFIG_ACPI_POWER_METER)	+= power_meter.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