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

Commit 73990fc8 authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

Merge branches 'acpi-scan', 'acpi-processor' and 'acpi-assorted' 

* acpi-scan:
  ACPI / bus: Move ACPI bus type registration
  ACPI / scan: Move bus operations and notification routines to bus.c
  ACPI / scan: Move device matching code to bus.c
  ACPI / scan: Move sysfs-related device code to a separate file

* acpi-processor:
  PCC: Disable compilation by default
  ACPI: Decouple ACPI idle and ACPI processor drivers
  ACPI: Split out ACPI PSS from ACPI Processor driver
  PCC: Initialize PCC Mailbox earlier at boot
  ACPI / processor: remove leftover __refdata annotations

* acpi-assorted:
  ACPI: fix acpi_debugfs_init prototype
  ACPI: Remove FSF mailing addresses
parents 94f2bb9b 1dcc3d33 b6fc6072 10742619

drivers/acpi/Kconfig

+13 −6
Original line number Diff line number Diff line
@@ -189,17 +189,24 @@ config ACPI_DOCK 
	  This driver supports ACPI-controlled docking stations and removable

	  drive bays such as the IBM Ultrabay and the Dell Module Bay.



config ACPI_PROCESSOR

	tristate "Processor"

config ACPI_CPU_FREQ_PSS

	bool

	select THERMAL



config ACPI_PROCESSOR_IDLE

	bool

	select CPU_IDLE



config ACPI_PROCESSOR

	tristate "Processor"

	depends on X86 || IA64

	select ACPI_PROCESSOR_IDLE

	select ACPI_CPU_FREQ_PSS

	default y

	help

	  This driver installs ACPI as the idle handler for Linux and uses

	  ACPI C2 and C3 processor states to save power on systems that

	  support it.  It is required by several flavors of cpufreq

	  performance-state drivers.

	  This driver adds support for the ACPI Processor package. It is required

	  by several flavors of cpufreq performance-state, thermal, throttling and

	  idle drivers.



	  To compile this driver as a module, choose M here:

	  the module will be called processor.

drivers/acpi/Makefile

+5 −3
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ acpi-y += nvs.o 
# Power management related files

acpi-y				+= wakeup.o

acpi-$(CONFIG_ACPI_SYSTEM_POWER_STATES_SUPPORT) += sleep.o

acpi-y				+= device_pm.o

acpi-y				+= device_sysfs.o device_pm.o

acpi-$(CONFIG_ACPI_SLEEP)	+= proc.o
@@ -80,8 +80,10 @@ obj-$(CONFIG_ACPI_CUSTOM_METHOD)+= custom_method.o 
obj-$(CONFIG_ACPI_BGRT)		+= bgrt.o



# processor has its own "processor." module_param namespace

processor-y			:= processor_driver.o processor_throttling.o

processor-y			+= processor_idle.o processor_thermal.o

processor-y			:= processor_driver.o

processor-$(CONFIG_ACPI_PROCESSOR_IDLE) += processor_idle.o

processor-$(CONFIG_ACPI_CPU_FREQ_PSS)	+= processor_throttling.o	\

	processor_thermal.o

processor-$(CONFIG_CPU_FREQ)	+= processor_perflib.o



obj-$(CONFIG_ACPI_PROCESSOR_AGGREGATOR) += acpi_pad.o

drivers/acpi/ac.c

+0 −4
Original line number Diff line number Diff line
@@ -16,10 +16,6 @@ 
 *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU

 *  General Public License for more details.

 *

 *  You should have received a copy of the GNU General Public License along

 *  with this program; if not, write to the Free Software Foundation, Inc.,

 *  59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.

 *

 * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

 */

drivers/acpi/acpi_ipmi.c

+0 −4
Original line number Diff line number Diff line
@@ -17,10 +17,6 @@ 
 *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU

 *  General Public License for more details.

 *

 *  You should have received a copy of the GNU General Public License along

 *  with this program; if not, write to the Free Software Foundation, Inc.,

 *  59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.

 *

 * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

 */

drivers/acpi/acpi_memhotplug.c

+0 −5
Original line number Diff line number Diff line
@@ -16,11 +16,6 @@ 
 * NON INFRINGEMENT.  See the GNU General Public License for more

 * details.

 *

 * You should have received a copy of the GNU General Public License

 * along with this program; if not, write to the Free Software

 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.

 *

 *

 * ACPI based HotPlug driver that supports Memory Hotplug

 * This driver fields notifications from firmware for memory add

 * and remove operations and alerts the VM of the affected memory