Commit 474829e8 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: (53 commits)
  ACPI: install ACPI table handler before any dynamic tables being loaded
  ACPI / PM: Blacklist another machine that needs acpi_sleep=nonvs
  ACPI: Page based coalescing of I/O remappings optimization
  ACPI: Convert simple locking to RCU based locking
  ACPI: Pre-map 'system event' related register blocks
  ACPI: Add interfaces for ioremapping/iounmapping ACPI registers
  ACPI: Maintain a list of ACPI memory mapped I/O remappings
  ACPI: Fix ioremap size for MMIO reads and writes
  ACPI / Battery: Return -ENODEV for unknown values in get_property()
  ACPI / PM: Fix reference counting of power resources
  Subject: [PATCH] ACPICA: Fix Scope() op in module level code
  ACPI battery: support percentage battery remaining capacity
  ACPI: Make Embedded Controller command timeout delay configurable
  ACPI dock: move some functions to .init.text
  ACPI: thermal: remove unused limit code
  ACPI: static sleep_states[] and acpi_gts_bfs_check
  ACPI: remove dead code
  ACPI: delete dedicated MAINTAINERS entries for ACPI EC and BATTERY drivers
  ACPI: Only processor needs CPU_IDLE
  ACPICA: Update version to 20101013
  ...
parents 27afe58f 7e318424

MAINTAINERS

+0 −15
Original line number Diff line number Diff line
@@ -243,21 +243,6 @@ F: drivers/pnp/pnpacpi/ 
F:	include/linux/acpi.h

F:	include/acpi/



ACPI BATTERY DRIVERS

M:	Alexey Starikovskiy <astarikovskiy@suse.de>

L:	linux-acpi@vger.kernel.org

W:	http://www.lesswatts.org/projects/acpi/

S:	Supported

F:	drivers/acpi/battery.c

F:	drivers/acpi/*sbs*



ACPI EC DRIVER

M:	Alexey Starikovskiy <astarikovskiy@suse.de>

L:	linux-acpi@vger.kernel.org

W:	http://www.lesswatts.org/projects/acpi/

S:	Supported

F:	drivers/acpi/ec.c



ACPI FAN DRIVER

M:	Zhang Rui <rui.zhang@intel.com>

L:	linux-acpi@vger.kernel.org

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

+1 −0
Original line number Diff line number Diff line
@@ -701,6 +701,7 @@ static int acpi_cpufreq_cpu_exit(struct cpufreq_policy *policy) 
		per_cpu(acfreq_data, policy->cpu) = NULL;

		acpi_processor_unregister_performance(data->acpi_data,

						      policy->cpu);

		kfree(data->freq_table);

		kfree(data);

	}

drivers/acpi/Kconfig

+4 −9
Original line number Diff line number Diff line
@@ -9,7 +9,6 @@ menuconfig ACPI 
	depends on PCI

	depends on PM

	select PNP

	select CPU_IDLE

	default y

	help

	  Advanced Configuration and Power Interface (ACPI) support for
@@ -66,7 +65,6 @@ config ACPI_PROCFS 
config ACPI_PROCFS_POWER

	bool "Deprecated power /proc/acpi directories"

	depends on PROC_FS

	default y

	help

	  For backwards compatibility, this option allows

          deprecated power /proc/acpi/ directories to exist, even when
@@ -90,13 +88,6 @@ config ACPI_POWER_METER 
	  To compile this driver as a module, choose M here:

	  the module will be called power-meter.



config ACPI_SYSFS_POWER

	bool "Future power /sys interface"

	select POWER_SUPPLY

	default y

	help

	  Say N to disable power /sys interface



config ACPI_EC_DEBUGFS

	tristate "EC read/write access through /sys/kernel/debug/ec"

	default n
@@ -136,6 +127,7 @@ config ACPI_PROC_EVENT 
config ACPI_AC

	tristate "AC Adapter"

	depends on X86

	select POWER_SUPPLY

	default y

	help

	  This driver supports the AC Adapter object, which indicates
@@ -148,6 +140,7 @@ config ACPI_AC 
config ACPI_BATTERY

	tristate "Battery"

	depends on X86

	select POWER_SUPPLY

	default y

	help

	  This driver adds support for battery information through
@@ -206,6 +199,7 @@ config ACPI_DOCK 
config ACPI_PROCESSOR

	tristate "Processor"

	select THERMAL

	select CPU_IDLE

	default y

	help

	  This driver installs ACPI as the idle handler for Linux and uses
@@ -364,6 +358,7 @@ config ACPI_HOTPLUG_MEMORY 
config ACPI_SBS

	tristate "Smart Battery System"

	depends on X86

	select POWER_SUPPLY

	help

	  This driver supports the Smart Battery System, another

	  type of access to battery information, found on some laptops.

drivers/acpi/ac.c

+0 −14
Original line number Diff line number Diff line
@@ -32,9 +32,7 @@ 
#include <linux/proc_fs.h>

#include <linux/seq_file.h>

#endif

#ifdef CONFIG_ACPI_SYSFS_POWER

#include <linux/power_supply.h>

#endif

#include <acpi/acpi_bus.h>

#include <acpi/acpi_drivers.h>
@@ -86,9 +84,7 @@ static struct acpi_driver acpi_ac_driver = { 
};



struct acpi_ac {

#ifdef CONFIG_ACPI_SYSFS_POWER

	struct power_supply charger;

#endif

	struct acpi_device * device;

	unsigned long long state;

};
@@ -104,7 +100,6 @@ static const struct file_operations acpi_ac_fops = { 
	.release = single_release,

};

#endif

#ifdef CONFIG_ACPI_SYSFS_POWER

static int get_ac_property(struct power_supply *psy,

			   enum power_supply_property psp,

			   union power_supply_propval *val)
@@ -123,7 +118,6 @@ static int get_ac_property(struct power_supply *psy, 
static enum power_supply_property ac_props[] = {

	POWER_SUPPLY_PROP_ONLINE,

};

#endif

/* --------------------------------------------------------------------------

                               AC Adapter Management

   -------------------------------------------------------------------------- */
