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: (28 commits) ACPI: delete stale reference in kernel-parameters.txt ACPI: add missing _OSI strings ACPI: remove NID_INVAL thermal: make THERMAL_HWMON implementation fully internal thermal: split hwmon lookup to a separate function thermal: hide CONFIG_THERMAL_HWMON ACPI print OSI(Linux) warning only once ACPI: DMI workaround for Asus A8N-SLI Premium and Asus A8N-SLI DELUX ACPI / Battery: propagate sysfs error in acpi_battery_add() ACPI / Battery: avoid acpi_battery_add() use-after-free ACPI: introduce "acpi_rsdp=" parameter for kdump ACPI: constify ops structs ACPI: fix CONFIG_X86_REROUTE_FOR_BROKEN_BOOT_IRQS ACPI: fix 80 char overflow ACPI / Battery: Resolve the race condition in the sysfs_remove_battery() ACPI / Battery: Add the check before refresh sysfs in the battery_notify() ACPI / Battery: Add the hibernation process in the battery_notify() ACPI / Battery: Rename acpi_battery_quirks2 with acpi_battery_quirks ACPI / Battery: Change 16-bit signed negative battery current into correct value ACPI / Battery: Add the power unit macro ...

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: (28 commits) ACPI: delete stale reference in kernel-parameters.txt ACPI: add missing _OSI strings ACPI: remove NID_INVAL thermal: make THERMAL_HWMON implementation fully internal thermal: split hwmon lookup to a separate function thermal: hide CONFIG_THERMAL_HWMON ACPI print OSI(Linux) warning only once ACPI: DMI workaround for Asus A8N-SLI Premium and Asus A8N-SLI DELUX ACPI / Battery: propagate sysfs error in acpi_battery_add() ACPI / Battery: avoid acpi_battery_add() use-after-free ACPI: introduce "acpi_rsdp=" parameter for kdump ACPI: constify ops structs ACPI: fix CONFIG_X86_REROUTE_FOR_BROKEN_BOOT_IRQS ACPI: fix 80 char overflow ACPI / Battery: Resolve the race condition in the sysfs_remove_battery() ACPI / Battery: Add the check before refresh sysfs in the battery_notify() ACPI / Battery: Add the hibernation process in the battery_notify() ACPI / Battery: Rename acpi_battery_quirks2 with acpi_battery_quirks ACPI / Battery: Change 16-bit signed negative battery current into correct value ACPI / Battery: Add the power unit macro ...
Linus Torvalds
2 parents 1850536b93 4a8f5058bd
Showing 30 changed files Side-by-side Diff
Documentation/feature-removal-schedule.txt
Documentation/kernel-parameters.txt
drivers/acpi/acpica/acglobal.h
drivers/acpi/acpica/aclocal.h
drivers/acpi/acpica/acpredef.h
drivers/acpi/acpica/nspredef.c
drivers/acpi/acpica/nsrepair2.c
drivers/acpi/acpica/tbinstal.c
drivers/acpi/battery.c
drivers/acpi/dock.c
drivers/acpi/ec_sys.c
drivers/acpi/fan.c
drivers/acpi/osl.c
drivers/acpi/pci_irq.c
drivers/acpi/pci_root.c
drivers/acpi/processor_thermal.c
drivers/acpi/sbs.c
drivers/acpi/sleep.c
drivers/acpi/sysfs.c
drivers/acpi/thermal.c
@@ -296,15 +296,6 @@
  
 ---------------------------
  
-What:	CONFIG_THERMAL_HWMON
-When:	January 2009
-Why:	This option was introduced just to allow older lm-sensors userspace
-	to keep working over the upgrade to 2.6.26. At the scheduled time of
-	removal fixed lm-sensors (2.x or 3.x) should be readily available.
-Who:	Rene Herman <rene.herman@gmail.com>
-
----------------------------
-
 What:	Code that is now under CONFIG_WIRELESS_EXT_SYSFS
 	(in net/core/net-sysfs.c)
 When:	After the only user (hal) has seen a release with the patches
@@ -163,6 +163,11 @@
  
 			See also Documentation/power/pm.txt, pci=noacpi
  
+	acpi_rsdp=	[ACPI,EFI,KEXEC]
+			Pass the RSDP address to the kernel, mostly used
+			on machines running EFI runtime service to boot the
+			second kernel for kdump.
+
 	acpi_apic_instance=	[ACPI, IOAPIC]
 			Format: <int>
 			2: use 2nd APIC table, if available
@@ -126,6 +126,12 @@
  */
 u8 ACPI_INIT_GLOBAL(acpi_gbl_truncate_io_addresses, FALSE);
  
+/*
+ * Disable runtime checking and repair of values returned by control methods.
+ * Use only if the repair is causing a problem on a particular machine.
+ */
+u8 ACPI_INIT_GLOBAL(acpi_gbl_disable_auto_repair, FALSE);
+
 /* acpi_gbl_FADT is a local copy of the FADT, converted to a common format. */
  
 struct acpi_table_fadt acpi_gbl_FADT;
@@ -357,6 +357,7 @@
 	char *pathname;
 	const union acpi_predefined_info *predefined;
 	union acpi_operand_object *parent_package;
+	struct acpi_namespace_node *node;
 	u32 flags;
 	u8 node_flags;
 };
@@ -468,6 +468,7 @@
 	{{"_SWS", 0, ACPI_RTYPE_INTEGER}},
 	{{"_TC1", 0, ACPI_RTYPE_INTEGER}},
 	{{"_TC2", 0, ACPI_RTYPE_INTEGER}},
+	{{"_TDL", 0, ACPI_RTYPE_INTEGER}},
 	{{"_TIP", 1, ACPI_RTYPE_INTEGER}},
 	{{"_TIV", 1, ACPI_RTYPE_INTEGER}},
 	{{"_TMP", 0, ACPI_RTYPE_INTEGER}},
@@ -193,14 +193,20 @@
 	}
  
 	/*
-	 * 1) We have a return value, but if one wasn't expected, just exit, this is
-	 * not a problem. For example, if the "Implicit Return" feature is
-	 * enabled, methods will always return a value.
+	 * Return value validation and possible repair.
 	 *
-	 * 2) If the return value can be of any type, then we cannot perform any
-	 * validation, exit.
+	 * 1) Don't perform return value validation/repair if this feature
+	 * has been disabled via a global option.
+	 *
+	 * 2) We have a return value, but if one wasn't expected, just exit,
+	 * this is not a problem. For example, if the "Implicit Return"
+	 * feature is enabled, methods will always return a value.
+	 *
+	 * 3) If the return value can be of any type, then we cannot perform
+	 * any validation, just exit.
 	 */
-	if ((!predefined->info.expected_btypes) ||
+	if (acpi_gbl_disable_auto_repair ||
+	    (!predefined->info.expected_btypes) ||
 	    (predefined->info.expected_btypes == ACPI_RTYPE_ALL)) {
 		goto cleanup;
 	}
@@ -212,6 +218,7 @@
 		goto cleanup;
 	}
 	data->predefined = predefined;
+	data->node = node;
 	data->node_flags = node->flags;
 	data->pathname = pathname;
  
