10 files changed, 60 insertions, 52 deletions

diff --git a/drivers/acpi/acpi_pad.c b/drivers/acpi/acpi_pad.c
index 0d2cdb86158b..97991ac6f5fc 100644
--- a/drivers/acpi/acpi_pad.c
+++ b/drivers/acpi/acpi_pad.c
@@ -100,7 +100,8 @@ static void round_robin_cpu(unsigned int tsk_index)
         struct cpumask *pad_busy_cpus = to_cpumask(pad_busy_cpus_bits);
         cpumask_var_t tmp;
         int cpu;
-        unsigned long min_weight = -1, preferred_cpu;
+        unsigned long min_weight = -1;
+        unsigned long uninitialized_var(preferred_cpu);
 
         if (!alloc_cpumask_var(&tmp, GFP_KERNEL))
                 return;
diff --git a/drivers/acpi/battery.c b/drivers/acpi/battery.c
index 3f4602b8f287..cada73ffdfa7 100644
--- a/drivers/acpi/battery.c
+++ b/drivers/acpi/battery.c
@@ -831,7 +831,7 @@ static void acpi_battery_notify(struct acpi_device *device, u32 event)
                                         dev_name(&device->dev), event,
                                         acpi_battery_present(battery));
 #ifdef CONFIG_ACPI_SYSFS_POWER
-        /* acpi_batter_update could remove power_supply object */
+        /* acpi_battery_update could remove power_supply object */
         if (battery->bat.dev)
                 kobject_uevent(&battery->bat.dev->kobj, KOBJ_CHANGE);
 #endif
diff --git a/drivers/acpi/fan.c b/drivers/acpi/fan.c
index f419849a0d3f..acf2ab249842 100644
--- a/drivers/acpi/fan.c
+++ b/drivers/acpi/fan.c
@@ -267,7 +267,7 @@ static int acpi_fan_add(struct acpi_device *device)
                 goto end;
         }
 