@@ -247,9 +241,7 @@ static void acpi_ac_notify(struct acpi_device *device, u32 event) 
						  dev_name(&device->dev), event,

						  (u32) ac->state);

		acpi_notifier_call_chain(device, event, (u32) ac->state);

#ifdef CONFIG_ACPI_SYSFS_POWER

		kobject_uevent(&ac->charger.dev->kobj, KOBJ_CHANGE);

#endif

	}



	return;
@@ -282,14 +274,12 @@ static int acpi_ac_add(struct acpi_device *device) 
#endif

	if (result)

		goto end;

#ifdef CONFIG_ACPI_SYSFS_POWER

	ac->charger.name = acpi_device_bid(device);

	ac->charger.type = POWER_SUPPLY_TYPE_MAINS;

	ac->charger.properties = ac_props;

	ac->charger.num_properties = ARRAY_SIZE(ac_props);

	ac->charger.get_property = get_ac_property;

	power_supply_register(&ac->device->dev, &ac->charger);

#endif



	printk(KERN_INFO PREFIX "%s [%s] (%s)\n",

	       acpi_device_name(device), acpi_device_bid(device),
@@ -316,10 +306,8 @@ static int acpi_ac_resume(struct acpi_device *device) 
	old_state = ac->state;

	if (acpi_ac_get_state(ac))

		return 0;

#ifdef CONFIG_ACPI_SYSFS_POWER

	if (old_state != ac->state)

		kobject_uevent(&ac->charger.dev->kobj, KOBJ_CHANGE);

#endif

	return 0;

}
@@ -333,10 +321,8 @@ static int acpi_ac_remove(struct acpi_device *device, int type) 


	ac = acpi_driver_data(device);



#ifdef CONFIG_ACPI_SYSFS_POWER

	if (ac->charger.dev)

		power_supply_unregister(&ac->charger);

#endif

#ifdef CONFIG_ACPI_PROCFS_POWER

	acpi_ac_remove_fs(device);

#endif

drivers/acpi/acpica/Makefile

+3 −2
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ acpi-y += exconfig.o exfield.o exnames.o exoparg6.o exresolv.o exstorob.o\ 
	 excreate.o  exmisc.o   exoparg2.o  exregion.o  exstore.o   exutils.o \

	 exdump.o    exmutex.o  exoparg3.o  exresnte.o  exstoren.o  exdebug.o



acpi-y += hwacpi.o  hwgpe.o  hwregs.o  hwsleep.o hwxface.o hwvalid.o

acpi-y += hwacpi.o  hwgpe.o  hwregs.o  hwsleep.o hwxface.o hwvalid.o hwpci.o



acpi-$(ACPI_FUTURE_USAGE) += hwtimer.o
@@ -44,4 +44,5 @@ acpi-y += tbxface.o tbinstal.o tbutils.o tbfind.o tbfadt.o tbxfroot.o 


acpi-y += utalloc.o utdebug.o uteval.o utinit.o utmisc.o utxface.o \

		utcopy.o utdelete.o utglobal.o utmath.o utobject.o \

		utstate.o utmutex.o utobject.o utresrc.o utlock.o utids.o
 
		utstate.o utmutex.o utobject.o utresrc.o utlock.o utids.o \

		utosi.o utxferror.o

CRA Git | Maintained and supported by SUSTech CRA and CCSE