@@ -503,6 +503,21 @@
 {
 	union acpi_operand_object *return_object = *return_object_ptr;
 	acpi_status status;
+	struct acpi_namespace_node *node;
+
+	/*
+	 * We can only sort the _TSS return package if there is no _PSS in the
+	 * same scope. This is because if _PSS is present, the ACPI specification
+	 * dictates that the _TSS Power Dissipation field is to be ignored, and
+	 * therefore some BIOSs leave garbage values in the _TSS Power field(s).
+	 * In this case, it is best to just return the _TSS package as-is.
+	 * (May, 2011)
+	 */
+	status =
+	    acpi_ns_get_node(data->node, "^_PSS", ACPI_NS_NO_UPSEARCH, &node);
+	if (ACPI_SUCCESS(status)) {
+		return (AE_OK);
+	}
  
 	status = acpi_ns_check_sorted_list(data, return_object, 5, 1,
 					   ACPI_SORT_DESCENDING,
@@ -126,12 +126,29 @@
 	}
  
 	/*
-	 * Originally, we checked the table signature for "SSDT" or "PSDT" here.
-	 * Next, we added support for OEMx tables, signature "OEM".
-	 * Valid tables were encountered with a null signature, so we've just
-	 * given up on validating the signature, since it seems to be a waste
-	 * of code. The original code was removed (05/2008).
+	 * Validate the incoming table signature.
+	 *
+	 * 1) Originally, we checked the table signature for "SSDT" or "PSDT".
+	 * 2) We added support for OEMx tables, signature "OEM".
+	 * 3) Valid tables were encountered with a null signature, so we just
+	 *    gave up on validating the signature, (05/2008).
+	 * 4) We encountered non-AML tables such as the MADT, which caused
+	 *    interpreter errors and kernel faults. So now, we once again allow
+	 *    only "SSDT", "OEMx", and now, also a null signature. (05/2011).
 	 */
+	if ((table_desc->pointer->signature[0] != 0x00) &&
+	    (!ACPI_COMPARE_NAME(table_desc->pointer->signature, ACPI_SIG_SSDT))
+	    && (ACPI_STRNCMP(table_desc->pointer->signature, "OEM", 3))) {
+		ACPI_ERROR((AE_INFO,
+			    "Table has invalid signature [%4.4s] (0x%8.8X), must be SSDT or OEMx",
+			    acpi_ut_valid_acpi_name(*(u32 *)table_desc->
+						    pointer->
+						    signature) ? table_desc->
+			    pointer->signature : "????",
+			    *(u32 *)table_desc->pointer->signature));
+
+		return_ACPI_STATUS(AE_BAD_SIGNATURE);
+	}
  
 	(void)acpi_ut_acquire_mutex(ACPI_MTX_TABLES);
  
@@ -55,6 +55,9 @@
 #define ACPI_BATTERY_NOTIFY_INFO	0x81
 #define ACPI_BATTERY_NOTIFY_THRESHOLD   0x82
  
+/* Battery power unit: 0 means mW, 1 means mA */
+#define ACPI_BATTERY_POWER_UNIT_MA	1
+
 #define _COMPONENT		ACPI_BATTERY_COMPONENT
  
 ACPI_MODULE_NAME("battery");
@@ -91,11 +94,6 @@
 enum {
 	ACPI_BATTERY_ALARM_PRESENT,
 	ACPI_BATTERY_XINFO_PRESENT,
-	/* For buggy DSDTs that report negative 16-bit values for either
-	 * charging or discharging current and/or report 0 as 65536
-	 * due to bad math.
-	 */
-	ACPI_BATTERY_QUIRK_SIGNED16_CURRENT,
 	ACPI_BATTERY_QUIRK_PERCENTAGE_CAPACITY,
 };
  
@@ -301,7 +299,8 @@
 #ifdef CONFIG_ACPI_PROCFS_POWER
 inline char *acpi_battery_units(struct acpi_battery *battery)
 {
-	return (battery->power_unit)?"mA":"mW";
+	return (battery->power_unit == ACPI_BATTERY_POWER_UNIT_MA) ?
+		"mA" : "mW";
 }
 #endif
  
  
@@ -461,9 +460,17 @@
 	battery->update_time = jiffies;
 	kfree(buffer.pointer);
  
-	if (test_bit(ACPI_BATTERY_QUIRK_SIGNED16_CURRENT, &battery->flags) &&
-	    battery->rate_now != -1)
+	/* For buggy DSDTs that report negative 16-bit values for either
+	 * charging or discharging current and/or report 0 as 65536
+	 * due to bad math.
+	 */
+	if (battery->power_unit == ACPI_BATTERY_POWER_UNIT_MA &&
+		battery->rate_now != ACPI_BATTERY_VALUE_UNKNOWN &&
+		(s16)(battery->rate_now) < 0) {
 		battery->rate_now = abs((s16)battery->rate_now);
+		printk_once(KERN_WARNING FW_BUG "battery: (dis)charge rate"
+			" invalid.\n");
+	}
  
 	if (test_bit(ACPI_BATTERY_QUIRK_PERCENTAGE_CAPACITY, &battery->flags)
 	    && battery->capacity_now >= 0 && battery->capacity_now <= 100)
@@ -544,7 +551,7 @@
 {
 	int result;
  
-	if (battery->power_unit) {
+	if (battery->power_unit == ACPI_BATTERY_POWER_UNIT_MA) {
 		battery->bat.properties = charge_battery_props;
 		battery->bat.num_properties =
 			ARRAY_SIZE(charge_battery_props);
  
  
  
@@ -566,20 +573,18 @@
  
 static void sysfs_remove_battery(struct acpi_battery *battery)
 {
-	if (!battery->bat.dev)
+	mutex_lock(&battery->lock);
+	if (!battery->bat.dev) {
+		mutex_unlock(&battery->lock);
 		return;
+	}
+
 	device_remove_file(battery->bat.dev, &alarm_attr);
 	power_supply_unregister(&battery->bat);
 	battery->bat.dev = NULL;
+	mutex_unlock(&battery->lock);
 }
  
-static void acpi_battery_quirks(struct acpi_battery *battery)
-{
-	if (dmi_name_in_vendors("Acer") && battery->power_unit) {
-		set_bit(ACPI_BATTERY_QUIRK_SIGNED16_CURRENT, &battery->flags);
-	}
-}
-
 /*
  * According to the ACPI spec, some kinds of primary batteries can
  * report percentage battery remaining capacity directly to OS.
@@ -592,7 +597,7 @@
  *
  * Handle this correctly so that they won't break userspace.
  */
-static void acpi_battery_quirks2(struct acpi_battery *battery)
+static void acpi_battery_quirks(struct acpi_battery *battery)
 {
 	if (test_bit(ACPI_BATTERY_QUIRK_PERCENTAGE_CAPACITY, &battery->flags))
 		return ;
  
  
@@ -623,13 +628,15 @@
 		result = acpi_battery_get_info(battery);
 		if (result)
 			return result;
-		acpi_battery_quirks(battery);
 		acpi_battery_init_alarm(battery);
 	}
-	if (!battery->bat.dev)
-		sysfs_add_battery(battery);
+	if (!battery->bat.dev) {
+		result = sysfs_add_battery(battery);
+		if (result)
+			return result;
+	}
 	result = acpi_battery_get_state(battery);
-	acpi_battery_quirks2(battery);
+	acpi_battery_quirks(battery);
 	return result;
 }
  
@@ -863,7 +870,7 @@
 		}, \
 	}
  
-static struct battery_file {
+static const struct battery_file {
 	struct file_operations ops;
 	mode_t mode;
 	const char *name;
  
@@ -948,9 +955,12 @@
 	struct acpi_battery *battery = container_of(nb, struct acpi_battery,
 						    pm_nb);
 	switch (mode) {
+	case PM_POST_HIBERNATION:
 	case PM_POST_SUSPEND:
-		sysfs_remove_battery(battery);
-		sysfs_add_battery(battery);
+		if (battery->bat.dev) {
+			sysfs_remove_battery(battery);
+			sysfs_add_battery(battery);
+		}
 		break;
 	}
  
  
  
  
  
@@ -975,24 +985,32 @@
 	if (ACPI_SUCCESS(acpi_get_handle(battery->device->handle,
 			"_BIX", &handle)))
 		set_bit(ACPI_BATTERY_XINFO_PRESENT, &battery->flags);
-	acpi_battery_update(battery);
+	result = acpi_battery_update(battery);
+	if (result)
+		goto fail;
 #ifdef CONFIG_ACPI_PROCFS_POWER
 	result = acpi_battery_add_fs(device);
 #endif
-	if (!result) {
-		printk(KERN_INFO PREFIX "%s Slot [%s] (battery %s)\n",
-			ACPI_BATTERY_DEVICE_NAME, acpi_device_bid(device),
-			device->status.battery_present ? "present" : "absent");
-	} else {
+	if (result) {
 #ifdef CONFIG_ACPI_PROCFS_POWER
 		acpi_battery_remove_fs(device);
 #endif
-		kfree(battery);
+		goto fail;
 	}
  
+	printk(KERN_INFO PREFIX "%s Slot [%s] (battery %s)\n",
+		ACPI_BATTERY_DEVICE_NAME, acpi_device_bid(device),
+		device->status.battery_present ? "present" : "absent");
+
 	battery->pm_nb.notifier_call = battery_notify;
 	register_pm_notifier(&battery->pm_nb);
  
+	return result;
+
+fail:
+	sysfs_remove_battery(battery);
+	mutex_destroy(&battery->lock);
+	kfree(battery);
 	return result;
 }
  
@@ -77,7 +77,7 @@
 	struct list_head list;
 	struct list_head hotplug_list;
 	acpi_handle handle;
-	struct acpi_dock_ops *ops;
+	const struct acpi_dock_ops *ops;
 	void *context;
 };
  
@@ -589,7 +589,7 @@
  * the dock driver after _DCK is executed.
  */
 int
-register_hotplug_dock_device(acpi_handle handle, struct acpi_dock_ops *ops,
+register_hotplug_dock_device(acpi_handle handle, const struct acpi_dock_ops *ops,
 			     void *context)
 {
 	struct dock_dependent_device *dd;
@@ -92,7 +92,7 @@
 	return count;
 }
  
-static struct file_operations acpi_ec_io_ops = {
+static const struct file_operations acpi_ec_io_ops = {
 	.owner = THIS_MODULE,
 	.open  = acpi_ec_open_io,
 	.read  = acpi_ec_read_io,
@@ -110,7 +110,7 @@
 	return result;
 }
  
-static struct thermal_cooling_device_ops fan_cooling_ops = {
+static const struct thermal_cooling_device_ops fan_cooling_ops = {
 	.get_max_state = fan_get_max_state,
 	.get_cur_state = fan_get_cur_state,
 	.set_cur_state = fan_set_cur_state,
@@ -155,7 +155,7 @@
 {
 	if (!strcmp("Linux", interface)) {
  
-		printk(KERN_NOTICE FW_BUG PREFIX
+		printk_once(KERN_NOTICE FW_BUG PREFIX
 			"BIOS _OSI(Linux) query %s%s\n",
 			osi_linux.enable ? "honored" : "ignored",
 			osi_linux.cmdline ? " via cmdline" :
  
@@ -237,8 +237,23 @@
 #endif
 }
  
+#ifdef CONFIG_KEXEC
+static unsigned long acpi_rsdp;
+static int __init setup_acpi_rsdp(char *arg)
+{
+	acpi_rsdp = simple_strtoul(arg, NULL, 16);
+	return 0;
+}
+early_param("acpi_rsdp", setup_acpi_rsdp);
+#endif
+
 acpi_physical_address __init acpi_os_get_root_pointer(void)
 {
+#ifdef CONFIG_KEXEC
+	if (acpi_rsdp)
+		return acpi_rsdp;
+#endif
+
 	if (efi_enabled) {
 		if (efi.acpi20 != EFI_INVALID_TABLE_ADDR)
 			return efi.acpi20;
@@ -1083,7 +1098,13 @@
 	bool enable;
 };
  
-static struct osi_setup_entry __initdata osi_setup_entries[OSI_STRING_ENTRIES_MAX];
+static struct osi_setup_entry __initdata
+		osi_setup_entries[OSI_STRING_ENTRIES_MAX] = {
+	{"Module Device", true},
+	{"Processor Device", true},
+	{"3.0 _SCP Extensions", true},
+	{"Processor Aggregator Device", true},
+};
  
 void __init acpi_osi_setup(char *str)
 {
@@ -303,6 +303,61 @@
 /* --------------------------------------------------------------------------
                           PCI Interrupt Routing Support
    -------------------------------------------------------------------------- */
+#ifdef CONFIG_X86_IO_APIC
+extern int noioapicquirk;
+extern int noioapicreroute;
+
+static int bridge_has_boot_interrupt_variant(struct pci_bus *bus)
+{
+	struct pci_bus *bus_it;
+
+	for (bus_it = bus ; bus_it ; bus_it = bus_it->parent) {
+		if (!bus_it->self)
+			return 0;
+		if (bus_it->self->irq_reroute_variant)
+			return bus_it->self->irq_reroute_variant;
+	}
+	return 0;
+}
+
+/*
+ * Some chipsets (e.g. Intel 6700PXH) generate a legacy INTx when the IRQ
+ * entry in the chipset's IO-APIC is masked (as, e.g. the RT kernel does
+ * during interrupt handling). When this INTx generation cannot be disabled,
+ * we reroute these interrupts to their legacy equivalent to get rid of
+ * spurious interrupts.
+ */
+static int acpi_reroute_boot_interrupt(struct pci_dev *dev,
+				       struct acpi_prt_entry *entry)
+{
+	if (noioapicquirk || noioapicreroute) {
+		return 0;
+	} else {
+		switch (bridge_has_boot_interrupt_variant(dev->bus)) {
+		case 0:
+			/* no rerouting necessary */
+			return 0;
+		case INTEL_IRQ_REROUTE_VARIANT:
+			/*
+			 * Remap according to INTx routing table in 6700PXH
+			 * specs, intel order number 302628-002, section
+			 * 2.15.2. Other chipsets (80332, ...) have the same
+			 * mapping and are handled here as well.
+			 */
+			dev_info(&dev->dev, "PCI IRQ %d -> rerouted to legacy "
+				 "IRQ %d\n", entry->index,
+				 (entry->index % 4) + 16);
+			entry->index = (entry->index % 4) + 16;
+			return 1;
+		default:
+			dev_warn(&dev->dev, "Cannot reroute IRQ %d to legacy "
+				 "IRQ: unknown mapping\n", entry->index);
+			return -1;
+		}
+	}
+}
+#endif /* CONFIG_X86_IO_APIC */
+
 static struct acpi_prt_entry *acpi_pci_irq_lookup(struct pci_dev *dev, int pin)
 {
 	struct acpi_prt_entry *entry;
@@ -311,6 +366,9 @@
  
 	entry = acpi_pci_irq_find_prt_entry(dev, pin);
 	if (entry) {
+#ifdef CONFIG_X86_IO_APIC
+		acpi_reroute_boot_interrupt(dev, entry);
+#endif /* CONFIG_X86_IO_APIC */
 		ACPI_DEBUG_PRINT((ACPI_DB_INFO, "Found %s[%c] _PRT entry\n",
 				  pci_name(dev), pin_name(pin)));
 		return entry;
@@ -485,7 +485,8 @@
 		root->secondary.end = 0xFF;
 		printk(KERN_WARNING FW_BUG PREFIX
 		       "no secondary bus range in _CRS\n");
-		status = acpi_evaluate_integer(device->handle, METHOD_NAME__BBN,					       NULL, &bus);
+		status = acpi_evaluate_integer(device->handle, METHOD_NAME__BBN,
+					       NULL, &bus);
 		if (ACPI_SUCCESS(status))
 			root->secondary.start = bus;
 		else if (status == AE_NOT_FOUND)
@@ -244,7 +244,7 @@
 	return result;
 }
  
-struct thermal_cooling_device_ops processor_cooling_ops = {
+const struct thermal_cooling_device_ops processor_cooling_ops = {
 	.get_max_state = processor_get_max_state,
 	.get_cur_state = processor_get_cur_state,
 	.set_cur_state = processor_set_cur_state,
@@ -130,6 +130,9 @@
  
 #define to_acpi_sbs(x) container_of(x, struct acpi_sbs, charger)
  
+static int acpi_sbs_remove(struct acpi_device *device, int type);
+static int acpi_battery_get_state(struct acpi_battery *battery);
+
 static inline int battery_scale(int log)
 {
 	int scale = 1;
@@ -195,6 +198,8 @@
  
 	if ((!battery->present) && psp != POWER_SUPPLY_PROP_PRESENT)
 		return -ENODEV;
+
+	acpi_battery_get_state(battery);
 	switch (psp) {
 	case POWER_SUPPLY_PROP_STATUS:
 		if (battery->rate_now < 0)
  
@@ -225,11 +230,17 @@
 	case POWER_SUPPLY_PROP_POWER_NOW:
 		val->intval = abs(battery->rate_now) *
 				acpi_battery_ipscale(battery) * 1000;
+		val->intval *= (acpi_battery_mode(battery)) ?
+				(battery->voltage_now *
+				acpi_battery_vscale(battery) / 1000) : 1;
 		break;
 	case POWER_SUPPLY_PROP_CURRENT_AVG:
 	case POWER_SUPPLY_PROP_POWER_AVG:
 		val->intval = abs(battery->rate_avg) *
 				acpi_battery_ipscale(battery) * 1000;
+		val->intval *= (acpi_battery_mode(battery)) ?
+				(battery->voltage_now *
+				acpi_battery_vscale(battery) / 1000) : 1;
 		break;
 	case POWER_SUPPLY_PROP_CAPACITY:
 		val->intval = battery->state_of_charge;
@@ -902,8 +913,6 @@
 		}
 	}
 }
-
-static int acpi_sbs_remove(struct acpi_device *device, int type);
  
 static int acpi_sbs_add(struct acpi_device *device)
 {
@@ -428,6 +428,22 @@
 		DMI_MATCH(DMI_PRODUCT_NAME, "1000 Series"),
 		},
 	},
+	{
+	.callback = init_old_suspend_ordering,
+	.ident = "Asus A8N-SLI DELUXE",
+	.matches = {
+		DMI_MATCH(DMI_BOARD_VENDOR, "ASUSTeK Computer INC."),
+		DMI_MATCH(DMI_BOARD_NAME, "A8N-SLI DELUXE"),
+		},
+	},
+	{
+	.callback = init_old_suspend_ordering,
+	.ident = "Asus A8N-SLI Premium",
+	.matches = {
+		DMI_MATCH(DMI_BOARD_VENDOR, "ASUSTeK Computer INC."),
+		DMI_MATCH(DMI_BOARD_NAME, "A8N-SLI Premium"),
+		},
+	},
 	{},
 };
 #endif /* CONFIG_SUSPEND */
@@ -149,12 +149,12 @@
 	return result;
 }
  
-static struct kernel_param_ops param_ops_debug_layer = {
+static const struct kernel_param_ops param_ops_debug_layer = {
 	.set = param_set_uint,
 	.get = param_get_debug_layer,
 };
  
-static struct kernel_param_ops param_ops_debug_level = {
+static const struct kernel_param_ops param_ops_debug_level = {
 	.set = param_set_uint,
 	.get = param_get_debug_level,
 };
@@ -812,7 +812,7 @@
 				thermal_zone_unbind_cooling_device);
 }
  
-static struct thermal_zone_device_ops acpi_thermal_zone_ops = {
+static const struct thermal_zone_device_ops acpi_thermal_zone_ops = {
 	.bind = acpi_thermal_bind_cooling_device,
 	.unbind	= acpi_thermal_unbind_cooling_device,
 	.get_temp = thermal_get_temp,
@@ -307,7 +307,7 @@
 	return acpi_video_device_lcd_set_level(video, level);
 }
  
-static struct thermal_cooling_device_ops video_cooling_ops = {
+static const struct thermal_cooling_device_ops video_cooling_ops = {
 	.get_max_state = video_get_max_state,
 	.get_cur_state = video_get_cur_state,
 	.set_cur_state = video_set_cur_state,
@@ -218,12 +218,12 @@
 	ata_acpi_uevent(dev->link->ap, dev, event);
 }
  
-static struct acpi_dock_ops ata_acpi_dev_dock_ops = {
+static const struct acpi_dock_ops ata_acpi_dev_dock_ops = {
 	.handler = ata_acpi_dev_notify_dock,
 	.uevent = ata_acpi_dev_uevent,
 };
  
-static struct acpi_dock_ops ata_acpi_ap_dock_ops = {
+static const struct acpi_dock_ops ata_acpi_ap_dock_ops = {
 	.handler = ata_acpi_ap_notify_dock,
 	.uevent = ata_acpi_ap_uevent,
 };
@@ -110,7 +110,7 @@
 }
  
  
-static struct acpi_dock_ops acpiphp_dock_ops = {
+static const struct acpi_dock_ops acpiphp_dock_ops = {
 	.handler = handle_hotplug_event_func,
 };
  
@@ -14,12 +14,8 @@
 	  If you want this support, you should say Y or M here.
  
 config THERMAL_HWMON
-	bool "Hardware monitoring support"
+	bool
 	depends on THERMAL
 	depends on HWMON=y || HWMON=THERMAL
-	help
-	  The generic thermal sysfs driver's hardware monitoring support
-	  requires a 2.10.7/3.0.2 or later lm-sensors userspace.
-
-	  Say Y if your user-space is new enough.
+	default y
@@ -420,6 +420,29 @@
  
 /* hwmon sys I/F */
 #include <linux/hwmon.h>
+
+/* thermal zone devices with the same type share one hwmon device */
+struct thermal_hwmon_device {
+	char type[THERMAL_NAME_LENGTH];
+	struct device *device;
+	int count;
+	struct list_head tz_list;
+	struct list_head node;
+};
+
+struct thermal_hwmon_attr {
+	struct device_attribute attr;
+	char name[16];
+};
+
+/* one temperature input for each thermal zone */
+struct thermal_hwmon_temp {
+	struct list_head hwmon_node;
+	struct thermal_zone_device *tz;
+	struct thermal_hwmon_attr temp_input;	/* hwmon sys attr */
+	struct thermal_hwmon_attr temp_crit;	/* hwmon sys attr */
+};
+
 static LIST_HEAD(thermal_hwmon_list);
  
 static ssize_t
  
@@ -437,9 +460,10 @@
 	int ret;
 	struct thermal_hwmon_attr *hwmon_attr
 			= container_of(attr, struct thermal_hwmon_attr, attr);
-	struct thermal_zone_device *tz
-			= container_of(hwmon_attr, struct thermal_zone_device,
+	struct thermal_hwmon_temp *temp
+			= container_of(hwmon_attr, struct thermal_hwmon_temp,
 				       temp_input);
+	struct thermal_zone_device *tz = temp->tz;
  
 	ret = tz->ops->get_temp(tz, &temperature);
  
  
@@ -455,9 +479,10 @@
 {
 	struct thermal_hwmon_attr *hwmon_attr
 			= container_of(attr, struct thermal_hwmon_attr, attr);
-	struct thermal_zone_device *tz
-			= container_of(hwmon_attr, struct thermal_zone_device,
+	struct thermal_hwmon_temp *temp
+			= container_of(hwmon_attr, struct thermal_hwmon_temp,
 				       temp_crit);
+	struct thermal_zone_device *tz = temp->tz;
 	long temperature;
 	int ret;
  
  
  
  
  
@@ -469,22 +494,54 @@
 }
  
  
-static int
-thermal_add_hwmon_sysfs(struct thermal_zone_device *tz)
+static struct thermal_hwmon_device *
+thermal_hwmon_lookup_by_type(const struct thermal_zone_device *tz)
 {
 	struct thermal_hwmon_device *hwmon;
-	int new_hwmon_device = 1;
-	int result;
  
 	mutex_lock(&thermal_list_lock);
 	list_for_each_entry(hwmon, &thermal_hwmon_list, node)
 		if (!strcmp(hwmon->type, tz->type)) {
-			new_hwmon_device = 0;
 			mutex_unlock(&thermal_list_lock);
-			goto register_sys_interface;
+			return hwmon;
 		}
 	mutex_unlock(&thermal_list_lock);
  
+	return NULL;
+}
+
+/* Find the temperature input matching a given thermal zone */
+static struct thermal_hwmon_temp *
+thermal_hwmon_lookup_temp(const struct thermal_hwmon_device *hwmon,
+			  const struct thermal_zone_device *tz)
+{
+	struct thermal_hwmon_temp *temp;
+
+	mutex_lock(&thermal_list_lock);
+	list_for_each_entry(temp, &hwmon->tz_list, hwmon_node)
+		if (temp->tz == tz) {
+			mutex_unlock(&thermal_list_lock);
+			return temp;
+		}
+	mutex_unlock(&thermal_list_lock);
+
+	return NULL;
+}
+
+static int
+thermal_add_hwmon_sysfs(struct thermal_zone_device *tz)
+{
+	struct thermal_hwmon_device *hwmon;
+	struct thermal_hwmon_temp *temp;
+	int new_hwmon_device = 1;
+	int result;
+
+	hwmon = thermal_hwmon_lookup_by_type(tz);
+	if (hwmon) {
+		new_hwmon_device = 0;
+		goto register_sys_interface;
+	}
+
 	hwmon = kzalloc(sizeof(struct thermal_hwmon_device), GFP_KERNEL);
 	if (!hwmon)
 		return -ENOMEM;
  
  
  
  
  
  
@@ -502,30 +559,36 @@
 		goto free_mem;
  
  register_sys_interface:
-	tz->hwmon = hwmon;
+	temp = kzalloc(sizeof(struct thermal_hwmon_temp), GFP_KERNEL);
+	if (!temp) {
+		result = -ENOMEM;
+		goto unregister_name;
+	}
+
+	temp->tz = tz;
 	hwmon->count++;
  
-	snprintf(tz->temp_input.name, THERMAL_NAME_LENGTH,
+	snprintf(temp->temp_input.name, THERMAL_NAME_LENGTH,
 		 "temp%d_input", hwmon->count);
-	tz->temp_input.attr.attr.name = tz->temp_input.name;
-	tz->temp_input.attr.attr.mode = 0444;
-	tz->temp_input.attr.show = temp_input_show;
-	sysfs_attr_init(&tz->temp_input.attr.attr);
-	result = device_create_file(hwmon->device, &tz->temp_input.attr);
+	temp->temp_input.attr.attr.name = temp->temp_input.name;
+	temp->temp_input.attr.attr.mode = 0444;
+	temp->temp_input.attr.show = temp_input_show;
+	sysfs_attr_init(&temp->temp_input.attr.attr);
+	result = device_create_file(hwmon->device, &temp->temp_input.attr);
 	if (result)
-		goto unregister_name;
+		goto free_temp_mem;
  
 	if (tz->ops->get_crit_temp) {
 		unsigned long temperature;
 		if (!tz->ops->get_crit_temp(tz, &temperature)) {
-			snprintf(tz->temp_crit.name, THERMAL_NAME_LENGTH,
+			snprintf(temp->temp_crit.name, THERMAL_NAME_LENGTH,
 				"temp%d_crit", hwmon->count);
-			tz->temp_crit.attr.attr.name = tz->temp_crit.name;
-			tz->temp_crit.attr.attr.mode = 0444;
-			tz->temp_crit.attr.show = temp_crit_show;
-			sysfs_attr_init(&tz->temp_crit.attr.attr);
+			temp->temp_crit.attr.attr.name = temp->temp_crit.name;
+			temp->temp_crit.attr.attr.mode = 0444;
+			temp->temp_crit.attr.show = temp_crit_show;
+			sysfs_attr_init(&temp->temp_crit.attr.attr);
 			result = device_create_file(hwmon->device,
-						    &tz->temp_crit.attr);
+						    &temp->temp_crit.attr);
 			if (result)
 				goto unregister_input;
 		}
  
@@ -534,13 +597,15 @@
 	mutex_lock(&thermal_list_lock);
 	if (new_hwmon_device)
 		list_add_tail(&hwmon->node, &thermal_hwmon_list);
-	list_add_tail(&tz->hwmon_node, &hwmon->tz_list);
+	list_add_tail(&temp->hwmon_node, &hwmon->tz_list);
 	mutex_unlock(&thermal_list_lock);
  
 	return 0;
  
  unregister_input:
-	device_remove_file(hwmon->device, &tz->temp_input.attr);
+	device_remove_file(hwmon->device, &temp->temp_input.attr);
+ free_temp_mem:
+	kfree(temp);
  unregister_name:
 	if (new_hwmon_device) {
 		device_remove_file(hwmon->device, &dev_attr_name);
  
  
  
@@ -556,15 +621,30 @@
 static void
 thermal_remove_hwmon_sysfs(struct thermal_zone_device *tz)
 {
-	struct thermal_hwmon_device *hwmon = tz->hwmon;
+	struct thermal_hwmon_device *hwmon;
+	struct thermal_hwmon_temp *temp;
  
-	tz->hwmon = NULL;
-	device_remove_file(hwmon->device, &tz->temp_input.attr);
+	hwmon = thermal_hwmon_lookup_by_type(tz);
+	if (unlikely(!hwmon)) {
+		/* Should never happen... */
+		dev_dbg(&tz->device, "hwmon device lookup failed!\n");
+		return;
+	}
+
+	temp = thermal_hwmon_lookup_temp(hwmon, tz);
+	if (unlikely(!temp)) {
+		/* Should never happen... */
+		dev_dbg(&tz->device, "temperature input lookup failed!\n");
+		return;
+	}
+
+	device_remove_file(hwmon->device, &temp->temp_input.attr);
 	if (tz->ops->get_crit_temp)
-		device_remove_file(hwmon->device, &tz->temp_crit.attr);
+		device_remove_file(hwmon->device, &temp->temp_crit.attr);
  
 	mutex_lock(&thermal_list_lock);
-	list_del(&tz->hwmon_node);
+	list_del(&temp->hwmon_node);
+	kfree(temp);
 	if (!list_empty(&hwmon->tz_list)) {
 		mutex_unlock(&thermal_list_lock);
 		return;
@@ -128,7 +128,7 @@
 extern int register_dock_notifier(struct notifier_block *nb);
 extern void unregister_dock_notifier(struct notifier_block *nb);
 extern int register_hotplug_dock_device(acpi_handle handle,
-					struct acpi_dock_ops *ops,
+					const struct acpi_dock_ops *ops,
 					void *context);
 extern void unregister_hotplug_dock_device(acpi_handle handle);
 #else
@@ -47,7 +47,7 @@
  
 /* Current ACPICA subsystem version in YYYYMMDD format */
  
-#define ACPI_CA_VERSION                 0x20110413
+#define ACPI_CA_VERSION                 0x20110623
  
 #include "actypes.h"
 #include "actbl.h"
@@ -69,6 +69,7 @@
 extern u32 acpi_gbl_enable_aml_debug_object;
 extern u8 acpi_gbl_copy_dsdt_locally;
 extern u8 acpi_gbl_truncate_io_addresses;
+extern u8 acpi_gbl_disable_auto_repair;
  
 extern u32 acpi_current_gpe_count;
 extern struct acpi_table_fadt acpi_gbl_FADT;
@@ -337,7 +337,7 @@
  
 /* in processor_thermal.c */
 int acpi_processor_get_limit_info(struct acpi_processor *pr);
-extern struct thermal_cooling_device_ops processor_cooling_ops;
+extern const struct thermal_cooling_device_ops processor_cooling_ops;
 #ifdef CONFIG_CPU_FREQ
 void acpi_thermal_cpufreq_init(void);
 void acpi_thermal_cpufreq_exit(void);
@@ -238,7 +238,6 @@
 extern int pnpacpi_disabled;
  
 #define PXM_INVAL	(-1)
-#define NID_INVAL	(-1)
  
 int acpi_check_resource_conflict(const struct resource *res);
  
@@ -85,22 +85,6 @@
 				((long)t-2732+5)/10 : ((long)t-2732-5)/10)
 #define CELSIUS_TO_KELVIN(t)	((t)*10+2732)
  
-#if defined(CONFIG_THERMAL_HWMON)
-/* thermal zone devices with the same type share one hwmon device */
-struct thermal_hwmon_device {
-	char type[THERMAL_NAME_LENGTH];
-	struct device *device;
-	int count;
-	struct list_head tz_list;
-	struct list_head node;
-};
-
-struct thermal_hwmon_attr {
-	struct device_attribute attr;
-	char name[16];
-};
-#endif
-
 struct thermal_zone_device {
 	int id;
 	char type[THERMAL_NAME_LENGTH];
@@ -120,12 +104,6 @@
 	struct mutex lock;	/* protect cooling devices list */
 	struct list_head node;
 	struct delayed_work poll_queue;
-#if defined(CONFIG_THERMAL_HWMON)
-	struct list_head hwmon_node;
-	struct thermal_hwmon_device *hwmon;
-	struct thermal_hwmon_attr temp_input;	/* hwmon sys attr */
-	struct thermal_hwmon_attr temp_crit;	/* hwmon sys attr */
-#endif
 };
 /* Adding event notification support elements */
 #define THERMAL_GENL_FAMILY_NAME                "thermal_event"
...	...	@@ -296,15 +296,6 @@
296	296
297	297	---------------------------
298	298
299		-What: CONFIG_THERMAL_HWMON
300		-When: January 2009
301		-Why: This option was introduced just to allow older lm-sensors userspace
302		- to keep working over the upgrade to 2.6.26. At the scheduled time of
303		- removal fixed lm-sensors (2.x or 3.x) should be readily available.
304		-Who: Rene Herman <rene.herman@gmail.com>
305		-
306		----------------------------
307		-
308	299	What: Code that is now under CONFIG_WIRELESS_EXT_SYSFS
309	300	(in net/core/net-sysfs.c)
310	301	When: After the only user (hal) has seen a release with the patches
...	...	@@ -163,6 +163,11 @@
163	163
164	164	See also Documentation/power/pm.txt, pci=noacpi
165	165
	166	+ acpi_rsdp= [ACPI,EFI,KEXEC]
	167	+ Pass the RSDP address to the kernel, mostly used
	168	+ on machines running EFI runtime service to boot the
	169	+ second kernel for kdump.
	170	+
166	171	acpi_apic_instance= [ACPI, IOAPIC]
167	172	Format: <int>
168	173	2: use 2nd APIC table, if available
...	...	@@ -126,6 +126,12 @@
126	126	*/
127	127	u8 ACPI_INIT_GLOBAL(acpi_gbl_truncate_io_addresses, FALSE);
128	128
	129	+/*
	130	+ * Disable runtime checking and repair of values returned by control methods.
	131	+ * Use only if the repair is causing a problem on a particular machine.
	132	+ */
	133	+u8 ACPI_INIT_GLOBAL(acpi_gbl_disable_auto_repair, FALSE);
	134	+
129	135	/* acpi_gbl_FADT is a local copy of the FADT, converted to a common format. */
130	136
131	137	struct acpi_table_fadt acpi_gbl_FADT;
...	...	@@ -357,6 +357,7 @@
357	357	char *pathname;
358	358	const union acpi_predefined_info *predefined;
359	359	union acpi_operand_object *parent_package;
	360	+ struct acpi_namespace_node *node;
360	361	u32 flags;
361	362	u8 node_flags;
362	363	};
...	...	@@ -468,6 +468,7 @@
468	468	{{"_SWS", 0, ACPI_RTYPE_INTEGER}},
469	469	{{"_TC1", 0, ACPI_RTYPE_INTEGER}},
470	470	{{"_TC2", 0, ACPI_RTYPE_INTEGER}},
	471	+ {{"_TDL", 0, ACPI_RTYPE_INTEGER}},
471	472	{{"_TIP", 1, ACPI_RTYPE_INTEGER}},
472	473	{{"_TIV", 1, ACPI_RTYPE_INTEGER}},
473	474	{{"_TMP", 0, ACPI_RTYPE_INTEGER}},
...	...	@@ -193,14 +193,20 @@
193	193	}
194	194
195	195	/*
196		- * 1) We have a return value, but if one wasn't expected, just exit, this is
197		- * not a problem. For example, if the "Implicit Return" feature is
198		- * enabled, methods will always return a value.
	196	+ * Return value validation and possible repair.
199	197	*
200		- * 2) If the return value can be of any type, then we cannot perform any
201		- * validation, exit.
	198	+ * 1) Don't perform return value validation/repair if this feature
	199	+ * has been disabled via a global option.
	200	+ *
	201	+ * 2) We have a return value, but if one wasn't expected, just exit,
	202	+ * this is not a problem. For example, if the "Implicit Return"
	203	+ * feature is enabled, methods will always return a value.
	204	+ *
	205	+ * 3) If the return value can be of any type, then we cannot perform
	206	+ * any validation, just exit.
202	207	*/
203		- if ((!predefined->info.expected_btypes) \|\|
	208	+ if (acpi_gbl_disable_auto_repair \|\|
	209	+ (!predefined->info.expected_btypes) \|\|
204	210	(predefined->info.expected_btypes == ACPI_RTYPE_ALL)) {
205	211	goto cleanup;
206	212	}
...	...	@@ -212,6 +218,7 @@
212	218	goto cleanup;
213	219	}
214	220	data->predefined = predefined;
	221	+ data->node = node;
215	222	data->node_flags = node->flags;
216	223	data->pathname = pathname;
217	224
...	...	@@ -503,6 +503,21 @@
503	503	{
504	504	union acpi_operand_object return_object = return_object_ptr;
505	505	acpi_status status;
	506	+ struct acpi_namespace_node *node;
	507	+
	508	+ /*
	509	+ * We can only sort the _TSS return package if there is no _PSS in the
	510	+ * same scope. This is because if _PSS is present, the ACPI specification
	511	+ * dictates that the _TSS Power Dissipation field is to be ignored, and
	512	+ * therefore some BIOSs leave garbage values in the _TSS Power field(s).
	513	+ * In this case, it is best to just return the _TSS package as-is.
	514	+ * (May, 2011)
	515	+ */
	516	+ status =
	517	+ acpi_ns_get_node(data->node, "^_PSS", ACPI_NS_NO_UPSEARCH, &node);
	518	+ if (ACPI_SUCCESS(status)) {
	519	+ return (AE_OK);
	520	+ }
506	521
507	522	status = acpi_ns_check_sorted_list(data, return_object, 5, 1,
508	523	ACPI_SORT_DESCENDING,
...	...	@@ -126,12 +126,29 @@
126	126	}
127	127
128	128	/*
129		- * Originally, we checked the table signature for "SSDT" or "PSDT" here.
130		- * Next, we added support for OEMx tables, signature "OEM".
131		- * Valid tables were encountered with a null signature, so we've just
132		- * given up on validating the signature, since it seems to be a waste
133		- * of code. The original code was removed (05/2008).
	129	+ * Validate the incoming table signature.
	130	+ *
	131	+ * 1) Originally, we checked the table signature for "SSDT" or "PSDT".
	132	+ * 2) We added support for OEMx tables, signature "OEM".
	133	+ * 3) Valid tables were encountered with a null signature, so we just
	134	+ * gave up on validating the signature, (05/2008).
	135	+ * 4) We encountered non-AML tables such as the MADT, which caused
	136	+ * interpreter errors and kernel faults. So now, we once again allow
	137	+ * only "SSDT", "OEMx", and now, also a null signature. (05/2011).
134	138	*/
	139	+ if ((table_desc->pointer->signature[0] != 0x00) &&
	140	+ (!ACPI_COMPARE_NAME(table_desc->pointer->signature, ACPI_SIG_SSDT))
	141	+ && (ACPI_STRNCMP(table_desc->pointer->signature, "OEM", 3))) {
	142	+ ACPI_ERROR((AE_INFO,
	143	+ "Table has invalid signature [%4.4s] (0x%8.8X), must be SSDT or OEMx",
	144	+ acpi_ut_valid_acpi_name((u32 )table_desc->
	145	+ pointer->
	146	+ signature) ? table_desc->
	147	+ pointer->signature : "????",
	148	+ (u32 )table_desc->pointer->signature));
	149	+
	150	+ return_ACPI_STATUS(AE_BAD_SIGNATURE);
	151	+ }
135	152
136	153	(void)acpi_ut_acquire_mutex(ACPI_MTX_TABLES);
137	154
...	...	@@ -55,6 +55,9 @@
55	55	#define ACPI_BATTERY_NOTIFY_INFO 0x81
56	56	#define ACPI_BATTERY_NOTIFY_THRESHOLD 0x82
57	57
	58	+/* Battery power unit: 0 means mW, 1 means mA */
	59	+#define ACPI_BATTERY_POWER_UNIT_MA 1
	60	+
58	61	#define _COMPONENT ACPI_BATTERY_COMPONENT
59	62
60	63	ACPI_MODULE_NAME("battery");
...	...	@@ -91,11 +94,6 @@
91	94	enum {
92	95	ACPI_BATTERY_ALARM_PRESENT,
93	96	ACPI_BATTERY_XINFO_PRESENT,
94		- /* For buggy DSDTs that report negative 16-bit values for either
95		- * charging or discharging current and/or report 0 as 65536
96		- * due to bad math.
97		- */
98		- ACPI_BATTERY_QUIRK_SIGNED16_CURRENT,
99	97	ACPI_BATTERY_QUIRK_PERCENTAGE_CAPACITY,
100	98	};
101	99
...	...	@@ -301,7 +299,8 @@
301	299	#ifdef CONFIG_ACPI_PROCFS_POWER
302	300	inline char acpi_battery_units(struct acpi_battery battery)
303	301	{
304		- return (battery->power_unit)?"mA":"mW";
	302	+ return (battery->power_unit == ACPI_BATTERY_POWER_UNIT_MA) ?
	303	+ "mA" : "mW";
305	304	}
306	305	#endif
307	306
308	307
...	...	@@ -461,9 +460,17 @@
461	460	battery->update_time = jiffies;
462	461	kfree(buffer.pointer);
463	462
464		- if (test_bit(ACPI_BATTERY_QUIRK_SIGNED16_CURRENT, &battery->flags) &&
465		- battery->rate_now != -1)
	463	+ /* For buggy DSDTs that report negative 16-bit values for either
	464	+ * charging or discharging current and/or report 0 as 65536
	465	+ * due to bad math.
	466	+ */
	467	+ if (battery->power_unit == ACPI_BATTERY_POWER_UNIT_MA &&
	468	+ battery->rate_now != ACPI_BATTERY_VALUE_UNKNOWN &&
	469	+ (s16)(battery->rate_now) < 0) {
466	470	battery->rate_now = abs((s16)battery->rate_now);
	471	+ printk_once(KERN_WARNING FW_BUG "battery: (dis)charge rate"
	472	+ " invalid.\n");
	473	+ }
467	474
468	475	if (test_bit(ACPI_BATTERY_QUIRK_PERCENTAGE_CAPACITY, &battery->flags)
469	476	&& battery->capacity_now >= 0 && battery->capacity_now <= 100)
...	...	@@ -544,7 +551,7 @@
544	551	{
545	552	int result;
546	553
547		- if (battery->power_unit) {
	554	+ if (battery->power_unit == ACPI_BATTERY_POWER_UNIT_MA) {
548	555	battery->bat.properties = charge_battery_props;
549	556	battery->bat.num_properties =
550	557	ARRAY_SIZE(charge_battery_props);
551	558
552	559
553	560
...	...	@@ -566,20 +573,18 @@
566	573
567	574	static void sysfs_remove_battery(struct acpi_battery *battery)
568	575	{
569		- if (!battery->bat.dev)
	576	+ mutex_lock(&battery->lock);
	577	+ if (!battery->bat.dev) {
	578	+ mutex_unlock(&battery->lock);
570	579	return;
	580	+ }
	581	+
571	582	device_remove_file(battery->bat.dev, &alarm_attr);
572	583	power_supply_unregister(&battery->bat);
573	584	battery->bat.dev = NULL;
	585	+ mutex_unlock(&battery->lock);
574	586	}
575	587
576		-static void acpi_battery_quirks(struct acpi_battery *battery)
577		-{
578		- if (dmi_name_in_vendors("Acer") && battery->power_unit) {
579		- set_bit(ACPI_BATTERY_QUIRK_SIGNED16_CURRENT, &battery->flags);
580		- }
581		-}
582		-
583	588	/*
584	589	* According to the ACPI spec, some kinds of primary batteries can
585	590	* report percentage battery remaining capacity directly to OS.
...	...	@@ -592,7 +597,7 @@
592	597	*
593	598	* Handle this correctly so that they won't break userspace.
594	599	*/
595		-static void acpi_battery_quirks2(struct acpi_battery *battery)
	600	+static void acpi_battery_quirks(struct acpi_battery *battery)
596	601	{
597	602	if (test_bit(ACPI_BATTERY_QUIRK_PERCENTAGE_CAPACITY, &battery->flags))
598	603	return ;
599	604
600	605
...	...	@@ -623,13 +628,15 @@
623	628	result = acpi_battery_get_info(battery);
624	629	if (result)
625	630	return result;
626		- acpi_battery_quirks(battery);
627	631	acpi_battery_init_alarm(battery);
628	632	}
629		- if (!battery->bat.dev)
630		- sysfs_add_battery(battery);
	633	+ if (!battery->bat.dev) {
	634	+ result = sysfs_add_battery(battery);
	635	+ if (result)
	636	+ return result;
	637	+ }
631	638	result = acpi_battery_get_state(battery);
632		- acpi_battery_quirks2(battery);
	639	+ acpi_battery_quirks(battery);
633	640	return result;
634	641	}
635	642
...	...	@@ -863,7 +870,7 @@
863	870	}, \
864	871	}
865	872
866		-static struct battery_file {
	873	+static const struct battery_file {
867	874	struct file_operations ops;
868	875	mode_t mode;
869	876	const char *name;
870	877
...	...	@@ -948,9 +955,12 @@
948	955	struct acpi_battery *battery = container_of(nb, struct acpi_battery,
949	956	pm_nb);
950	957	switch (mode) {
	958	+ case PM_POST_HIBERNATION:
951	959	case PM_POST_SUSPEND:
952		- sysfs_remove_battery(battery);
953		- sysfs_add_battery(battery);
	960	+ if (battery->bat.dev) {
	961	+ sysfs_remove_battery(battery);
	962	+ sysfs_add_battery(battery);
	963	+ }
954	964	break;
955	965	}
956	966
957	967
958	968
959	969
960	970
...	...	@@ -975,24 +985,32 @@
975	985	if (ACPI_SUCCESS(acpi_get_handle(battery->device->handle,
976	986	"_BIX", &handle)))
977	987	set_bit(ACPI_BATTERY_XINFO_PRESENT, &battery->flags);
978		- acpi_battery_update(battery);
	988	+ result = acpi_battery_update(battery);
	989	+ if (result)
	990	+ goto fail;
979	991	#ifdef CONFIG_ACPI_PROCFS_POWER
980	992	result = acpi_battery_add_fs(device);
981	993	#endif
982		- if (!result) {
983		- printk(KERN_INFO PREFIX "%s Slot [%s] (battery %s)\n",
984		- ACPI_BATTERY_DEVICE_NAME, acpi_device_bid(device),
985		- device->status.battery_present ? "present" : "absent");
986		- } else {
	994	+ if (result) {
987	995	#ifdef CONFIG_ACPI_PROCFS_POWER
988	996	acpi_battery_remove_fs(device);
989	997	#endif
990		- kfree(battery);
	998	+ goto fail;
991	999	}
992	1000
	1001	+ printk(KERN_INFO PREFIX "%s Slot [%s] (battery %s)\n",
	1002	+ ACPI_BATTERY_DEVICE_NAME, acpi_device_bid(device),
	1003	+ device->status.battery_present ? "present" : "absent");
	1004	+
993	1005	battery->pm_nb.notifier_call = battery_notify;
994	1006	register_pm_notifier(&battery->pm_nb);
995	1007
	1008	+ return result;
	1009	+
	1010	+fail:
	1011	+ sysfs_remove_battery(battery);
	1012	+ mutex_destroy(&battery->lock);
	1013	+ kfree(battery);
996	1014	return result;
997	1015	}
998	1016
...	...	@@ -77,7 +77,7 @@
77	77	struct list_head list;
78	78	struct list_head hotplug_list;
79	79	acpi_handle handle;
80		- struct acpi_dock_ops *ops;
	80	+ const struct acpi_dock_ops *ops;
81	81	void *context;
82	82	};
83	83
...	...	@@ -589,7 +589,7 @@
589	589	* the dock driver after _DCK is executed.
590	590	*/
591	591	int
592		-register_hotplug_dock_device(acpi_handle handle, struct acpi_dock_ops *ops,
	592	+register_hotplug_dock_device(acpi_handle handle, const struct acpi_dock_ops *ops,
593	593	void *context)
594	594	{
595	595	struct dock_dependent_device *dd;