Commit 3e8d6ad9 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: (25 commits)
  ACPI: Kconfig: ACPI_SRAT depends on ACPI
  ACPI: drivers/acpi/scan.c: make acpi_bus_type static
  ACPI: fixup memhotplug debug message
  ACPI: ACPICA 20060623
  ACPI: C-States: only demote on current bus mastering activity
  ACPI: C-States: bm_activity improvements
  ACPI: C-States: accounting of sleep states
  ACPI: additional blacklist entry for ThinkPad R40e
  ACPI: restore comment justifying 'extra' P_LVLx access
  ACPI: fix battery on HP NX6125
  ACPIPHP: prevent duplicate slot numbers when no _SUN
  ACPI: static-ize handle_hotplug_event_func()
  ACPIPHP: use ACPI dock driver
  ACPI: dock driver
  KEVENT: add new uevent for dock
  ACPI: asus_acpi_init: propagate correct return value
  [ACPI] Print error message if remove/install notify handler fails
  ACPI: delete tracing macros from drivers/acpi/*.c
  ACPI: HW P-state coordination support
  ACPI: un-export ACPI_ERROR() -- use printk(KERN_ERR...)
  ...
parents 598736c5 55910b28

arch/i386/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -176,7 +176,7 @@ endchoice 
config ACPI_SRAT

	bool

	default y

	depends on NUMA && (X86_SUMMIT || X86_GENERICARCH)

	depends on ACPI && NUMA && (X86_SUMMIT || X86_GENERICARCH)

	select ACPI_NUMA



config HAVE_ARCH_PARSE_SRAT

arch/i386/kernel/cpu/cpufreq/acpi-cpufreq.c

+7 −1
Original line number Diff line number Diff line
@@ -418,8 +418,14 @@ acpi_cpufreq_cpu_init ( 
		goto err_free;



	perf = data->acpi_data;

	policy->cpus = perf->shared_cpu_map;

	policy->shared_type = perf->shared_type;

	/*

	 * Will let policy->cpus know about dependency only when software 

	 * coordination is required.

	 */

	if (policy->shared_type == CPUFREQ_SHARED_TYPE_ALL ||

	    policy->shared_type == CPUFREQ_SHARED_TYPE_ANY)

		policy->cpus = perf->shared_cpu_map;



	if (cpu_has(c, X86_FEATURE_CONSTANT_TSC)) {

		acpi_cpufreq_driver.flags |= CPUFREQ_CONST_LOOPS;

arch/i386/kernel/cpu/cpufreq/speedstep-centrino.c

+7 −1
Original line number Diff line number Diff line
@@ -399,8 +399,14 @@ static int centrino_cpu_init_acpi(struct cpufreq_policy *policy) 
		dprintk(PFX "obtaining ACPI data failed\n");

		return -EIO;

	}

	policy->cpus = p->shared_cpu_map;

	policy->shared_type = p->shared_type;

	/*

	 * Will let policy->cpus know about dependency only when software 

	 * coordination is required.

	 */

	if (policy->shared_type == CPUFREQ_SHARED_TYPE_ALL ||

	    policy->shared_type == CPUFREQ_SHARED_TYPE_ANY)

		policy->cpus = p->shared_cpu_map;



	/* verify the acpi_data */

	if (p->state_count <= 1) {

drivers/acpi/Kconfig

+7 −0
Original line number Diff line number Diff line
@@ -133,6 +133,13 @@ config ACPI_FAN 
	  This driver adds support for ACPI fan devices, allowing user-mode 

	  applications to perform basic fan control (on, off, status).



config ACPI_DOCK

	tristate "Dock"

	depends on !ACPI_IBM_DOCK

	default y

	help

	  This driver adds support for ACPI controlled docking stations



config ACPI_PROCESSOR

	tristate "Processor"

	default y

drivers/acpi/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -42,6 +42,7 @@ obj-$(CONFIG_ACPI_BATTERY) += battery.o 
obj-$(CONFIG_ACPI_BUTTON)	+= button.o

obj-$(CONFIG_ACPI_EC)		+= ec.o

obj-$(CONFIG_ACPI_FAN)		+= fan.o

obj-$(CONFIG_ACPI_DOCK)		+= dock.o

obj-$(CONFIG_ACPI_VIDEO)	+= video.o 

obj-$(CONFIG_ACPI_HOTKEY)	+= hotkey.o

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

CRA Git | Maintained and supported by SUSTech CRA and CCSE