-        dev_info(&device->dev, "registered as cooling_device%d\n", cdev->id);
+        dev_dbg(&device->dev, "registered as cooling_device%d\n", cdev->id);
 
         device->driver_data = cdev;
         result = sysfs_create_link(&device->dev.kobj,
diff --git a/drivers/acpi/numa.c b/drivers/acpi/numa.c
index 2be2fb66204e..7ad48dfc12db 100644
--- a/drivers/acpi/numa.c
+++ b/drivers/acpi/numa.c
@@ -28,6 +28,7 @@
 #include <linux/types.h>
 #include <linux/errno.h>
 #include <linux/acpi.h>
+#include <linux/numa.h>
 #include <acpi/acpi_bus.h>
 
 #define PREFIX "ACPI: "
@@ -40,14 +41,14 @@ static nodemask_t nodes_found_map = NODE_MASK_NONE;
 
 /* maps to convert between proximity domain and logical node ID */
 static int pxm_to_node_map[MAX_PXM_DOMAINS]
-                                = { [0 ... MAX_PXM_DOMAINS - 1] = NID_INVAL };
+                        = { [0 ... MAX_PXM_DOMAINS - 1] = NUMA_NO_NODE };
 static int node_to_pxm_map[MAX_NUMNODES]
-                                = { [0 ... MAX_NUMNODES - 1] = PXM_INVAL };
+                        = { [0 ... MAX_NUMNODES - 1] = PXM_INVAL };
 
 int pxm_to_node(int pxm)
 {
         if (pxm < 0)
-                return NID_INVAL;
+                return NUMA_NO_NODE;
         return pxm_to_node_map[pxm];
 }
 
@@ -68,9 +69,9 @@ int acpi_map_pxm_to_node(int pxm)
 {
         int node = pxm_to_node_map[pxm];
 
-        if (node < 0){
+        if (node < 0) {
                 if (nodes_weight(nodes_found_map) >= MAX_NUMNODES)
-                        return NID_INVAL;
+                        return NUMA_NO_NODE;
                 node = first_unset_node(nodes_found_map);
                 __acpi_map_pxm_to_node(pxm, node);
                 node_set(node, nodes_found_map);
@@ -79,16 +80,6 @@ int acpi_map_pxm_to_node(int pxm)
         return node;
 }
 
-#if 0
-void __cpuinit acpi_unmap_pxm_to_node(int node)
-{
-        int pxm = node_to_pxm_map[node];
-        pxm_to_node_map[pxm] = NID_INVAL;
-        node_to_pxm_map[node] = PXM_INVAL;
-        node_clear(node, nodes_found_map);
-}
-#endif  /*  0  */
-
 static void __init
 acpi_table_print_srat_entry(struct acpi_subtable_header *header)
 {
diff --git a/drivers/acpi/osl.c b/drivers/acpi/osl.c
index 7c1c59ea9ec6..02e8464e480f 100644
--- a/drivers/acpi/osl.c
+++ b/drivers/acpi/osl.c
@@ -1118,7 +1118,7 @@ __setup("acpi_enforce_resources=", acpi_enforce_resources_setup);
 
 /* Check for resource conflicts between ACPI OperationRegions and native
  * drivers */
-int acpi_check_resource_conflict(struct resource *res)
+int acpi_check_resource_conflict(const struct resource *res)
 {
         struct acpi_res_list *res_list_elem;
         int ioport;
diff --git a/drivers/acpi/processor_core.c b/drivers/acpi/processor_core.c
index 65b9f29ef10b..41731236f9a1 100644
--- a/drivers/acpi/processor_core.c
+++ b/drivers/acpi/processor_core.c
@@ -353,7 +353,7 @@ static int acpi_processor_info_open_fs(struct inode *inode, struct file *file)
                            PDE(inode)->data);
 }
 
-static int acpi_processor_add_fs(struct acpi_device *device)
+static int __cpuinit acpi_processor_add_fs(struct acpi_device *device)
 {
         struct proc_dir_entry *entry = NULL;
 
@@ -845,7 +845,7 @@ static int __cpuinit acpi_processor_add(struct acpi_device *device)
                 goto err_power_exit;
         }
 
-        dev_info(&device->dev, "registered as cooling_device%d\n",
+        dev_dbg(&device->dev, "registered as cooling_device%d\n",
                  pr->cdev->id);
 
         result = sysfs_create_link(&device->dev.kobj,
diff --git a/drivers/acpi/processor_idle.c b/drivers/acpi/processor_idle.c
index bbd066e7f854..d1676b1754d9 100644
--- a/drivers/acpi/processor_idle.c
+++ b/drivers/acpi/processor_idle.c
@@ -164,7 +164,7 @@ static void lapic_timer_check_state(int state, struct acpi_processor *pr,
                 pr->power.timer_broadcast_on_state = state;
 }
 
-static void lapic_timer_propagate_broadcast(void *arg)
+static void __lapic_timer_propagate_broadcast(void *arg)
 {
         struct acpi_processor *pr = (struct acpi_processor *) arg;
         unsigned long reason;
@@ -175,6 +175,12 @@ static void lapic_timer_propagate_broadcast(void *arg)
         clockevents_notify(reason, &pr->id);
 }
 
+static void lapic_timer_propagate_broadcast(struct acpi_processor *pr)
+{
+        smp_call_function_single(pr->id, __lapic_timer_propagate_broadcast,
+                                 (void *)pr, 1);
+}
+
 /* Power(C) State timer broadcast control */
 static void lapic_timer_state_broadcast(struct acpi_processor *pr,
                                        struct acpi_processor_cx *cx,
@@ -638,8 +644,7 @@ static int acpi_processor_power_verify(struct acpi_processor *pr)
                 working++;
         }
 
-        smp_call_function_single(pr->id, lapic_timer_propagate_broadcast,
-                                 pr, 1);
+        lapic_timer_propagate_broadcast(pr);
 
         return (working);
 }
diff --git a/drivers/platform/x86/acerhdf.c b/drivers/platform/x86/acerhdf.c
index be27aa47e810..79b15b9d9cf0 100644
--- a/drivers/platform/x86/acerhdf.c
+++ b/drivers/platform/x86/acerhdf.c
@@ -52,7 +52,7 @@
  */
 #undef START_IN_KERNEL_MODE
 
-#define DRV_VER "0.5.18"
+#define DRV_VER "0.5.20"
 
 /*
  * According to the Atom N270 datasheet,
@@ -112,12 +112,14 @@ module_param_string(force_product, force_product, 16, 0);
 MODULE_PARM_DESC(force_product, "Force BIOS product and omit BIOS check");
 
 /*
- * cmd_off: to switch the fan completely off / to check if the fan is off
+ * cmd_off: to switch the fan completely off
+ * chk_off: to check if the fan is off
  *      cmd_auto: to set the BIOS in control of the fan. The BIOS regulates then
  *              the fan speed depending on the temperature
  */
 struct fancmd {
         u8 cmd_off;
+        u8 chk_off;
         u8 cmd_auto;
 };
 
@@ -134,32 +136,41 @@ struct bios_settings_t {
 /* Register addresses and values for different BIOS versions */
 static const struct bios_settings_t bios_tbl[] = {
         /* AOA110 */
-        {"Acer", "AOA110", "v0.3109", 0x55, 0x58, {0x1f, 0x00} },
-        {"Acer", "AOA110", "v0.3114", 0x55, 0x58, {0x1f, 0x00} },
-        {"Acer", "AOA110", "v0.3301", 0x55, 0x58, {0xaf, 0x00} },
-        {"Acer", "AOA110", "v0.3304", 0x55, 0x58, {0xaf, 0x00} },
-        {"Acer", "AOA110", "v0.3305", 0x55, 0x58, {0xaf, 0x00} },
-        {"Acer", "AOA110", "v0.3307", 0x55, 0x58, {0xaf, 0x00} },
-        {"Acer", "AOA110", "v0.3308", 0x55, 0x58, {0x21, 0x00} },
-        {"Acer", "AOA110", "v0.3309", 0x55, 0x58, {0x21, 0x00} },
-        {"Acer", "AOA110", "v0.3310", 0x55, 0x58, {0x21, 0x00} },
+        {"Acer", "AOA110", "v0.3109", 0x55, 0x58, {0x1f, 0x1f, 0x00} },
+        {"Acer", "AOA110", "v0.3114", 0x55, 0x58, {0x1f, 0x1f, 0x00} },
+        {"Acer", "AOA110", "v0.3301", 0x55, 0x58, {0xaf, 0xaf, 0x00} },
+        {"Acer", "AOA110", "v0.3304", 0x55, 0x58, {0xaf, 0xaf, 0x00} },
+        {"Acer", "AOA110", "v0.3305", 0x55, 0x58, {0xaf, 0xaf, 0x00} },
+        {"Acer", "AOA110", "v0.3307", 0x55, 0x58, {0xaf, 0xaf, 0x00} },
+        {"Acer", "AOA110", "v0.3308", 0x55, 0x58, {0x21, 0x21, 0x00} },
+        {"Acer", "AOA110", "v0.3309", 0x55, 0x58, {0x21, 0x21, 0x00} },
+        {"Acer", "AOA110", "v0.3310", 0x55, 0x58, {0x21, 0x21, 0x00} },
         /* AOA150 */
-        {"Acer", "AOA150", "v0.3114", 0x55, 0x58, {0x20, 0x00} },
-        {"Acer", "AOA150", "v0.3301", 0x55, 0x58, {0x20, 0x00} },
-        {"Acer", "AOA150", "v0.3304", 0x55, 0x58, {0x20, 0x00} },
-        {"Acer", "AOA150", "v0.3305", 0x55, 0x58, {0x20, 0x00} },
-        {"Acer", "AOA150", "v0.3307", 0x55, 0x58, {0x20, 0x00} },
-        {"Acer", "AOA150", "v0.3308", 0x55, 0x58, {0x20, 0x00} },
-        {"Acer", "AOA150", "v0.3309", 0x55, 0x58, {0x20, 0x00} },
-        {"Acer", "AOA150", "v0.3310", 0x55, 0x58, {0x20, 0x00} },
+        {"Acer", "AOA150", "v0.3114", 0x55, 0x58, {0x20, 0x20, 0x00} },
+        {"Acer", "AOA150", "v0.3301", 0x55, 0x58, {0x20, 0x20, 0x00} },
+        {"Acer", "AOA150", "v0.3304", 0x55, 0x58, {0x20, 0x20, 0x00} },
+        {"Acer", "AOA150", "v0.3305", 0x55, 0x58, {0x20, 0x20, 0x00} },
+        {"Acer", "AOA150", "v0.3307", 0x55, 0x58, {0x20, 0x20, 0x00} },
+        {"Acer", "AOA150", "v0.3308", 0x55, 0x58, {0x20, 0x20, 0x00} },
+        {"Acer", "AOA150", "v0.3309", 0x55, 0x58, {0x20, 0x20, 0x00} },
+        {"Acer", "AOA150", "v0.3310", 0x55, 0x58, {0x20, 0x20, 0x00} },
+        /* Acer 1410 */
+        {"Acer", "Aspire 1410", "v0.3120", 0x55, 0x58, {0x9e, 0x9e, 0x00} },
         /* special BIOS / other */
-        {"Gateway", "AOA110", "v0.3103", 0x55, 0x58, {0x21, 0x00} },
-        {"Gateway", "AOA150", "v0.3103", 0x55, 0x58, {0x20, 0x00} },
-        {"Packard Bell", "DOA150", "v0.3104", 0x55, 0x58, {0x21, 0x00} },
-        {"Packard Bell", "AOA110", "v0.3105", 0x55, 0x58, {0x21, 0x00} },
-        {"Packard Bell", "AOA150", "v0.3105", 0x55, 0x58, {0x20, 0x00} },
+        {"Gateway", "AOA110", "v0.3103", 0x55, 0x58, {0x21, 0x21, 0x00} },
+        {"Gateway", "AOA150", "v0.3103", 0x55, 0x58, {0x20, 0x20, 0x00} },
+        {"Gateway         ", "LT31            ", "v1.3103 ", 0x55, 0x58,
+                {0x10, 0x0f, 0x00} },
+        {"Gateway         ", "LT31            ", "v1.3201 ", 0x55, 0x58,
+                {0x10, 0x0f, 0x00} },
+        {"Gateway         ", "LT31            ", "v1.3302 ", 0x55, 0x58,
+                {0x10, 0x0f, 0x00} },
+        {"Packard Bell", "DOA150", "v0.3104", 0x55, 0x58, {0x21, 0x21, 0x00} },
+        {"Packard Bell", "DOA150", "v0.3105", 0x55, 0x58, {0x20, 0x20, 0x00} },
+        {"Packard Bell", "AOA110", "v0.3105", 0x55, 0x58, {0x21, 0x21, 0x00} },
+        {"Packard Bell", "AOA150", "v0.3105", 0x55, 0x58, {0x20, 0x20, 0x00} },
         /* pewpew-terminator */
-        {"", "", "", 0, 0, {0, 0} }
+        {"", "", "", 0, 0, {0, 0, 0} }
 };
 
 static const struct bios_settings_t *bios_cfg __read_mostly;
@@ -183,7 +194,7 @@ static int acerhdf_get_fanstate(int *state)
         if (ec_read(bios_cfg->fanreg, &fan))
                 return -EINVAL;
 
-        if (fan != bios_cfg->cmd.cmd_off)
+        if (fan != bios_cfg->cmd.chk_off)
                 *state = ACERHDF_FAN_AUTO;
         else
                 *state = ACERHDF_FAN_OFF;
diff --git a/drivers/thermal/thermal_sys.c b/drivers/thermal/thermal_sys.c
index 3bc72ea57e09..5066de5cfc0c 100644
--- a/drivers/thermal/thermal_sys.c
+++ b/drivers/thermal/thermal_sys.c
@@ -377,7 +377,7 @@ thermal_cooling_device_cur_state_store(struct device *dev,
         if (!sscanf(buf, "%ld\n", &state))
                 return -EINVAL;
 
-        if (state < 0)
+        if ((long)state < 0)
                 return -EINVAL;
 
         result = cdev->ops->set_cur_state(cdev, state);
diff --git a/include/linux/acpi.h b/include/linux/acpi.h
index e11090d462d2..ce945d4845fc 100644
--- a/include/linux/acpi.h
+++ b/include/linux/acpi.h
@@ -240,7 +240,7 @@ extern int pnpacpi_disabled;
 #define PXM_INVAL       (-1)
 #define NID_INVAL       (-1)
 
-int acpi_check_resource_conflict(struct resource *res);
+int acpi_check_resource_conflict(const struct resource *res);
 
 int acpi_check_region(resource_size_t start, resource_size_t n,
                       const char *name);