Merge commit 'v2.6.29-rc4' into tracing/core

58 files changed, 1000 insertions, 1168 deletions

diff --git a/drivers/acpi/Kconfig b/drivers/acpi/Kconfig
index d7f9839ba264..a7799a99f2d9 100644
--- a/drivers/acpi/Kconfig
+++ b/drivers/acpi/Kconfig
@@ -9,6 +9,7 @@ menuconfig ACPI
         depends on PCI
         depends on PM
         select PNP
+        select CPU_IDLE
         default y
         ---help---
           Advanced Configuration and Power Interface (ACPI) support for 
@@ -287,7 +288,7 @@ config ACPI_CONTAINER
           support physical cpu/memory hot-plug.
 
           If one selects "m", this driver can be loaded with
-          "modprobe acpi_container".
+          "modprobe container".
 
 config ACPI_HOTPLUG_MEMORY
         tristate "Memory Hotplug"
diff --git a/drivers/acpi/acpica/tbutils.c b/drivers/acpi/acpica/tbutils.c
index 9684cc827930..22ce48985720 100644
--- a/drivers/acpi/acpica/tbutils.c
+++ b/drivers/acpi/acpica/tbutils.c
@@ -538,10 +538,9 @@ acpi_tb_parse_root_table(acpi_physical_address rsdp_address, u8 flags)
                         if (ACPI_FAILURE(status)) {
                                 ACPI_WARNING((AE_INFO,
                                               "Truncating %u table entries!",
-                                              (unsigned)
-                                              (acpi_gbl_root_table_list.size -
-                                               acpi_gbl_root_table_list.
-                                               count)));
+                                              (unsigned) (table_count -
+                                               (acpi_gbl_root_table_list.
+                                               count - 2))));
                                 break;
                         }
                 }
diff --git a/drivers/acpi/acpica/uteval.c b/drivers/acpi/acpica/uteval.c
index da9450bc60f7..9c9897dbe907 100644
--- a/drivers/acpi/acpica/uteval.c
+++ b/drivers/acpi/acpica/uteval.c
@@ -116,9 +116,9 @@ acpi_status acpi_ut_osi_implementation(struct acpi_walk_state *walk_state)
                 return_ACPI_STATUS(AE_NO_MEMORY);
         }
 
-        /* Default return value is SUPPORTED */
+        /* Default return value is 0, NOT-SUPPORTED */
 
-        return_desc->integer.value = ACPI_UINT32_MAX;
+        return_desc->integer.value = 0;
         walk_state->return_desc = return_desc;
 
         /* Compare input string to static table of supported interfaces */
@@ -127,10 +127,8 @@ acpi_status acpi_ut_osi_implementation(struct acpi_walk_state *walk_state)
                 if (!ACPI_STRCMP
                     (string_desc->string.pointer,
                      acpi_interfaces_supported[i])) {
-
-                        /* The interface is supported */
-
-                        return_ACPI_STATUS(AE_OK);
+                        return_desc->integer.value = ACPI_UINT32_MAX;
+                        goto done;
                 }
         }
 
@@ -141,15 +139,14 @@ acpi_status acpi_ut_osi_implementation(struct acpi_walk_state *walk_state)
          */
         status = acpi_os_validate_interface(string_desc->string.pointer);
         if (ACPI_SUCCESS(status)) {
-
-                /* The interface is supported */
-
-                return_ACPI_STATUS(AE_OK);
+                return_desc->integer.value = ACPI_UINT32_MAX;
         }
 
-        /* The interface is not supported */
+done:
+        ACPI_DEBUG_PRINT_RAW((ACPI_DB_INFO, "ACPI: BIOS _OSI(%s) %ssupported\n",
+                string_desc->string.pointer,
+                return_desc->integer.value == 0 ? "not-" : ""));
 
-        return_desc->integer.value = 0;
         return_ACPI_STATUS(AE_OK);
 }
 
diff --git a/drivers/acpi/container.c b/drivers/acpi/container.c
index 17020c12623c..fe0cdf83641a 100644
--- a/drivers/acpi/container.c
+++ b/drivers/acpi/container.c
@@ -163,7 +163,7 @@ static void container_notify_cb(acpi_handle handle, u32 type, void *context)
         case ACPI_NOTIFY_BUS_CHECK:
                 /* Fall through */
         case ACPI_NOTIFY_DEVICE_CHECK:
-                printk("Container driver received %s event\n",
+                printk(KERN_WARNING "Container driver received %s event\n",
                        (type == ACPI_NOTIFY_BUS_CHECK) ?
                        "ACPI_NOTIFY_BUS_CHECK" : "ACPI_NOTIFY_DEVICE_CHECK");
                 status = acpi_bus_get_device(handle, &device);
@@ -174,7 +174,8 @@ static void container_notify_cb(acpi_handle handle, u32 type, void *context)
                                         kobject_uevent(&device->dev.kobj,
                                                        KOBJ_ONLINE);
                                 else
-                                        printk("Failed to add container\n");
+                                        printk(KERN_WARNING
+                                               "Failed to add container\n");
                         }
                 } else {
                         if (ACPI_SUCCESS(status)) {
diff --git a/drivers/acpi/dock.c b/drivers/acpi/dock.c
index 5b30b8d91d71..35094f230b1e 100644
--- a/drivers/acpi/dock.c
+++ b/drivers/acpi/dock.c
@@ -855,10 +855,14 @@ fdd_out:
 static ssize_t show_docked(struct device *dev,
                            struct device_attribute *attr, char *buf)
 {
+        struct acpi_device *tmp;
+
         struct dock_station *dock_station = *((struct dock_station **)
                 dev->platform_data);
-        return snprintf(buf, PAGE_SIZE, "%d\n", dock_present(dock_station));
 
+        if (ACPI_SUCCESS(acpi_bus_get_device(dock_station->handle, &tmp)))
+                return snprintf(buf, PAGE_SIZE, "1\n");
+        return snprintf(buf, PAGE_SIZE, "0\n");
 }
 static DEVICE_ATTR(docked, S_IRUGO, show_docked, NULL);
 
@@ -984,7 +988,7 @@ static int dock_add(acpi_handle handle)
 
         ret = device_create_file(&dock_device->dev, &dev_attr_docked);
         if (ret) {
-                printk("Error %d adding sysfs file\n", ret);
+                printk(KERN_ERR "Error %d adding sysfs file\n", ret);
                 platform_device_unregister(dock_device);
                 kfree(dock_station);
                 dock_station = NULL;
@@ -992,7 +996,7 @@ static int dock_add(acpi_handle handle)
         }
         ret = device_create_file(&dock_device->dev, &dev_attr_undock);
         if (ret) {
-                printk("Error %d adding sysfs file\n", ret);
+                printk(KERN_ERR "Error %d adding sysfs file\n", ret);
                 device_remove_file(&dock_device->dev, &dev_attr_docked);
                 platform_device_unregister(dock_device);
                 kfree(dock_station);
@@ -1001,7 +1005,7 @@ static int dock_add(acpi_handle handle)
         }
         ret = device_create_file(&dock_device->dev, &dev_attr_uid);
         if (ret) {
-                printk("Error %d adding sysfs file\n", ret);
+                printk(KERN_ERR "Error %d adding sysfs file\n", ret);
                 device_remove_file(&dock_device->dev, &dev_attr_docked);
                 device_remove_file(&dock_device->dev, &dev_attr_undock);
                 platform_device_unregister(dock_device);
@@ -1011,7 +1015,7 @@ static int dock_add(acpi_handle handle)
         }
         ret = device_create_file(&dock_device->dev, &dev_attr_flags);
         if (ret) {
-                printk("Error %d adding sysfs file\n", ret);
+                printk(KERN_ERR "Error %d adding sysfs file\n", ret);
                 device_remove_file(&dock_device->dev, &dev_attr_docked);
                 device_remove_file(&dock_device->dev, &dev_attr_undock);
                 device_remove_file(&dock_device->dev, &dev_attr_uid);
diff --git a/drivers/acpi/ec.c b/drivers/acpi/ec.c
index a2b82c90a683..5c2f5d343be6 100644
--- a/drivers/acpi/ec.c
+++ b/drivers/acpi/ec.c
@@ -982,7 +982,7 @@ int __init acpi_ec_ecdt_probe(void)
                 saved_ec = kmalloc(sizeof(struct acpi_ec), GFP_KERNEL);
                 if (!saved_ec)
                         return -ENOMEM;
-                memcpy(&saved_ec, boot_ec, sizeof(saved_ec));
+                memcpy(saved_ec, boot_ec, sizeof(*saved_ec));
         /* fall through */
         }
         /* This workaround is needed only on some broken machines,
diff --git a/drivers/acpi/glue.c b/drivers/acpi/glue.c
index adec3d15810a..5479b9f42513 100644
--- a/drivers/acpi/glue.c
+++ b/drivers/acpi/glue.c
@@ -255,12 +255,12 @@ static int acpi_platform_notify(struct device *dev)
         }
         type = acpi_get_bus_type(dev->bus);
         if (!type) {
-                DBG("No ACPI bus support for %s\n", dev->bus_id);
+                DBG("No ACPI bus support for %s\n", dev_name(dev));
                 ret = -EINVAL;
                 goto end;
         }
         if ((ret = type->find_device(dev, &handle)) != 0)
-                DBG("Can't get handler for %s\n", dev->bus_id);
+                DBG("Can't get handler for %s\n", dev_name(dev));
       end:
         if (!ret)
                 acpi_bind_one(dev, handle);
@@ -271,10 +271,10 @@ static int acpi_platform_notify(struct device *dev)
 
                 acpi_get_name(dev->archdata.acpi_handle,
                               ACPI_FULL_PATHNAME, &buffer);
-                DBG("Device %s -> %s\n", dev->bus_id, (char *)buffer.pointer);
+                DBG("Device %s -> %s\n", dev_name(dev), (char *)buffer.pointer);
                 kfree(buffer.pointer);
         } else
-                DBG("Device %s -> No ACPI support\n", dev->bus_id);
+                DBG("Device %s -> No ACPI support\n", dev_name(dev));
 #endif
 
         return ret;
diff --git a/drivers/acpi/osl.c b/drivers/acpi/osl.c
index 6729a4992f2b..b3193ec0a2ef 100644
--- a/drivers/acpi/osl.c
+++ b/drivers/acpi/osl.c
@@ -228,10 +228,10 @@ void acpi_os_vprintf(const char *fmt, va_list args)
         if (acpi_in_debugger) {
                 kdb_printf("%s", buffer);
         } else {
-                printk("%s", buffer);
+                printk(KERN_CONT "%s", buffer);
         }
 #else
-        printk("%s", buffer);
+        printk(KERN_CONT "%s", buffer);
 #endif
 }
 
@@ -1317,6 +1317,54 @@ acpi_os_validate_interface (char *interface)
         return AE_SUPPORT;
 }
 
+#ifdef  CONFIG_X86
+
+struct aml_port_desc {
+        uint    start;
+        uint    end;
+        char*   name;
+        char    warned;
+};
+
+static struct aml_port_desc aml_invalid_port_list[] = {
+        {0x20, 0x21, "PIC0", 0},
+        {0xA0, 0xA1, "PIC1", 0},
+        {0x4D0, 0x4D1, "ELCR", 0}
+};
+
+/*
+ * valid_aml_io_address()
+ *
+ * if valid, return true
+ * else invalid, warn once, return false
+ */
+static bool valid_aml_io_address(uint address, uint length)
+{
+        int i;
+        int entries = sizeof(aml_invalid_port_list) / sizeof(struct aml_port_desc);
+
+        for (i = 0; i < entries; ++i) {
+                if ((address >= aml_invalid_port_list[i].start &&
+                        address <= aml_invalid_port_list[i].end) ||
+                        (address + length >= aml_invalid_port_list[i].start &&
+                        address  + length <= aml_invalid_port_list[i].end))
+                {
+                        if (!aml_invalid_port_list[i].warned)
+                        {
+                                printk(KERN_ERR "ACPI: Denied BIOS AML access"
+                                        " to invalid port 0x%x+0x%x (%s)\n",
+                                        address, length,
+                                        aml_invalid_port_list[i].name);
+                                aml_invalid_port_list[i].warned = 1;
+                        }
+                        return false;   /* invalid */
+                }
+        }
+        return true;    /* valid */
+}
+#else
+static inline bool valid_aml_io_address(uint address, uint length) { return true; }
+#endif
 /******************************************************************************
  *
  * FUNCTION:    acpi_os_validate_address
@@ -1346,6 +1394,8 @@ acpi_os_validate_address (
 
         switch (space_id) {
         case ACPI_ADR_SPACE_SYSTEM_IO:
+                if (!valid_aml_io_address(address, length))
+                        return AE_AML_ILLEGAL_ADDRESS;
         case ACPI_ADR_SPACE_SYSTEM_MEMORY:
                 /* Only interference checks against SystemIO and SytemMemory
                    are needed */
diff --git a/drivers/acpi/pci_link.c b/drivers/acpi/pci_link.c
index 1c6e73c7865e..6c772ca76bd1 100644
--- a/drivers/acpi/pci_link.c
+++ b/drivers/acpi/pci_link.c
@@ -593,7 +593,7 @@ static int acpi_pci_link_allocate(struct acpi_pci_link *link)
                 return -ENODEV;
         } else {
                 acpi_irq_penalty[link->irq.active] += PIRQ_PENALTY_PCI_USING;
-                printk(PREFIX "%s [%s] enabled at IRQ %d\n",
+                printk(KERN_WARNING PREFIX "%s [%s] enabled at IRQ %d\n",
                        acpi_device_name(link->device),
                        acpi_device_bid(link->device), link->irq.active);
         }
diff --git a/drivers/acpi/processor_idle.c b/drivers/acpi/processor_idle.c
index 66a9d8145562..7bc22a471fe3 100644
--- a/drivers/acpi/processor_idle.c
+++ b/drivers/acpi/processor_idle.c
@@ -66,43 +66,17 @@ ACPI_MODULE_NAME("processor_idle");
 #define ACPI_PROCESSOR_FILE_POWER       "power"
 #define US_TO_PM_TIMER_TICKS(t)         ((t * (PM_TIMER_FREQUENCY/1000)) / 1000)
 #define PM_TIMER_TICK_NS                (1000000000ULL/PM_TIMER_FREQUENCY)
-#ifndef CONFIG_CPU_IDLE
-#define C2_OVERHEAD                     4       /* 1us (3.579 ticks per us) */
-#define C3_OVERHEAD                     4       /* 1us (3.579 ticks per us) */
-static void (*pm_idle_save) (void) __read_mostly;
-#else
 #define C2_OVERHEAD                     1       /* 1us */
 #define C3_OVERHEAD                     1       /* 1us */
-#endif
 #define PM_TIMER_TICKS_TO_US(p)         (((p) * 1000)/(PM_TIMER_FREQUENCY/1000))
 
 static unsigned int max_cstate __read_mostly = ACPI_PROCESSOR_MAX_POWER;
-#ifdef CONFIG_CPU_IDLE
 module_param(max_cstate, uint, 0000);
-#else
-module_param(max_cstate, uint, 0644);
-#endif
 static unsigned int nocst __read_mostly;
 module_param(nocst, uint, 0000);
 
-#ifndef CONFIG_CPU_IDLE
-/*
- * bm_history -- bit-mask with a bit per jiffy of bus-master activity
- * 1000 HZ: 0xFFFFFFFF: 32 jiffies = 32ms
- * 800 HZ: 0xFFFFFFFF: 32 jiffies = 40ms
- * 100 HZ: 0x0000000F: 4 jiffies = 40ms
- * reduce history for more aggressive entry into C3
- */
-static unsigned int bm_history __read_mostly =
-    (HZ >= 800 ? 0xFFFFFFFF : ((1U << (HZ / 25)) - 1));
-module_param(bm_history, uint, 0644);
-
-static int acpi_processor_set_power_policy(struct acpi_processor *pr);
-
-#else   /* CONFIG_CPU_IDLE */
 static unsigned int latency_factor __read_mostly = 2;
 module_param(latency_factor, uint, 0644);
-#endif
 
 /*
  * IBM ThinkPad R40e crashes mysteriously when going into C2 or C3.
@@ -224,71 +198,6 @@ static void acpi_safe_halt(void)
         current_thread_info()->status |= TS_POLLING;
 }
 
-#ifndef CONFIG_CPU_IDLE
-
-static void
-acpi_processor_power_activate(struct acpi_processor *pr,
-                              struct acpi_processor_cx *new)
-{
-        struct acpi_processor_cx *old;
-
-        if (!pr || !new)
-                return;
-
-        old = pr->power.state;
-
-        if (old)
-                old->promotion.count = 0;
-        new->demotion.count = 0;
-
-        /* Cleanup from old state. */
-        if (old) {
-                switch (old->type) {
-                case ACPI_STATE_C3:
-                        /* Disable bus master reload */
-                        if (new->type != ACPI_STATE_C3 && pr->flags.bm_check)
-                                acpi_set_register(ACPI_BITREG_BUS_MASTER_RLD, 0);
-                        break;
-                }
-        }
-
-        /* Prepare to use new state. */
-        switch (new->type) {
-        case ACPI_STATE_C3:
-                /* Enable bus master reload */
-                if (old->type != ACPI_STATE_C3 && pr->flags.bm_check)
-                        acpi_set_register(ACPI_BITREG_BUS_MASTER_RLD, 1);
-                break;
-        }
-
-        pr->power.state = new;
-
-        return;
-}
-
-static atomic_t c3_cpu_count;
-
-/* Common C-state entry for C2, C3, .. */
-static void acpi_cstate_enter(struct acpi_processor_cx *cstate)
-{
-        /* Don't trace irqs off for idle */
-        stop_critical_timings();
-        if (cstate->entry_method == ACPI_CSTATE_FFH) {
-                /* Call into architectural FFH based C-state */
-                acpi_processor_ffh_cstate_enter(cstate);
-        } else {
-                int unused;
-                /* IO port based C-state */
-                inb(cstate->address);
-                /* Dummy wait op - must do something useless after P_LVL2 read
-                   because chipsets cannot guarantee that STPCLK# signal
-                   gets asserted in time to freeze execution properly. */
-                unused = inl(acpi_gbl_FADT.xpm_timer_block.address);
-        }
-        start_critical_timings();
-}
-#endif /* !CONFIG_CPU_IDLE */
-
 #ifdef ARCH_APICTIMER_STOPS_ON_C3
 
 /*
@@ -390,421 +299,6 @@ static int tsc_halts_in_c(int state)
 }
 #endif
 
-#ifndef CONFIG_CPU_IDLE
-static void acpi_processor_idle(void)
-{
-        struct acpi_processor *pr = NULL;
-        struct acpi_processor_cx *cx = NULL;
-        struct acpi_processor_cx *next_state = NULL;
-        int sleep_ticks = 0;
-        u32 t1, t2 = 0;
-
-        /*
-         * Interrupts must be disabled during bus mastering calculations and
-         * for C2/C3 transitions.
-         */
-        local_irq_disable();
-
-        pr = __get_cpu_var(processors);
-        if (!pr) {
-                local_irq_enable();
-                return;
-        }
-
-        /*
-         * Check whether we truly need to go idle, or should
-         * reschedule:
-         */
-        if (unlikely(need_resched())) {
-                local_irq_enable();
-                return;
-        }
-
-        cx = pr->power.state;
-        if (!cx || acpi_idle_suspend) {
-                if (pm_idle_save) {
-                        pm_idle_save(); /* enables IRQs */
-                } else {
-                        acpi_safe_halt();
-                        local_irq_enable();
-                }
-
-                return;
-        }
-
-        /*
-         * Check BM Activity
-         * -----------------
-         * Check for bus mastering activity (if required), record, and check
-         * for demotion.
-         */
-        if (pr->flags.bm_check) {
-                u32 bm_status = 0;
-                unsigned long diff = jiffies - pr->power.bm_check_timestamp;
-
-                if (diff > 31)
-                        diff = 31;
-
-                pr->power.bm_activity <<= diff;
-
-                acpi_get_register(ACPI_BITREG_BUS_MASTER_STATUS, &bm_status);
-                if (bm_status) {
-                        pr->power.bm_activity |= 0x1;
-                        acpi_set_register(ACPI_BITREG_BUS_MASTER_STATUS, 1);
-                }
-                /*
-                 * PIIX4 Erratum #18: Note that BM_STS doesn't always reflect
-                 * the true state of bus mastering activity; forcing us to
-                 * manually check the BMIDEA bit of each IDE channel.
-                 */
-                else if (errata.piix4.bmisx) {
-                        if ((inb_p(errata.piix4.bmisx + 0x02) & 0x01)
-                            || (inb_p(errata.piix4.bmisx + 0x0A) & 0x01))
-                                pr->power.bm_activity |= 0x1;
-                }
-
-                pr->power.bm_check_timestamp = jiffies;
-
-                /*
-                 * If bus mastering is or was active this jiffy, demote
-                 * to avoid a faulty transition.  Note that the processor
-                 * won't enter a low-power state during this call (to this
-                 * function) but should upon the next.
-                 *
-                 * TBD: A better policy might be to fallback to the demotion
-                 *      state (use it for this quantum only) istead of
-                 *      demoting -- and rely on duration as our sole demotion
-                 *      qualification.  This may, however, introduce DMA
-                 *      issues (e.g. floppy DMA transfer overrun/underrun).
-                 */
-                if ((pr->power.bm_activity & 0x1) &&
-                    cx->demotion.threshold.bm) {
-                        local_irq_enable();
-                        next_state = cx->demotion.state;
-                        goto end;
-                }
-        }
-
-#ifdef CONFIG_HOTPLUG_CPU
-        /*
-         * Check for P_LVL2_UP flag before entering C2 and above on
-         * an SMP system. We do it here instead of doing it at _CST/P_LVL
-         * detection phase, to work cleanly with logical CPU hotplug.
-         */
-        if ((cx->type != ACPI_STATE_C1) && (num_online_cpus() > 1) &&
-            !pr->flags.has_cst && !(acpi_gbl_FADT.flags & ACPI_FADT_C2_MP_SUPPORTED))
-                cx = &pr->power.states[ACPI_STATE_C1];
-#endif
-
-        /*
-         * Sleep:
-         * ------
-         * Invoke the current Cx state to put the processor to sleep.
-         */
-        if (cx->type == ACPI_STATE_C2 || cx->type == ACPI_STATE_C3) {
-                current_thread_info()->status &= ~TS_POLLING;
-                /*
-                 * TS_POLLING-cleared state must be visible before we
-                 * test NEED_RESCHED:
-                 */
-                smp_mb();
-                if (need_resched()) {
-                        current_thread_info()->status |= TS_POLLING;
-                        local_irq_enable();
-                        return;
-                }
-        }
-
-        switch (cx->type) {
-
-        case ACPI_STATE_C1:
-                /*
-                 * Invoke C1.
-                 * Use the appropriate idle routine, the one that would
-                 * be used without acpi C-states.
-                 */
-                if (pm_idle_save) {
-                        pm_idle_save(); /* enables IRQs */
-                } else {
-                        acpi_safe_halt();
-                        local_irq_enable();
-                }
-
-                /*
-                 * TBD: Can't get time duration while in C1, as resumes
-                 *      go to an ISR rather than here.  Need to instrument
-                 *      base interrupt handler.
-                 *
-                 * Note: the TSC better not stop in C1, sched_clock() will
-                 *       skew otherwise.
-                 */
-                sleep_ticks = 0xFFFFFFFF;
-
-                break;
-
-        case ACPI_STATE_C2:
-                /* Get start time (ticks) */
-                t1 = inl(acpi_gbl_FADT.xpm_timer_block.address);
-                /* Tell the scheduler that we are going deep-idle: */
-                sched_clock_idle_sleep_event();
-                /* Invoke C2 */
-                acpi_state_timer_broadcast(pr, cx, 1);
-                acpi_cstate_enter(cx);
-                /* Get end time (ticks) */
-                t2 = inl(acpi_gbl_FADT.xpm_timer_block.address);
-
-#if defined (CONFIG_GENERIC_TIME) && defined (CONFIG_X86)
-                /* TSC halts in C2, so notify users */
-                if (tsc_halts_in_c(ACPI_STATE_C2))
-                        mark_tsc_unstable("possible TSC halt in C2");
-#endif
-                /* Compute time (ticks) that we were actually asleep */
-                sleep_ticks = ticks_elapsed(t1, t2);
-
-                /* Tell the scheduler how much we idled: */
-                sched_clock_idle_wakeup_event(sleep_ticks*PM_TIMER_TICK_NS);
-
-                /* Re-enable interrupts */
-                local_irq_enable();
-                /* Do not account our idle-switching overhead: */
-                sleep_ticks -= cx->latency_ticks + C2_OVERHEAD;
-
-                current_thread_info()->status |= TS_POLLING;
-                acpi_state_timer_broadcast(pr, cx, 0);
-                break;
-
-        case ACPI_STATE_C3:
-                acpi_unlazy_tlb(smp_processor_id());
-                /*
-                 * Must be done before busmaster disable as we might
-                 * need to access HPET !
-                 */
-                acpi_state_timer_broadcast(pr, cx, 1);
-                /*
-                 * disable bus master
-                 * bm_check implies we need ARB_DIS
-                 * !bm_check implies we need cache flush
-                 * bm_control implies whether we can do ARB_DIS
-                 *
-                 * That leaves a case where bm_check is set and bm_control is
-                 * not set. In that case we cannot do much, we enter C3
-                 * without doing anything.
-                 */
-                if (pr->flags.bm_check && pr->flags.bm_control) {
-                        if (atomic_inc_return(&c3_cpu_count) ==
-                            num_online_cpus()) {
-                                /*
-                                 * All CPUs are trying to go to C3
-                                 * Disable bus master arbitration
-                                 */
-                                acpi_set_register(ACPI_BITREG_ARB_DISABLE, 1);
-                        }
-                } else if (!pr->flags.bm_check) {
-                        /* SMP with no shared cache... Invalidate cache  */
-                        ACPI_FLUSH_CPU_CACHE();
-                }
-
-                /* Get start time (ticks) */
-                t1 = inl(acpi_gbl_FADT.xpm_timer_block.address);
-                /* Invoke C3 */
-                /* Tell the scheduler that we are going deep-idle: */
-                sched_clock_idle_sleep_event();
-                acpi_cstate_enter(cx);
-                /* Get end time (ticks) */
-                t2 = inl(acpi_gbl_FADT.xpm_timer_block.address);
-                if (pr->flags.bm_check && pr->flags.bm_control) {
-                        /* Enable bus master arbitration */
-                        atomic_dec(&c3_cpu_count);
-                        acpi_set_register(ACPI_BITREG_ARB_DISABLE, 0);
-                }
-
-#if defined (CONFIG_GENERIC_TIME) && defined (CONFIG_X86)
-                /* TSC halts in C3, so notify users */
-                if (tsc_halts_in_c(ACPI_STATE_C3))
-                        mark_tsc_unstable("TSC halts in C3");
-#endif
-                /* Compute time (ticks) that we were actually asleep */
-                sleep_ticks = ticks_elapsed(t1, t2);
-                /* Tell the scheduler how much we idled: */
-                sched_clock_idle_wakeup_event(sleep_ticks*PM_TIMER_TICK_NS);
-
-                /* Re-enable interrupts */
-                local_irq_enable();
-                /* Do not account our idle-switching overhead: */
-                sleep_ticks -= cx->latency_ticks + C3_OVERHEAD;
-
-                current_thread_info()->status |= TS_POLLING;
-                acpi_state_timer_broadcast(pr, cx, 0);
-                break;
-
-        default:
-                local_irq_enable();
-                return;
-        }
-        cx->usage++;
-        if ((cx->type != ACPI_STATE_C1) && (sleep_ticks > 0))
-                cx->time += sleep_ticks;
-
-        next_state = pr->power.state;
-
-#ifdef CONFIG_HOTPLUG_CPU
-        /* Don't do promotion/demotion */
-        if ((cx->type == ACPI_STATE_C1) && (num_online_cpus() > 1) &&
-            !pr->flags.has_cst && !(acpi_gbl_FADT.flags & ACPI_FADT_C2_MP_SUPPORTED)) {
-                next_state = cx;
-                goto end;
-        }
-#endif
-
-        /*
-         * Promotion?
-         * ----------
-         * Track the number of longs (time asleep is greater than threshold)
-         * and promote when the count threshold is reached.  Note that bus
-         * mastering activity may prevent promotions.
-         * Do not promote above max_cstate.
-         */
-        if (cx->promotion.state &&
-            ((cx->promotion.state - pr->power.states) <= max_cstate)) {
-                if (sleep_ticks > cx->promotion.threshold.ticks &&
-                  cx->promotion.state->latency <=
-                                pm_qos_requirement(PM_QOS_CPU_DMA_LATENCY)) {
-                        cx->promotion.count++;
-                        cx->demotion.count = 0;
-                        if (cx->promotion.count >=
-                            cx->promotion.threshold.count) {
-                                if (pr->flags.bm_check) {
-                                        if (!
-                                            (pr->power.bm_activity & cx->
-                                             promotion.threshold.bm)) {
-                                                next_state =
-                                                    cx->promotion.state;
-                                                goto end;
-                                        }
-                                } else {
-                                        next_state = cx->promotion.state;
-                                        goto end;
-                                }
-                        }
-                }
-        }
-
-        /*
-         * Demotion?
-         * ---------
-         * Track the number of shorts (time asleep is less than time threshold)
-         * and demote when the usage threshold is reached.
-         */
-        if (cx->demotion.state) {
-                if (sleep_ticks < cx->demotion.threshold.ticks) {
-                        cx->demotion.count++;
-                        cx->promotion.count = 0;
-                        if (cx->demotion.count >= cx->demotion.threshold.count) {
-                                next_state = cx->demotion.state;
-                                goto end;
-                        }
-                }
-        }
-
-      end:
-        /*
-         * Demote if current state exceeds max_cstate
-         * or if the latency of the current state is unacceptable
-         */
-        if ((pr->power.state - pr->power.states) > max_cstate ||
-                pr->power.state->latency >
-                                pm_qos_requirement(PM_QOS_CPU_DMA_LATENCY)) {
-                if (cx->demotion.state)
-                        next_state = cx->demotion.state;
-        }
-
-        /*
-         * New Cx State?
-         * -------------
-         * If we're going to start using a new Cx state we must clean up
-         * from the previous and prepare to use the new.
-         */
-        if (next_state != pr->power.state)
-                acpi_processor_power_activate(pr, next_state);
-}
-
-static int acpi_processor_set_power_policy(struct acpi_processor *pr)
-{
-        unsigned int i;
-        unsigned int state_is_set = 0;
-        struct acpi_processor_cx *lower = NULL;
-        struct acpi_processor_cx *higher = NULL;
-        struct acpi_processor_cx *cx;
-
-
-        if (!pr)
-                return -EINVAL;
-
-        /*
-         * This function sets the default Cx state policy (OS idle handler).
-         * Our scheme is to promote quickly to C2 but more conservatively
-         * to C3.  We're favoring C2  for its characteristics of low latency
-         * (quick response), good power savings, and ability to allow bus
-         * mastering activity.  Note that the Cx state policy is completely
-         * customizable and can be altered dynamically.
-         */
-
-        /* startup state */
-        for (i = 1; i < ACPI_PROCESSOR_MAX_POWER; i++) {
-                cx = &pr->power.states[i];
-                if (!cx->valid)
-                        continue;
-
-                if (!state_is_set)
-                        pr->power.state = cx;
-                state_is_set++;
-                break;
-        }
-
-        if (!state_is_set)
-                return -ENODEV;
-
-        /* demotion */
-        for (i = 1; i < ACPI_PROCESSOR_MAX_POWER; i++) {
-                cx = &pr->power.states[i];
-                if (!cx->valid)
-                        continue;
-
-                if (lower) {
-                        cx->demotion.state = lower;
-                        cx->demotion.threshold.ticks = cx->latency_ticks;
-                        cx->demotion.threshold.count = 1;
-                        if (cx->type == ACPI_STATE_C3)
-                                cx->demotion.threshold.bm = bm_history;
-                }
-
-                lower = cx;
-        }
-
-        /* promotion */
-        for (i = (ACPI_PROCESSOR_MAX_POWER - 1); i > 0; i--) {
-                cx = &pr->power.states[i];
-                if (!cx->valid)
-                        continue;
-
-                if (higher) {
-                        cx->promotion.state = higher;
-                        cx->promotion.threshold.ticks = cx->latency_ticks;
-                        if (cx->type >= ACPI_STATE_C2)
-                                cx->promotion.threshold.count = 4;
-                        else
-                                cx->promotion.threshold.count = 10;
-                        if (higher->type == ACPI_STATE_C3)
-                                cx->promotion.threshold.bm = bm_history;
-                }
-
-                higher = cx;
-        }
-
-        return 0;
-}
-#endif /* !CONFIG_CPU_IDLE */
-
 static int acpi_processor_get_power_info_fadt(struct acpi_processor *pr)
 {
 
@@ -1047,11 +541,7 @@ static void acpi_processor_power_verify_c2(struct acpi_processor_cx *cx)
          */
         cx->valid = 1;
 
-#ifndef CONFIG_CPU_IDLE
-        cx->latency_ticks = US_TO_PM_TIMER_TICKS(cx->latency);
-#else
         cx->latency_ticks = cx->latency;
-#endif
 
         return;
 }
@@ -1121,7 +611,6 @@ static void acpi_processor_power_verify_c3(struct acpi_processor *pr,
                                           " for C3 to be enabled on SMP systems\n"));
                         return;
                 }
-                acpi_set_register(ACPI_BITREG_BUS_MASTER_RLD, 0);
         }
 
         /*
@@ -1132,11 +621,16 @@ static void acpi_processor_power_verify_c3(struct acpi_processor *pr,
          */
         cx->valid = 1;
 
-#ifndef CONFIG_CPU_IDLE
-        cx->latency_ticks = US_TO_PM_TIMER_TICKS(cx->latency);
-#else
         cx->latency_ticks = cx->latency;
-#endif
+        /*
+         * On older chipsets, BM_RLD needs to be set
+         * in order for Bus Master activity to wake the
+         * system from C3.  Newer chipsets handle DMA
+         * during C3 automatically and BM_RLD is a NOP.
+         * In either case, the proper way to
+         * handle BM_RLD is to set it and leave it set.
+         */
+        acpi_set_register(ACPI_BITREG_BUS_MASTER_RLD, 1);
 
         return;
 }
@@ -1201,20 +695,6 @@ static int acpi_processor_get_power_info(struct acpi_processor *pr)
 
         pr->power.count = acpi_processor_power_verify(pr);
 
-#ifndef CONFIG_CPU_IDLE
-        /*
-         * Set Default Policy
-         * ------------------
-         * Now that we know which states are supported, set the default
-         * policy.  Note that this policy can be changed dynamically
-         * (e.g. encourage deeper sleeps to conserve battery life when
-         * not on AC).
-         */
-        result = acpi_processor_set_power_policy(pr);
-        if (result)
-                return result;
-#endif
-
         /*
          * if one state of type C2 or C3 is available, mark this
          * CPU as being "idle manageable"
@@ -1312,69 +792,6 @@ static const struct file_operations acpi_processor_power_fops = {
         .release = single_release,
 };
 
-#ifndef CONFIG_CPU_IDLE
-
-int acpi_processor_cst_has_changed(struct acpi_processor *pr)
-{
-        int result = 0;
-
-        if (boot_option_idle_override)
-                return 0;
-
-        if (!pr)
-                return -EINVAL;
-
-        if (nocst) {
-                return -ENODEV;
-        }
-
-        if (!pr->flags.power_setup_done)
-                return -ENODEV;
-
-        /*
-         * Fall back to the default idle loop, when pm_idle_save had
-         * been initialized.
-         */
-        if (pm_idle_save) {
-                pm_idle = pm_idle_save;
-                /* Relies on interrupts forcing exit from idle. */
-                synchronize_sched();
-        }
-
-        pr->flags.power = 0;
-        result = acpi_processor_get_power_info(pr);
-        if ((pr->flags.power == 1) && (pr->flags.power_setup_done))
-                pm_idle = acpi_processor_idle;
-
-        return result;
-}
-
-#ifdef CONFIG_SMP
-static void smp_callback(void *v)
-{
-        /* we already woke the CPU up, nothing more to do */
-}
-
-/*
- * This function gets called when a part of the kernel has a new latency
- * requirement.  This means we need to get all processors out of their C-state,
- * and then recalculate a new suitable C-state. Just do a cross-cpu IPI; that
- * wakes them all right up.
- */
-static int acpi_processor_latency_notify(struct notifier_block *b,
-                unsigned long l, void *v)
-{
-        smp_call_function(smp_callback, NULL, 1);
-        return NOTIFY_OK;
-}
-
-static struct notifier_block acpi_processor_latency_notifier = {
-        .notifier_call = acpi_processor_latency_notify,
-};
-
-#endif
-
-#else /* CONFIG_CPU_IDLE */
 
 /**
  * acpi_idle_bm_check - checks if bus master activity was detected
@@ -1383,7 +800,7 @@ static int acpi_idle_bm_check(void)
 {
         u32 bm_status = 0;
 
-        acpi_get_register(ACPI_BITREG_BUS_MASTER_STATUS, &bm_status);
+        acpi_get_register_unlocked(ACPI_BITREG_BUS_MASTER_STATUS, &bm_status);
         if (bm_status)
                 acpi_set_register(ACPI_BITREG_BUS_MASTER_STATUS, 1);
         /*
@@ -1400,25 +817,6 @@ static int acpi_idle_bm_check(void)
 }
 
 /**
- * acpi_idle_update_bm_rld - updates the BM_RLD bit depending on target state
- * @pr: the processor
- * @target: the new target state
- */
-static inline void acpi_idle_update_bm_rld(struct acpi_processor *pr,
-                                           struct acpi_processor_cx *target)
-{
-        if (pr->flags.bm_rld_set && target->type != ACPI_STATE_C3) {
-                acpi_set_register(ACPI_BITREG_BUS_MASTER_RLD, 0);
-                pr->flags.bm_rld_set = 0;
-        }
-
-        if (!pr->flags.bm_rld_set && target->type == ACPI_STATE_C3) {
-                acpi_set_register(ACPI_BITREG_BUS_MASTER_RLD, 1);
-                pr->flags.bm_rld_set = 1;
-        }
-}
-
-/**
  * acpi_idle_do_entry - a helper function that does C2 and C3 type entry
  * @cx: cstate data
  *
@@ -1473,9 +871,6 @@ static int acpi_idle_enter_c1(struct cpuidle_device *dev,
                 return 0;
         }
 
-        if (pr->flags.bm_check)
-                acpi_idle_update_bm_rld(pr, cx);
-
         t1 = inl(acpi_gbl_FADT.xpm_timer_block.address);
         acpi_idle_do_entry(cx);
         t2 = inl(acpi_gbl_FADT.xpm_timer_block.address);
@@ -1527,9 +922,6 @@ static int acpi_idle_enter_simple(struct cpuidle_device *dev,
          */
         acpi_state_timer_broadcast(pr, cx, 1);
 
-        if (pr->flags.bm_check)
-                acpi_idle_update_bm_rld(pr, cx);
-
         if (cx->type == ACPI_STATE_C3)
                 ACPI_FLUSH_CPU_CACHE();
 
@@ -1621,8 +1013,6 @@ static int acpi_idle_enter_bm(struct cpuidle_device *dev,
          */
         acpi_state_timer_broadcast(pr, cx, 1);
 
-        acpi_idle_update_bm_rld(pr, cx);
-
         /*
          * disable bus master
          * bm_check implies we need ARB_DIS
@@ -1795,8 +1185,6 @@ int acpi_processor_cst_has_changed(struct acpi_processor *pr)
         return ret;
 }
 
-#endif /* CONFIG_CPU_IDLE */
-
 int __cpuinit acpi_processor_power_init(struct acpi_processor *pr,
                               struct acpi_device *device)
 {
@@ -1825,10 +1213,6 @@ int __cpuinit acpi_processor_power_init(struct acpi_processor *pr,
                                "ACPI: processor limited to max C-state %d\n",
                                max_cstate);
                 first_run++;
-#if !defined(CONFIG_CPU_IDLE) && defined(CONFIG_SMP)
-                pm_qos_add_notifier(PM_QOS_CPU_DMA_LATENCY,
-                                &acpi_processor_latency_notifier);
-#endif
         }
 
         if (!pr)
@@ -1852,11 +1236,9 @@ int __cpuinit acpi_processor_power_init(struct acpi_processor *pr,
          * platforms that only support C1.
          */
         if (pr->flags.power) {
-#ifdef CONFIG_CPU_IDLE
                 acpi_processor_setup_cpuidle(pr);
                 if (cpuidle_register_device(&pr->power.dev))
                         return -EIO;
-#endif
 
                 printk(KERN_INFO PREFIX "CPU%d (power states:", pr->id);
                 for (i = 1; i <= pr->power.count; i++)
@@ -1864,13 +1246,6 @@ int __cpuinit acpi_processor_power_init(struct acpi_processor *pr,
                                 printk(" C%d[C%d]", i,
                                        pr->power.states[i].type);
                 printk(")\n");
-
-#ifndef CONFIG_CPU_IDLE
-                if (pr->id == 0) {
-                        pm_idle_save = pm_idle;
-                        pm_idle = acpi_processor_idle;
-                }
-#endif
         }
 
         /* 'power' [R] */
@@ -1889,34 +1264,12 @@ int acpi_processor_power_exit(struct acpi_processor *pr,
         if (boot_option_idle_override)
                 return 0;
 
-#ifdef CONFIG_CPU_IDLE
         cpuidle_unregister_device(&pr->power.dev);
-#endif
         pr->flags.power_setup_done = 0;
 
         if (acpi_device_dir(device))
                 remove_proc_entry(ACPI_PROCESSOR_FILE_POWER,
                                   acpi_device_dir(device));
 
-#ifndef CONFIG_CPU_IDLE
-
-        /* Unregister the idle handler when processor #0 is removed. */
-        if (pr->id == 0) {
-                if (pm_idle_save)
-                        pm_idle = pm_idle_save;
-
-                /*
-                 * We are about to unload the current idle thread pm callback
-                 * (pm_idle), Wait for all processors to update cached/local
-                 * copies of pm_idle before proceeding.
-                 */
-                cpu_idle_wait();
-#ifdef CONFIG_SMP
-                pm_qos_remove_notifier(PM_QOS_CPU_DMA_LATENCY,
-                                &acpi_processor_latency_notifier);
-#endif
-        }
-#endif
-
         return 0;
 }
diff --git a/drivers/acpi/processor_perflib.c b/drivers/acpi/processor_perflib.c
index 846e227592d4..9cc769b587ff 100644
--- a/drivers/acpi/processor_perflib.c
+++ b/drivers/acpi/processor_perflib.c
@@ -31,14 +31,6 @@
 #include <linux/init.h>
 #include <linux/cpufreq.h>
 
-#ifdef CONFIG_X86_ACPI_CPUFREQ_PROC_INTF
-#include <linux/proc_fs.h>
-#include <linux/seq_file.h>
-#include <linux/mutex.h>
-
-#include <asm/uaccess.h>
-#endif
-
 #ifdef CONFIG_X86
 #include <asm/cpufeature.h>
 #endif
@@ -434,96 +426,6 @@ int acpi_processor_notify_smm(struct module *calling_module)
 
 EXPORT_SYMBOL(acpi_processor_notify_smm);
 
-#ifdef CONFIG_X86_ACPI_CPUFREQ_PROC_INTF
-/* /proc/acpi/processor/../performance interface (DEPRECATED) */
-
-static int acpi_processor_perf_open_fs(struct inode *inode, struct file *file);
-static struct file_operations acpi_processor_perf_fops = {
-        .owner = THIS_MODULE,
-        .open = acpi_processor_perf_open_fs,
-        .read = seq_read,
-        .llseek = seq_lseek,
-        .release = single_release,
-};
-
-static int acpi_processor_perf_seq_show(struct seq_file *seq, void *offset)
-{
-        struct acpi_processor *pr = seq->private;
-        int i;
-
-
-        if (!pr)
-                goto end;
-
-        if (!pr->performance) {
-                seq_puts(seq, "<not supported>\n");
-                goto end;
-        }
-
-        seq_printf(seq, "state count:             %d\n"
-                   "active state:            P%d\n",
-                   pr->performance->state_count, pr->performance->state);
-
-        seq_puts(seq, "states:\n");
-        for (i = 0; i < pr->performance->state_count; i++)
-                seq_printf(seq,
-                           "   %cP%d:                  %d MHz, %d mW, %d uS\n",
-                           (i == pr->performance->state ? '*' : ' '), i,
-                           (u32) pr->performance->states[i].core_frequency,
-                           (u32) pr->performance->states[i].power,
-                           (u32) pr->performance->states[i].transition_latency);
-
-      end:
-        return 0;
-}
-
-static int acpi_processor_perf_open_fs(struct inode *inode, struct file *file)
-{
-        return single_open(file, acpi_processor_perf_seq_show,
-                           PDE(inode)->data);
-}
-
-static void acpi_cpufreq_add_file(struct acpi_processor *pr)
-{
-        struct acpi_device *device = NULL;
-
-
-        if (acpi_bus_get_device(pr->handle, &device))
-                return;
-
-        /* add file 'performance' [R/W] */
-        proc_create_data(ACPI_PROCESSOR_FILE_PERFORMANCE, S_IFREG | S_IRUGO,
-                         acpi_device_dir(device),
-                         &acpi_processor_perf_fops, acpi_driver_data(device));
-        return;
-}
-
-static void acpi_cpufreq_remove_file(struct acpi_processor *pr)
-{
-        struct acpi_device *device = NULL;
-
-
-        if (acpi_bus_get_device(pr->handle, &device))
-                return;
-
-        /* remove file 'performance' */
-        remove_proc_entry(ACPI_PROCESSOR_FILE_PERFORMANCE,
-                          acpi_device_dir(device));
-
-        return;
-}
-
-#else
-static void acpi_cpufreq_add_file(struct acpi_processor *pr)
-{
-        return;
-}
-static void acpi_cpufreq_remove_file(struct acpi_processor *pr)
-{
-        return;
-}
-#endif                          /* CONFIG_X86_ACPI_CPUFREQ_PROC_INTF */
-
 static int acpi_processor_get_psd(struct acpi_processor *pr)
 {
         int result = 0;
@@ -747,14 +649,12 @@ err_ret:
 }
 EXPORT_SYMBOL(acpi_processor_preregister_performance);
 
-
 int
 acpi_processor_register_performance(struct acpi_processor_performance
                                     *performance, unsigned int cpu)
 {
         struct acpi_processor *pr;
 
-
         if (!(acpi_processor_ppc_status & PPC_REGISTERED))
                 return -EINVAL;
 
@@ -781,8 +681,6 @@ acpi_processor_register_performance(struct acpi_processor_performance
                 return -EIO;
         }
 
-        acpi_cpufreq_add_file(pr);
-
         mutex_unlock(&performance_mutex);
         return 0;
 }
@@ -795,7 +693,6 @@ acpi_processor_unregister_performance(struct acpi_processor_performance
 {
         struct acpi_processor *pr;
 
-
         mutex_lock(&performance_mutex);
 
         pr = per_cpu(processors, cpu);
@@ -808,8 +705,6 @@ acpi_processor_unregister_performance(struct acpi_processor_performance
                 kfree(pr->performance->states);
         pr->performance = NULL;
 
-        acpi_cpufreq_remove_file(pr);
-
         mutex_unlock(&performance_mutex);
 
         return;
diff --git a/drivers/acpi/sleep.c b/drivers/acpi/sleep.c
index 7e3c609cbef2..519266654f06 100644
--- a/drivers/acpi/sleep.c
+++ b/drivers/acpi/sleep.c
@@ -90,31 +90,6 @@ void __init acpi_old_suspend_ordering(void)
         old_suspend_ordering = true;
 }
 
-/*
- * According to the ACPI specification the BIOS should make sure that ACPI is
- * enabled and SCI_EN bit is set on wake-up from S1 - S3 sleep states.  Still,
- * some BIOSes don't do that and therefore we use acpi_enable() to enable ACPI
- * on such systems during resume.  Unfortunately that doesn't help in
- * particularly pathological cases in which SCI_EN has to be set directly on
- * resume, although the specification states very clearly that this flag is
- * owned by the hardware.  The set_sci_en_on_resume variable will be set in such
- * cases.
- */
-static bool set_sci_en_on_resume;
-/*
- * The ACPI specification wants us to save NVS memory regions during hibernation
- * and to restore them during the subsequent resume.  However, it is not certain
- * if this mechanism is going to work on all machines, so we allow the user to
- * disable this mechanism using the 'acpi_sleep=s4_nonvs' kernel command line
- * option.
- */
-static bool s4_no_nvs;
-
-void __init acpi_s4_no_nvs(void)
-{
-        s4_no_nvs = true;
-}
-
 /**
  *      acpi_pm_disable_gpes - Disable the GPEs.
  */
@@ -193,6 +168,18 @@ static void acpi_pm_end(void)
 #endif /* CONFIG_ACPI_SLEEP */
 
 #ifdef CONFIG_SUSPEND
+/*
+ * According to the ACPI specification the BIOS should make sure that ACPI is
+ * enabled and SCI_EN bit is set on wake-up from S1 - S3 sleep states.  Still,
+ * some BIOSes don't do that and therefore we use acpi_enable() to enable ACPI
+ * on such systems during resume.  Unfortunately that doesn't help in
+ * particularly pathological cases in which SCI_EN has to be set directly on
+ * resume, although the specification states very clearly that this flag is
+ * owned by the hardware.  The set_sci_en_on_resume variable will be set in such
+ * cases.
+ */
+static bool set_sci_en_on_resume;
+
 extern void do_suspend_lowlevel(void);
 
 static u32 acpi_suspend_states[] = {
@@ -396,6 +383,20 @@ static struct dmi_system_id __initdata acpisleep_dmi_table[] = {
 #endif /* CONFIG_SUSPEND */
 
 #ifdef CONFIG_HIBERNATION
+/*
+ * The ACPI specification wants us to save NVS memory regions during hibernation
+ * and to restore them during the subsequent resume.  However, it is not certain
+ * if this mechanism is going to work on all machines, so we allow the user to
+ * disable this mechanism using the 'acpi_sleep=s4_nonvs' kernel command line
+ * option.
+ */
+static bool s4_no_nvs;
+
+void __init acpi_s4_no_nvs(void)
+{
+        s4_no_nvs = true;
+}
+
 static unsigned long s4_hardware_signature;
 static struct acpi_table_facs *facs;
 static bool nosigcheck;
@@ -679,7 +680,7 @@ static void acpi_power_off_prepare(void)
 static void acpi_power_off(void)
 {
         /* acpi_sleep_prepare(ACPI_STATE_S5) should have already been called */
-        printk("%s called\n", __func__);
+        printk(KERN_DEBUG "%s called\n", __func__);
         local_irq_disable();
         acpi_enable_wakeup_device(ACPI_STATE_S5);
         acpi_enter_sleep_state(ACPI_STATE_S5);
diff --git a/drivers/acpi/tables.c b/drivers/acpi/tables.c
index 775c97a282bd..a8852952fac4 100644
--- a/drivers/acpi/tables.c
+++ b/drivers/acpi/tables.c
@@ -293,7 +293,12 @@ static void __init check_multiple_madt(void)
 
 int __init acpi_table_init(void)
 {
-        acpi_initialize_tables(initial_tables, ACPI_MAX_TABLES, 0);
+        acpi_status status;
+
+        status = acpi_initialize_tables(initial_tables, ACPI_MAX_TABLES, 0);
+        if (ACPI_FAILURE(status))
+                return 1;
+
         check_multiple_madt();
         return 0;
 }
diff --git a/drivers/acpi/video.c b/drivers/acpi/video.c
index f261737636da..bb5ed059114a 100644
--- a/drivers/acpi/video.c
+++ b/drivers/acpi/video.c
@@ -1020,7 +1020,7 @@ acpi_video_device_brightness_seq_show(struct seq_file *seq, void *offset)
         }
 
         seq_printf(seq, "levels: ");
-        for (i = 0; i < dev->brightness->count; i++)
+        for (i = 2; i < dev->brightness->count; i++)
                 seq_printf(seq, " %d", dev->brightness->levels[i]);
         seq_printf(seq, "\ncurrent: %d\n", dev->brightness->curr);
 
@@ -1059,7 +1059,7 @@ acpi_video_device_write_brightness(struct file *file,
                 return -EFAULT;
 
         /* validate through the list of available levels */
-        for (i = 0; i < dev->brightness->count; i++)
+        for (i = 2; i < dev->brightness->count; i++)
                 if (level == dev->brightness->levels[i]) {
                         if (ACPI_SUCCESS
                             (acpi_video_device_lcd_set_level(dev, level)))
@@ -1260,7 +1260,7 @@ static int acpi_video_bus_POST_info_seq_show(struct seq_file *seq, void *offset)
                         printk(KERN_WARNING PREFIX
                                "This indicates a BIOS bug. Please contact the manufacturer.\n");
                 }
-                printk("%llx\n", options);
+                printk(KERN_WARNING "%llx\n", options);
                 seq_printf(seq, "can POST: <integrated video>");
                 if (options & 2)
                         seq_printf(seq, " <PCI video>");
@@ -1712,7 +1712,7 @@ acpi_video_get_next_level(struct acpi_video_device *device,
         max = max_below = 0;
         min = min_above = 255;
         /* Find closest level to level_current */
-        for (i = 0; i < device->brightness->count; i++) {
+        for (i = 2; i < device->brightness->count; i++) {
                 l = device->brightness->levels[i];
                 if (abs(l - level_current) < abs(delta)) {
                         delta = l - level_current;
@@ -1722,7 +1722,7 @@ acpi_video_get_next_level(struct acpi_video_device *device,
         }
         /* Ajust level_current to closest available level */
         level_current += delta;
-        for (i = 0; i < device->brightness->count; i++) {
+        for (i = 2; i < device->brightness->count; i++) {
                 l = device->brightness->levels[i];
                 if (l < min)
                         min = l;
@@ -2006,6 +2006,12 @@ static int acpi_video_bus_add(struct acpi_device *device)
                         device->pnp.bus_id[3] = '0' + instance;
                 instance ++;
         }
+        /* a hack to fix the duplicate name "VGA" problem on Pa 3553 */
+        if (!strcmp(device->pnp.bus_id, "VGA")) {
+                if (instance)
+                        device->pnp.bus_id[3] = '0' + instance;
+                instance++;
+        }
 
         video->device = device;
         strcpy(acpi_device_name(device), ACPI_VIDEO_BUS_NAME);
diff --git a/drivers/char/sx.c b/drivers/char/sx.c
index b60be7b0decf..f146e90404fa 100644
--- a/drivers/char/sx.c
+++ b/drivers/char/sx.c
@@ -1713,8 +1713,8 @@ static long sx_fw_ioctl(struct file *filp, unsigned int cmd,
                 for (i = 0; i < SX_NBOARDS; i++)
                         sx_dprintk(SX_DEBUG_FIRMWARE, "<%x> ", boards[i].flags);
                 sx_dprintk(SX_DEBUG_FIRMWARE, "\n");
-                unlock_kernel();
-                return -EIO;
+                rc = -EIO;
+                goto out;
         }
 
         switch (cmd) {
@@ -1747,7 +1747,8 @@ static long sx_fw_ioctl(struct file *filp, unsigned int cmd,
                 break;
         case SXIO_DO_RAMTEST:
                 if (sx_initialized)     /* Already initialized: better not ramtest the board.  */
-                        return -EPERM;
+                        rc = -EPERM;
+                        break;
                 if (IS_SX_BOARD(board)) {
                         rc = do_memtest(board, 0, 0x7000);
                         if (!rc)
@@ -1844,6 +1845,7 @@ static long sx_fw_ioctl(struct file *filp, unsigned int cmd,
                 rc = -ENOTTY;
                 break;
         }
+out:
         unlock_kernel();
         func_exit();
         return rc;
diff --git a/drivers/firewire/fw-card.c b/drivers/firewire/fw-card.c
index 7be2cf3514e7..a5dd7a665aa8 100644
--- a/drivers/firewire/fw-card.c
+++ b/drivers/firewire/fw-card.c
@@ -412,6 +412,7 @@ fw_card_add(struct fw_card *card,
 {
         u32 *config_rom;
         size_t length;
+        int err;
 
         card->max_receive = max_receive;
         card->link_speed = link_speed;
@@ -422,7 +423,13 @@ fw_card_add(struct fw_card *card,
         list_add_tail(&card->link, &card_list);
         mutex_unlock(&card_mutex);
 
-        return card->driver->enable(card, config_rom, length);
+        err = card->driver->enable(card, config_rom, length);
+        if (err < 0) {
+                mutex_lock(&card_mutex);
+                list_del(&card->link);
+                mutex_unlock(&card_mutex);
+        }
+        return err;
 }
 EXPORT_SYMBOL(fw_card_add);
 
diff --git a/drivers/hwmon/hp_accel.c b/drivers/hwmon/hp_accel.c
index 03705240000f..abf4dfc8ec22 100644
--- a/drivers/hwmon/hp_accel.c
+++ b/drivers/hwmon/hp_accel.c
@@ -153,7 +153,10 @@ static struct axis_conversion lis3lv02d_axis_y_inverted = {1, -2, 3};
 static struct axis_conversion lis3lv02d_axis_x_inverted = {-1, 2, 3};
 static struct axis_conversion lis3lv02d_axis_z_inverted = {1, 2, -3};
 static struct axis_conversion lis3lv02d_axis_xy_rotated_left = {-2, 1, 3};
+static struct axis_conversion lis3lv02d_axis_xy_rotated_left_usd = {-2, 1, -3};
 static struct axis_conversion lis3lv02d_axis_xy_swap_inverted = {-2, -1, 3};
+static struct axis_conversion lis3lv02d_axis_xy_rotated_right = {2, -1, 3};
+static struct axis_conversion lis3lv02d_axis_xy_swap_yz_inverted = {2, -1, -3};
 
 #define AXIS_DMI_MATCH(_ident, _name, _axis) {          \
         .ident = _ident,                                \
@@ -172,10 +175,12 @@ static struct dmi_system_id lis3lv02d_dmi_ids[] = {
         AXIS_DMI_MATCH("NC2510", "HP Compaq 2510", y_inverted),
         AXIS_DMI_MATCH("NC8510", "HP Compaq 8510", xy_swap_inverted),
         AXIS_DMI_MATCH("HP2133", "HP 2133", xy_rotated_left),
+        AXIS_DMI_MATCH("NC653x", "HP Compaq 653", xy_rotated_left_usd),
+        AXIS_DMI_MATCH("NC673x", "HP Compaq 673", xy_rotated_left_usd),
+        AXIS_DMI_MATCH("NC651xx", "HP Compaq 651", xy_rotated_right),
+        AXIS_DMI_MATCH("NC671xx", "HP Compaq 671", xy_swap_yz_inverted),
         { NULL, }
 /* Laptop models without axis info (yet):
- * "NC651xx" "HP Compaq 651"
- * "NC671xx" "HP Compaq 671"
  * "NC6910" "HP Compaq 6910"
  * HP Compaq 8710x Notebook PC / Mobile Workstation
  * "NC2400" "HP Compaq nc2400"
diff --git a/drivers/ieee1394/dv1394.c b/drivers/ieee1394/dv1394.c
index a329e6bd5d2d..3838bc4acaba 100644
--- a/drivers/ieee1394/dv1394.c
+++ b/drivers/ieee1394/dv1394.c
@@ -1823,6 +1823,10 @@ static int dv1394_open(struct inode *inode, struct file *file)
 
 #endif
 
+        printk(KERN_INFO "%s: NOTE, the dv1394 interface is unsupported "
+               "and will not be available in the new firewire driver stack. "
+               "Try libraw1394 based programs instead.\n", current->comm);
+
         return 0;
 }
 
@@ -2567,10 +2571,6 @@ static int __init dv1394_init_module(void)
 {
         int ret;
 
-        printk(KERN_WARNING
-               "NOTE: The dv1394 driver is unsupported and may be removed in a "
-               "future Linux release. Use raw1394 instead.\n");
-
         cdev_init(&dv1394_cdev, &dv1394_fops);
         dv1394_cdev.owner = THIS_MODULE;
         ret = cdev_add(&dv1394_cdev, IEEE1394_DV1394_DEV, 16);
diff --git a/drivers/md/linear.c b/drivers/md/linear.c
index 1e3aea9eecf1..09658b218474 100644
--- a/drivers/md/linear.c
+++ b/drivers/md/linear.c
@@ -25,13 +25,13 @@ static inline dev_info_t *which_dev(mddev_t *mddev, sector_t sector)
 {
         dev_info_t *hash;
         linear_conf_t *conf = mddev_to_conf(mddev);
+        sector_t idx = sector >> conf->sector_shift;
 
         /*
          * sector_div(a,b) returns the remainer and sets a to a/b
          */
-        sector >>= conf->sector_shift;
-        (void)sector_div(sector, conf->spacing);
-        hash = conf->hash_table[sector];
+        (void)sector_div(idx, conf->spacing);
+        hash = conf->hash_table[idx];
 
         while (sector >= hash->num_sectors + hash->start_sector)
                 hash++;
diff --git a/drivers/md/md.c b/drivers/md/md.c
index 41e2509bf896..4495104f6c9f 100644
--- a/drivers/md/md.c
+++ b/drivers/md/md.c
@@ -1481,6 +1481,11 @@ static int bind_rdev_to_array(mdk_rdev_t * rdev, mddev_t * mddev)
                 if (find_rdev_nr(mddev, rdev->desc_nr))
                         return -EBUSY;
         }
+        if (mddev->max_disks && rdev->desc_nr >= mddev->max_disks) {
+                printk(KERN_WARNING "md: %s: array is limited to %d devices\n",
+                       mdname(mddev), mddev->max_disks);
+                return -EBUSY;
+        }
         bdevname(rdev->bdev,b);
         while ( (s=strchr(b, '/')) != NULL)
                 *s = '!';
@@ -2441,6 +2446,15 @@ static void analyze_sbs(mddev_t * mddev)
 
         i = 0;
         rdev_for_each(rdev, tmp, mddev) {
+                if (rdev->desc_nr >= mddev->max_disks ||
+                    i > mddev->max_disks) {
+                        printk(KERN_WARNING
+                               "md: %s: %s: only %d devices permitted\n",
+                               mdname(mddev), bdevname(rdev->bdev, b),
+                               mddev->max_disks);
+                        kick_rdev_from_array(rdev);
+                        continue;
+                }
                 if (rdev != freshest)
                         if (super_types[mddev->major_version].
                             validate_super(mddev, rdev)) {
@@ -4614,13 +4628,6 @@ static int hot_add_disk(mddev_t * mddev, dev_t dev)
          * noticed in interrupt contexts ...
          */
 
-        if (rdev->desc_nr == mddev->max_disks) {
-                printk(KERN_WARNING "%s: can not hot-add to full array!\n",
-                        mdname(mddev));
-                err = -EBUSY;
-                goto abort_unbind_export;
-        }
-
         rdev->raid_disk = -1;
 
         md_update_sb(mddev, 1);
@@ -4634,9 +4641,6 @@ static int hot_add_disk(mddev_t * mddev, dev_t dev)
         md_new_event(mddev);
         return 0;
 
-abort_unbind_export:
-        unbind_rdev_from_array(rdev);
-
 abort_export:
         export_rdev(rdev);
         return err;
diff --git a/drivers/md/raid1.c b/drivers/md/raid1.c
index 7b4f5f7155d8..01e3cffd03b8 100644
--- a/drivers/md/raid1.c
+++ b/drivers/md/raid1.c
@@ -1640,7 +1640,8 @@ static void raid1d(mddev_t *mddev)
                         }
 
                         bio = r1_bio->bios[r1_bio->read_disk];
-                        if ((disk=read_balance(conf, r1_bio)) == -1) {
+                        if ((disk=read_balance(conf, r1_bio)) == -1 ||
+                            disk == r1_bio->read_disk) {
                                 printk(KERN_ALERT "raid1: %s: unrecoverable I/O"
                                        " read error for block %llu\n",
                                        bdevname(bio->bi_bdev,b),
diff --git a/drivers/misc/Kconfig b/drivers/misc/Kconfig
index 56073199ceba..c64e6798878a 100644
--- a/drivers/misc/Kconfig
+++ b/drivers/misc/Kconfig
@@ -217,6 +217,7 @@ config DELL_LAPTOP
         depends on EXPERIMENTAL
         depends on BACKLIGHT_CLASS_DEVICE
         depends on RFKILL
+        depends on POWER_SUPPLY
         default n
         ---help---
         This driver adds support for rfkill and backlight control to Dell
diff --git a/drivers/misc/atmel-ssc.c b/drivers/misc/atmel-ssc.c
index bf5e4d065436..558bf3f2c276 100644
--- a/drivers/misc/atmel-ssc.c
+++ b/drivers/misc/atmel-ssc.c
@@ -35,7 +35,7 @@ struct ssc_device *ssc_request(unsigned int ssc_num)
 
         if (!ssc_valid) {
                 spin_unlock(&user_lock);
-                dev_dbg(&ssc->pdev->dev, "could not find requested device\n");
+                pr_err("ssc: ssc%d platform device is missing\n", ssc_num);
                 return ERR_PTR(-ENODEV);
         }
 
diff --git a/drivers/misc/hpilo.c b/drivers/misc/hpilo.c
index 10c421b73eaf..f26667a7abf7 100644
--- a/drivers/misc/hpilo.c
+++ b/drivers/misc/hpilo.c
@@ -207,7 +207,7 @@ static void ilo_ccb_close(struct pci_dev *pdev, struct ccb_data *data)
                   &device_ccb->recv_ctrl);
 
         /* give iLO some time to process stop request */
-        for (retries = 1000; retries > 0; retries--) {
+        for (retries = MAX_WAIT; retries > 0; retries--) {
                 doorbell_set(driver_ccb);
                 udelay(1);
                 if (!(ioread32(&device_ccb->send_ctrl) & (1 << CTRL_BITPOS_A))
@@ -309,7 +309,7 @@ static int ilo_ccb_open(struct ilo_hwinfo *hw, struct ccb_data *data, int slot)
         doorbell_clr(driver_ccb);
 
         /* make sure iLO is really handling requests */
-        for (i = 1000; i > 0; i--) {
+        for (i = MAX_WAIT; i > 0; i--) {
                 if (ilo_pkt_dequeue(hw, driver_ccb, SENDQ, &pkt_id, NULL, NULL))
                         break;
                 udelay(1);
@@ -326,7 +326,7 @@ static int ilo_ccb_open(struct ilo_hwinfo *hw, struct ccb_data *data, int slot)
 
         return 0;
 free:
-        pci_free_consistent(pdev, data->dma_size, data->dma_va, data->dma_pa);
+        ilo_ccb_close(pdev, data);
 out:
         return error;
 }
diff --git a/drivers/misc/hpilo.h b/drivers/misc/hpilo.h
index a281207696c1..b64a20ef07e3 100644
--- a/drivers/misc/hpilo.h
+++ b/drivers/misc/hpilo.h
@@ -19,6 +19,8 @@
 #define MAX_ILO_DEV     1
 /* max number of files */
 #define MAX_OPEN        (MAX_CCB * MAX_ILO_DEV)
+/* spin counter for open/close delay */
+#define MAX_WAIT        10000
 
 /*
  * Per device, used to track global memory allocations.
diff --git a/drivers/misc/sgi-xp/xpc.h b/drivers/misc/sgi-xp/xpc.h
index a5bd658c2e83..275b78896a73 100644
--- a/drivers/misc/sgi-xp/xpc.h
+++ b/drivers/misc/sgi-xp/xpc.h
@@ -3,7 +3,7 @@
  * License.  See the file "COPYING" in the main directory of this archive
  * for more details.
  *
- * Copyright (c) 2004-2008 Silicon Graphics, Inc.  All Rights Reserved.
+ * Copyright (c) 2004-2009 Silicon Graphics, Inc.  All Rights Reserved.
  */
 
 /*
@@ -514,7 +514,8 @@ struct xpc_channel_uv {
                                                 /* partition's notify mq */
 
         struct xpc_send_msg_slot_uv *send_msg_slots;
-        struct xpc_notify_mq_msg_uv *recv_msg_slots;
+        void *recv_msg_slots;   /* each slot will hold a xpc_notify_mq_msg_uv */
+                                /* structure plus the user's payload */
 
         struct xpc_fifo_head_uv msg_slot_free_list;
         struct xpc_fifo_head_uv recv_msg_list;  /* deliverable payloads */
diff --git a/drivers/misc/sgi-xp/xpc_uv.c b/drivers/misc/sgi-xp/xpc_uv.c
index f17f7d40ea2c..29c0502a96b2 100644
--- a/drivers/misc/sgi-xp/xpc_uv.c
+++ b/drivers/misc/sgi-xp/xpc_uv.c
@@ -3,7 +3,7 @@
  * License.  See the file "COPYING" in the main directory of this archive
  * for more details.
  *
- * Copyright (c) 2008 Silicon Graphics, Inc.  All Rights Reserved.
+ * Copyright (c) 2008-2009 Silicon Graphics, Inc.  All Rights Reserved.
  */
 
 /*
@@ -1010,8 +1010,8 @@ xpc_allocate_recv_msg_slot_uv(struct xpc_channel *ch)
                         continue;
 
                 for (entry = 0; entry < nentries; entry++) {
-                        msg_slot = ch_uv->recv_msg_slots + entry *
-                            ch->entry_size;
+                        msg_slot = ch_uv->recv_msg_slots +
+                            entry * ch->entry_size;
 
                         msg_slot->hdr.msg_slot_number = entry;
                 }
@@ -1308,9 +1308,8 @@ xpc_handle_notify_mq_msg_uv(struct xpc_partition *part,
         /* we're dealing with a normal message sent via the notify_mq */
         ch_uv = &ch->sn.uv;
 
-        msg_slot = (struct xpc_notify_mq_msg_uv *)((u64)ch_uv->recv_msg_slots +
-                    (msg->hdr.msg_slot_number % ch->remote_nentries) *
-                    ch->entry_size);
+        msg_slot = ch_uv->recv_msg_slots +
+            (msg->hdr.msg_slot_number % ch->remote_nentries) * ch->entry_size;
 
         BUG_ON(msg->hdr.msg_slot_number != msg_slot->hdr.msg_slot_number);
         BUG_ON(msg_slot->hdr.size != 0);
diff --git a/drivers/net/cxgb3/sge.c b/drivers/net/cxgb3/sge.c
index 379a1324db4e..d31791f60292 100644
--- a/drivers/net/cxgb3/sge.c
+++ b/drivers/net/cxgb3/sge.c
@@ -2276,8 +2276,7 @@ no_mem:
                 } else if ((len = ntohl(r->len_cq)) != 0) {
                         struct sge_fl *fl;
 
-                        if (eth)
-                                lro = qs->lro_enabled && is_eth_tcp(rss_hi);
+                        lro &= eth && is_eth_tcp(rss_hi);
 
                         fl = (len & F_RSPD_FLQ) ? &qs->fl[1] : &qs->fl[0];
                         if (fl->use_pages) {
diff --git a/drivers/net/gianfar.c b/drivers/net/gianfar.c
index 3f7eab42aef1..acae2d8cd688 100644
--- a/drivers/net/gianfar.c
+++ b/drivers/net/gianfar.c
@@ -351,6 +351,9 @@ static int gfar_probe(struct of_device *ofdev,
         /* Reset MAC layer */
         gfar_write(&priv->regs->maccfg1, MACCFG1_SOFT_RESET);
 
+        /* We need to delay at least 3 TX clocks */
+        udelay(2);
+
         tempval = (MACCFG1_TX_FLOW | MACCFG1_RX_FLOW);
         gfar_write(&priv->regs->maccfg1, tempval);
 
diff --git a/drivers/net/gianfar.h b/drivers/net/gianfar.h
index b1a83344acc7..eaa86897f5c3 100644
--- a/drivers/net/gianfar.h
+++ b/drivers/net/gianfar.h
@@ -312,7 +312,7 @@ extern const char gfar_driver_version[];
 #define ATTRELI_EI(x) (x)
 
 #define BD_LFLAG(flags) ((flags) << 16)
-#define BD_LENGTH_MASK          0x00ff
+#define BD_LENGTH_MASK          0x0000ffff
 
 /* TxBD status field bits */
 #define TXBD_READY              0x8000
diff --git a/drivers/net/wireless/iwlwifi/iwl-agn.c b/drivers/net/wireless/iwlwifi/iwl-agn.c
index b35c8813bef4..c01ea48da5fe 100644
--- a/drivers/net/wireless/iwlwifi/iwl-agn.c
+++ b/drivers/net/wireless/iwlwifi/iwl-agn.c
@@ -4042,6 +4042,7 @@ static int iwl_pci_suspend(struct pci_dev *pdev, pm_message_t state)
                 priv->is_open = 1;
         }
 
+        pci_save_state(pdev);
         pci_set_power_state(pdev, PCI_D3hot);
 
         return 0;
@@ -4052,6 +4053,7 @@ static int iwl_pci_resume(struct pci_dev *pdev)
         struct iwl_priv *priv = pci_get_drvdata(pdev);
 
         pci_set_power_state(pdev, PCI_D0);
+        pci_restore_state(pdev);
 
         if (priv->is_open)
                 iwl_mac_start(priv->hw);
diff --git a/drivers/net/wireless/iwlwifi/iwl-sta.c b/drivers/net/wireless/iwlwifi/iwl-sta.c
index 412f66bac1af..70a8b21ca39b 100644
--- a/drivers/net/wireless/iwlwifi/iwl-sta.c
+++ b/drivers/net/wireless/iwlwifi/iwl-sta.c
@@ -480,6 +480,9 @@ void iwl_clear_stations_table(struct iwl_priv *priv)
         priv->num_stations = 0;
         memset(priv->stations, 0, sizeof(priv->stations));
 
+        /* clean ucode key table bit map */
+        priv->ucode_key_table = 0;
+
         spin_unlock_irqrestore(&priv->sta_lock, flags);
 }
 EXPORT_SYMBOL(iwl_clear_stations_table);
diff --git a/drivers/net/wireless/iwlwifi/iwl3945-base.c b/drivers/net/wireless/iwlwifi/iwl3945-base.c
index 95d01984c80e..5b44d322b99f 100644
--- a/drivers/net/wireless/iwlwifi/iwl3945-base.c
+++ b/drivers/net/wireless/iwlwifi/iwl3945-base.c
@@ -8143,6 +8143,7 @@ static int iwl3945_pci_suspend(struct pci_dev *pdev, pm_message_t state)
                 priv->is_open = 1;
         }
 
+        pci_save_state(pdev);
         pci_set_power_state(pdev, PCI_D3hot);
 
         return 0;
@@ -8153,6 +8154,7 @@ static int iwl3945_pci_resume(struct pci_dev *pdev)
         struct iwl3945_priv *priv = pci_get_drvdata(pdev);
 
         pci_set_power_state(pdev, PCI_D0);
+        pci_restore_state(pdev);
 
         if (priv->is_open)
                 iwl3945_mac_start(priv->hw);
diff --git a/drivers/pci/pci-driver.c b/drivers/pci/pci-driver.c
index ab1d615425a8..93eac1423585 100644
--- a/drivers/pci/pci-driver.c
+++ b/drivers/pci/pci-driver.c
@@ -355,6 +355,8 @@ static int pci_legacy_suspend(struct device *dev, pm_message_t state)
         int i = 0;
 
         if (drv && drv->suspend) {
+                pci_power_t prev = pci_dev->current_state;
+
                 pci_dev->state_saved = false;
 
                 i = drv->suspend(pci_dev, state);
@@ -365,12 +367,16 @@ static int pci_legacy_suspend(struct device *dev, pm_message_t state)
                 if (pci_dev->state_saved)
                         goto Fixup;
 
-                if (WARN_ON_ONCE(pci_dev->current_state != PCI_D0))
+                if (pci_dev->current_state != PCI_D0
+                    && pci_dev->current_state != PCI_UNKNOWN) {
+                        WARN_ONCE(pci_dev->current_state != prev,
+                                "PCI PM: Device state not saved by %pF\n",
+                                drv->suspend);
                         goto Fixup;
+                }
         }
 
         pci_save_state(pci_dev);
-        pci_dev->state_saved = true;
         /*
          * This is for compatibility with existing code with legacy PM support.
          */
@@ -424,35 +430,20 @@ static void pci_pm_default_resume_noirq(struct pci_dev *pci_dev)
         pci_fixup_device(pci_fixup_resume_early, pci_dev);
 }
 
-static int pci_pm_default_resume(struct pci_dev *pci_dev)
+static void pci_pm_default_resume(struct pci_dev *pci_dev)
 {
         pci_fixup_device(pci_fixup_resume, pci_dev);
 
         if (!pci_is_bridge(pci_dev))
                 pci_enable_wake(pci_dev, PCI_D0, false);
-
-        return pci_pm_reenable_device(pci_dev);
-}
-
-static void pci_pm_default_suspend_generic(struct pci_dev *pci_dev)
-{
-        /* If device is enabled at this point, disable it */
-        pci_disable_enabled_device(pci_dev);
-        /*
-         * Save state with interrupts enabled, because in principle the bus the
-         * device is on may be put into a low power state after this code runs.
-         */
-        pci_save_state(pci_dev);
 }
 
 static void pci_pm_default_suspend(struct pci_dev *pci_dev)
 {
-        pci_pm_default_suspend_generic(pci_dev);
-
+        /* Disable non-bridge devices without PM support */
         if (!pci_is_bridge(pci_dev))
-                pci_prepare_to_sleep(pci_dev);
-
-        pci_fixup_device(pci_fixup_suspend, pci_dev);
+                pci_disable_enabled_device(pci_dev);
+        pci_save_state(pci_dev);
 }
 
 static bool pci_has_legacy_pm_support(struct pci_dev *pci_dev)
@@ -497,21 +488,49 @@ static void pci_pm_complete(struct device *dev)
 static int pci_pm_suspend(struct device *dev)
 {
         struct pci_dev *pci_dev = to_pci_dev(dev);
-        struct device_driver *drv = dev->driver;
-        int error = 0;
+        struct dev_pm_ops *pm = dev->driver ? dev->driver->pm : NULL;
 
         if (pci_has_legacy_pm_support(pci_dev))
                 return pci_legacy_suspend(dev, PMSG_SUSPEND);
 
-        if (drv && drv->pm && drv->pm->suspend) {
-                error = drv->pm->suspend(dev);
-                suspend_report_result(drv->pm->suspend, error);
+        if (!pm) {
+                pci_pm_default_suspend(pci_dev);
+                goto Fixup;
         }
 
-        if (!error)
-                pci_pm_default_suspend(pci_dev);
+        pci_dev->state_saved = false;
 
-        return error;
+        if (pm->suspend) {
+                pci_power_t prev = pci_dev->current_state;
+                int error;
+
+                error = pm->suspend(dev);
+                suspend_report_result(pm->suspend, error);
+                if (error)
+                        return error;
+
+                if (pci_dev->state_saved)
+                        goto Fixup;
+
+                if (pci_dev->current_state != PCI_D0
+                    && pci_dev->current_state != PCI_UNKNOWN) {
+                        WARN_ONCE(pci_dev->current_state != prev,
+                                "PCI PM: State of device not saved by %pF\n",
+                                pm->suspend);
+                        goto Fixup;
+                }
+        }
+
+        if (!pci_dev->state_saved) {
+                pci_save_state(pci_dev);
+                if (!pci_is_bridge(pci_dev))
+                        pci_prepare_to_sleep(pci_dev);
+        }
+
+ Fixup:
+        pci_fixup_device(pci_fixup_suspend, pci_dev);
+
+        return 0;
 }
 
 static int pci_pm_suspend_noirq(struct device *dev)
@@ -554,7 +573,7 @@ static int pci_pm_resume_noirq(struct device *dev)
 static int pci_pm_resume(struct device *dev)
 {
         struct pci_dev *pci_dev = to_pci_dev(dev);
-        struct device_driver *drv = dev->driver;
+        struct dev_pm_ops *pm = dev->driver ? dev->driver->pm : NULL;
         int error = 0;
 
         /*
@@ -567,12 +586,16 @@ static int pci_pm_resume(struct device *dev)
         if (pci_has_legacy_pm_support(pci_dev))
                 return pci_legacy_resume(dev);
 
-        error = pci_pm_default_resume(pci_dev);
+        pci_pm_default_resume(pci_dev);
 
-        if (!error && drv && drv->pm && drv->pm->resume)
-                error = drv->pm->resume(dev);
+        if (pm) {
+                if (pm->resume)
+                        error = pm->resume(dev);
+        } else {
+                pci_pm_reenable_device(pci_dev);
+        }
 
-        return error;
+        return 0;
 }
 
 #else /* !CONFIG_SUSPEND */
@@ -589,21 +612,31 @@ static int pci_pm_resume(struct device *dev)
 static int pci_pm_freeze(struct device *dev)
 {
         struct pci_dev *pci_dev = to_pci_dev(dev);
-        struct device_driver *drv = dev->driver;
-        int error = 0;
+        struct dev_pm_ops *pm = dev->driver ? dev->driver->pm : NULL;
 
         if (pci_has_legacy_pm_support(pci_dev))
                 return pci_legacy_suspend(dev, PMSG_FREEZE);
 
-        if (drv && drv->pm && drv->pm->freeze) {
-                error = drv->pm->freeze(dev);
-                suspend_report_result(drv->pm->freeze, error);
+        if (!pm) {
+                pci_pm_default_suspend(pci_dev);
+                return 0;
         }
 
-        if (!error)
-                pci_pm_default_suspend_generic(pci_dev);
+        pci_dev->state_saved = false;
 
-        return error;
+        if (pm->freeze) {
+                int error;
+
+                error = pm->freeze(dev);
+                suspend_report_result(pm->freeze, error);
+                if (error)
+                        return error;
+        }
+
+        if (!pci_dev->state_saved)
+                pci_save_state(pci_dev);
+
+        return 0;
 }
 
 static int pci_pm_freeze_noirq(struct device *dev)
@@ -646,16 +679,18 @@ static int pci_pm_thaw_noirq(struct device *dev)
 static int pci_pm_thaw(struct device *dev)
 {
         struct pci_dev *pci_dev = to_pci_dev(dev);
-        struct device_driver *drv = dev->driver;
+        struct dev_pm_ops *pm = dev->driver ? dev->driver->pm : NULL;
         int error = 0;
 
         if (pci_has_legacy_pm_support(pci_dev))
                 return pci_legacy_resume(dev);
 
-        pci_pm_reenable_device(pci_dev);
-
-        if (drv && drv->pm && drv->pm->thaw)
-                error =  drv->pm->thaw(dev);
+        if (pm) {
+                if (pm->thaw)
+                        error = pm->thaw(dev);
+        } else {
+                pci_pm_reenable_device(pci_dev);
+        }
 
         return error;
 }
@@ -663,22 +698,29 @@ static int pci_pm_thaw(struct device *dev)
 static int pci_pm_poweroff(struct device *dev)
 {
         struct pci_dev *pci_dev = to_pci_dev(dev);
-        struct device_driver *drv = dev->driver;
+        struct dev_pm_ops *pm = dev->driver ? dev->driver->pm : NULL;
         int error = 0;
 
         if (pci_has_legacy_pm_support(pci_dev))
                 return pci_legacy_suspend(dev, PMSG_HIBERNATE);
 
-        if (!drv || !drv->pm)
-                return 0;
+        if (!pm) {
+                pci_pm_default_suspend(pci_dev);
+                goto Fixup;
+        }
+
+        pci_dev->state_saved = false;
 
-        if (drv->pm->poweroff) {
-                error = drv->pm->poweroff(dev);
-                suspend_report_result(drv->pm->poweroff, error);
+        if (pm->poweroff) {
+                error = pm->poweroff(dev);
+                suspend_report_result(pm->poweroff, error);
         }
 
-        if (!error)
-                pci_pm_default_suspend(pci_dev);
+        if (!pci_dev->state_saved && !pci_is_bridge(pci_dev))
+                pci_prepare_to_sleep(pci_dev);
+
+ Fixup:
+        pci_fixup_device(pci_fixup_suspend, pci_dev);
 
         return error;
 }
@@ -719,7 +761,7 @@ static int pci_pm_restore_noirq(struct device *dev)
 static int pci_pm_restore(struct device *dev)
 {
         struct pci_dev *pci_dev = to_pci_dev(dev);
-        struct device_driver *drv = dev->driver;
+        struct dev_pm_ops *pm = dev->driver ? dev->driver->pm : NULL;
         int error = 0;
 
         /*
@@ -732,10 +774,14 @@ static int pci_pm_restore(struct device *dev)
         if (pci_has_legacy_pm_support(pci_dev))
                 return pci_legacy_resume(dev);
 
-        error = pci_pm_default_resume(pci_dev);
+        pci_pm_default_resume(pci_dev);
 
-        if (!error && drv && drv->pm && drv->pm->restore)
-                error = drv->pm->restore(dev);
+        if (pm) {
+                if (pm->restore)
+                        error = pm->restore(dev);
+        } else {
+                pci_pm_reenable_device(pci_dev);
+        }
 
         return error;
 }
diff --git a/drivers/pci/pci-sysfs.c b/drivers/pci/pci-sysfs.c
index db7ec14fa719..dfc4e0ddf241 100644
--- a/drivers/pci/pci-sysfs.c
+++ b/drivers/pci/pci-sysfs.c
@@ -768,8 +768,8 @@ pci_read_rom(struct kobject *kobj, struct bin_attribute *bin_attr,
                 return -EINVAL;
         
         rom = pci_map_rom(pdev, &size); /* size starts out as PCI window size */
-        if (!rom)
-                return 0;
+        if (!rom || !size)
+                return -EIO;
                 
         if (off >= size)
                 count = 0;
diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c
index 48807556b47a..e3efe6b19ee7 100644
--- a/drivers/pci/pci.c
+++ b/drivers/pci/pci.c
@@ -1418,10 +1418,10 @@ int pci_restore_standard_config(struct pci_dev *dev)
                 break;
         }
 
-        dev->current_state = PCI_D0;
+        pci_update_current_state(dev, PCI_D0);
 
  Restore:
-        return pci_restore_state(dev);
+        return dev->state_saved ? pci_restore_state(dev) : 0;
 }
 
 /**
diff --git a/drivers/pci/pcie/aspm.c b/drivers/pci/pcie/aspm.c
index 586b6f75910d..b0367f168af4 100644
--- a/drivers/pci/pcie/aspm.c
+++ b/drivers/pci/pcie/aspm.c
@@ -718,9 +718,9 @@ void pcie_aspm_exit_link_state(struct pci_dev *pdev)
 
         /*
          * All PCIe functions are in one slot, remove one function will remove
-         * the the whole slot, so just wait
+         * the whole slot, so just wait until we are the last function left.
          */
-        if (!list_empty(&parent->subordinate->devices))
+        if (!list_is_last(&pdev->bus_list, &parent->subordinate->devices))
                 goto out;
 
         /* All functions are removed, so just disable ASPM for the link */
diff --git a/drivers/pci/pcie/portdrv_pci.c b/drivers/pci/pcie/portdrv_pci.c
index 99a914a027f8..f9b874eaeb9f 100644
--- a/drivers/pci/pcie/portdrv_pci.c
+++ b/drivers/pci/pcie/portdrv_pci.c
@@ -55,25 +55,13 @@ static int pcie_portdrv_suspend(struct pci_dev *dev, pm_message_t state)
 
 }
 
-static int pcie_portdrv_suspend_late(struct pci_dev *dev, pm_message_t state)
-{
-        return pci_save_state(dev);
-}
-
-static int pcie_portdrv_resume_early(struct pci_dev *dev)
-{
-        return pci_restore_state(dev);
-}
-
 static int pcie_portdrv_resume(struct pci_dev *dev)
 {
-        pcie_portdrv_restore_config(dev);
+        pci_set_master(dev);
         return pcie_port_device_resume(dev);
 }
 #else
 #define pcie_portdrv_suspend NULL
-#define pcie_portdrv_suspend_late NULL
-#define pcie_portdrv_resume_early NULL
 #define pcie_portdrv_resume NULL
 #endif
 
@@ -292,8 +280,6 @@ static struct pci_driver pcie_portdriver = {
         .remove         = pcie_portdrv_remove,
 
         .suspend        = pcie_portdrv_suspend,
-        .suspend_late   = pcie_portdrv_suspend_late,
-        .resume_early   = pcie_portdrv_resume_early,
         .resume         = pcie_portdrv_resume,
 
         .err_handler    = &pcie_portdrv_err_handler,
diff --git a/drivers/pci/rom.c b/drivers/pci/rom.c
index 132a78159b60..29cbe47f219f 100644
--- a/drivers/pci/rom.c
+++ b/drivers/pci/rom.c
@@ -63,7 +63,7 @@ void pci_disable_rom(struct pci_dev *pdev)
  * The PCI window size could be much larger than the
  * actual image size.
  */
-size_t pci_get_rom_size(void __iomem *rom, size_t size)
+size_t pci_get_rom_size(struct pci_dev *pdev, void __iomem *rom, size_t size)
 {
         void __iomem *image;
         int last_image;
@@ -72,8 +72,10 @@ size_t pci_get_rom_size(void __iomem *rom, size_t size)
         do {
                 void __iomem *pds;
                 /* Standard PCI ROMs start out with these bytes 55 AA */
-                if (readb(image) != 0x55)
+                if (readb(image) != 0x55) {
+                        dev_err(&pdev->dev, "Invalid ROM contents\n");
                         break;
+                }
                 if (readb(image + 1) != 0xAA)
                         break;
                 /* get the PCI data structure and check its signature */
@@ -159,7 +161,7 @@ void __iomem *pci_map_rom(struct pci_dev *pdev, size_t *size)
          * size is much larger than the actual size of the ROM.
          * True size is important if the ROM is going to be copied.
          */
-        *size = pci_get_rom_size(rom, *size);
+        *size = pci_get_rom_size(pdev, rom, *size);
         return rom;
 }
 
diff --git a/drivers/platform/x86/Kconfig b/drivers/platform/x86/Kconfig
index 1a266d4ab5f1..94363115a42a 100644
--- a/drivers/platform/x86/Kconfig
+++ b/drivers/platform/x86/Kconfig
@@ -42,6 +42,7 @@ config ASUS_LAPTOP
         depends on LEDS_CLASS
         depends on NEW_LEDS
         depends on BACKLIGHT_CLASS_DEVICE
+        depends on INPUT
         ---help---
           This is the new Linux driver for Asus laptops. It may also support some
           MEDION, JVC or VICTOR laptops. It makes all the extra buttons generate
diff --git a/drivers/platform/x86/asus-laptop.c b/drivers/platform/x86/asus-laptop.c
index 8fb8b3591048..56af6cf385b0 100644
--- a/drivers/platform/x86/asus-laptop.c
+++ b/drivers/platform/x86/asus-laptop.c
@@ -46,6 +46,7 @@
 #include <acpi/acpi_drivers.h>
 #include <acpi/acpi_bus.h>
 #include <asm/uaccess.h>
+#include <linux/input.h>
 
 #define ASUS_LAPTOP_VERSION "0.42"
 
@@ -181,6 +182,8 @@ struct asus_hotk {
         u8 light_level;         //light sensor level
         u8 light_switch;        //light sensor switch value
         u16 event_count[128];   //count for each event TODO make this better
+        struct input_dev *inputdev;
+        u16 *keycode_map;
 };
 
 /*
@@ -250,6 +253,37 @@ ASUS_LED(rled, "record");
 ASUS_LED(pled, "phone");
 ASUS_LED(gled, "gaming");
 
+struct key_entry {
+        char type;
+        u8 code;
+        u16 keycode;
+};
+
+enum { KE_KEY, KE_END };
+
+static struct key_entry asus_keymap[] = {
+        {KE_KEY, 0x30, KEY_VOLUMEUP},
+        {KE_KEY, 0x31, KEY_VOLUMEDOWN},
+        {KE_KEY, 0x32, KEY_MUTE},
+        {KE_KEY, 0x33, KEY_SWITCHVIDEOMODE},
+        {KE_KEY, 0x34, KEY_SWITCHVIDEOMODE},
+        {KE_KEY, 0x40, KEY_PREVIOUSSONG},
+        {KE_KEY, 0x41, KEY_NEXTSONG},
+        {KE_KEY, 0x43, KEY_STOP},
+        {KE_KEY, 0x45, KEY_PLAYPAUSE},
+        {KE_KEY, 0x50, KEY_EMAIL},
+        {KE_KEY, 0x51, KEY_WWW},
+        {KE_KEY, 0x5C, BTN_EXTRA},  /* Performance */
+        {KE_KEY, 0x5D, KEY_WLAN},
+        {KE_KEY, 0x61, KEY_SWITCHVIDEOMODE},
+        {KE_KEY, 0x6B, BTN_TOUCH}, /* Lock Mouse */
+        {KE_KEY, 0x82, KEY_CAMERA},
+        {KE_KEY, 0x8A, KEY_TV},
+        {KE_KEY, 0x95, KEY_MEDIA},
+        {KE_KEY, 0x99, KEY_PHONE},
+        {KE_END, 0},
+};
+
 /*
  * This function evaluates an ACPI method, given an int as parameter, the
  * method is searched within the scope of the handle, can be NULL. The output
@@ -720,8 +754,68 @@ static ssize_t store_gps(struct device *dev, struct device_attribute *attr,
         return store_status(buf, count, NULL, GPS_ON);
 }
 
+/*
+ * Hotkey functions
+ */
+static struct key_entry *asus_get_entry_by_scancode(int code)
+{
+        struct key_entry *key;
+
+        for (key = asus_keymap; key->type != KE_END; key++)
+                if (code == key->code)
+                        return key;
+
+        return NULL;
+}
+
+static struct key_entry *asus_get_entry_by_keycode(int code)
+{
+        struct key_entry *key;
+
+        for (key = asus_keymap; key->type != KE_END; key++)
+                if (code == key->keycode && key->type == KE_KEY)
+                        return key;
+
+        return NULL;
+}
+
+static int asus_getkeycode(struct input_dev *dev, int scancode, int *keycode)
+{
+        struct key_entry *key = asus_get_entry_by_scancode(scancode);
+
+        if (key && key->type == KE_KEY) {
+                *keycode = key->keycode;
+                return 0;
+        }
+
+        return -EINVAL;
+}
+
+static int asus_setkeycode(struct input_dev *dev, int scancode, int keycode)
+{
+        struct key_entry *key;
+        int old_keycode;
+
+        if (keycode < 0 || keycode > KEY_MAX)
+                return -EINVAL;
+
+        key = asus_get_entry_by_scancode(scancode);
+        if (key && key->type == KE_KEY) {
+                old_keycode = key->keycode;
+                key->keycode = keycode;
+                set_bit(keycode, dev->keybit);
+                if (!asus_get_entry_by_keycode(old_keycode))
+                        clear_bit(old_keycode, dev->keybit);
+                return 0;
+        }
+
+        return -EINVAL;
+}
+
 static void asus_hotk_notify(acpi_handle handle, u32 event, void *data)
 {
+        static struct key_entry *key;
+
         /* TODO Find a better way to handle events count. */
         if (!hotk)
                 return;
@@ -738,10 +832,24 @@ static void asus_hotk_notify(acpi_handle handle, u32 event, void *data)
                 lcd_blank(FB_BLANK_POWERDOWN);
         }
 
-        acpi_bus_generate_proc_event(hotk->device, event,
-                                hotk->event_count[event % 128]++);
-
-        return;
+        acpi_bus_generate_netlink_event(hotk->device->pnp.device_class,
+                                        dev_name(&hotk->device->dev), event,
+                                        hotk->event_count[event % 128]++);
+
+        if (hotk->inputdev) {
+                key = asus_get_entry_by_scancode(event);
+                if (!key)
+                        return ;
+
+                switch (key->type) {
+                case KE_KEY:
+                        input_report_key(hotk->inputdev, key->keycode, 1);
+                        input_sync(hotk->inputdev);
+                        input_report_key(hotk->inputdev, key->keycode, 0);
+                        input_sync(hotk->inputdev);
+                        break;
+                }
+        }
 }
 
 #define ASUS_CREATE_DEVICE_ATTR(_name)                                  \
@@ -959,6 +1067,38 @@ static int asus_hotk_get_info(void)
         return AE_OK;
 }
 
+static int asus_input_init(void)
+{
+        const struct key_entry *key;
+        int result;
+
+        hotk->inputdev = input_allocate_device();
+        if (!hotk->inputdev) {
+                printk(ASUS_INFO "Unable to allocate input device\n");
+                return 0;
+        }
+        hotk->inputdev->name = "Asus Laptop extra buttons";
+        hotk->inputdev->phys = ASUS_HOTK_FILE "/input0";
+        hotk->inputdev->id.bustype = BUS_HOST;
+        hotk->inputdev->getkeycode = asus_getkeycode;
+        hotk->inputdev->setkeycode = asus_setkeycode;
+
+        for (key = asus_keymap; key->type != KE_END; key++) {
+                switch (key->type) {
+                case KE_KEY:
+                        set_bit(EV_KEY, hotk->inputdev->evbit);
+                        set_bit(key->keycode, hotk->inputdev->keybit);
+                        break;
+                }
+        }
+        result = input_register_device(hotk->inputdev);
+        if (result) {
+                printk(ASUS_INFO "Unable to register input device\n");
+                input_free_device(hotk->inputdev);
+        }
+        return result;
+}
+
 static int asus_hotk_check(void)
 {
         int result = 0;
@@ -1044,7 +1184,7 @@ static int asus_hotk_add(struct acpi_device *device)
         /* GPS is on by default */
         write_status(NULL, 1, GPS_ON);
 
-      end:
+end:
         if (result) {
                 kfree(hotk->name);
                 kfree(hotk);
@@ -1091,10 +1231,17 @@ static void asus_led_exit(void)
         ASUS_LED_UNREGISTER(gled);
 }
 
+static void asus_input_exit(void)
+{
+        if (hotk->inputdev)
+                input_unregister_device(hotk->inputdev);
+}
+
 static void __exit asus_laptop_exit(void)
 {
         asus_backlight_exit();
         asus_led_exit();
+        asus_input_exit();
 
         acpi_bus_unregister_driver(&asus_hotk_driver);
         sysfs_remove_group(&asuspf_device->dev.kobj, &asuspf_attribute_group);
@@ -1216,6 +1363,10 @@ static int __init asus_laptop_init(void)
                 printk(ASUS_INFO "Brightness ignored, must be controlled by "
                        "ACPI video driver\n");
 
+        result = asus_input_init();
+        if (result)
+                goto fail_input;
+
         result = asus_led_init(dev);
         if (result)
                 goto fail_led;
@@ -1242,22 +1393,25 @@ static int __init asus_laptop_init(void)
 
         return 0;
 
-      fail_sysfs:
+fail_sysfs:
         platform_device_del(asuspf_device);
 
-      fail_platform_device2:
+fail_platform_device2:
         platform_device_put(asuspf_device);
 
-      fail_platform_device1:
+fail_platform_device1:
         platform_driver_unregister(&asuspf_driver);
 
-      fail_platform_driver:
+fail_platform_driver:
         asus_led_exit();
 
-      fail_led:
+fail_led:
+        asus_input_exit();
+
+fail_input:
         asus_backlight_exit();
 
-      fail_backlight:
+fail_backlight:
 
         return result;
 }
diff --git a/drivers/platform/x86/asus_acpi.c b/drivers/platform/x86/asus_acpi.c
index 1e74988c7b2d..d63f26e666a4 100644
--- a/drivers/platform/x86/asus_acpi.c
+++ b/drivers/platform/x86/asus_acpi.c
@@ -143,6 +143,7 @@ struct asus_hotk {
                                                          S1300N, S5200N*/
                 A4S,            /* Z81sp */
                 F3Sa,           /* (Centrino) */
+                R1F,
                 END_MODEL
         } model;                /* Models currently supported */
         u16 event_count[128];   /* Count for each event TODO make this better */
@@ -420,7 +421,18 @@ static struct model_data model_conf[END_MODEL] = {
                 .display_get    = "\\ADVG",
                 .display_set    = "SDSP",
         },
-
+        {
+                .name = "R1F",
+                .mt_bt_switch = "BLED",
+                .mt_mled = "MLED",
+                .mt_wled = "WLED",
+                .mt_lcd_switch = "\\Q10",
+                .lcd_status = "\\GP06",
+                .brightness_set = "SPLV",
+                .brightness_get = "GPLV",
+                .display_set = "SDSP",
+                .display_get = "\\INFB"
+        }
 };
 
 /* procdir we use */
@@ -1165,6 +1177,8 @@ static int asus_model_match(char *model)
                 return W3V;
         else if (strncmp(model, "W5A", 3) == 0)
                 return W5A;
+        else if (strncmp(model, "R1F", 3) == 0)
+                return R1F;
         else if (strncmp(model, "A4S", 3) == 0)
                 return A4S;
         else if (strncmp(model, "F3Sa", 4) == 0)
diff --git a/drivers/platform/x86/eeepc-laptop.c b/drivers/platform/x86/eeepc-laptop.c
index 9d93cb971e59..786ed8661cb0 100644
--- a/drivers/platform/x86/eeepc-laptop.c
+++ b/drivers/platform/x86/eeepc-laptop.c
@@ -30,6 +30,7 @@
 #include <linux/uaccess.h>
 #include <linux/input.h>
 #include <linux/rfkill.h>
+#include <linux/pci.h>
 
 #define EEEPC_LAPTOP_VERSION    "0.1"
 
@@ -161,6 +162,10 @@ static struct key_entry eeepc_keymap[] = {
         {KE_KEY, 0x13, KEY_MUTE },
         {KE_KEY, 0x14, KEY_VOLUMEDOWN },
         {KE_KEY, 0x15, KEY_VOLUMEUP },
+        {KE_KEY, 0x1a, KEY_COFFEE },
+        {KE_KEY, 0x1b, KEY_ZOOM },
+        {KE_KEY, 0x1c, KEY_PROG2 },
+        {KE_KEY, 0x1d, KEY_PROG3 },
         {KE_KEY, 0x30, KEY_SWITCHVIDEOMODE },
         {KE_KEY, 0x31, KEY_SWITCHVIDEOMODE },
         {KE_KEY, 0x32, KEY_SWITCHVIDEOMODE },
@@ -510,7 +515,43 @@ static int eeepc_hotk_check(void)
 static void notify_brn(void)
 {
         struct backlight_device *bd = eeepc_backlight_device;
-        bd->props.brightness = read_brightness(bd);
+        if (bd)
+                bd->props.brightness = read_brightness(bd);
+}
+
+static void eeepc_rfkill_notify(acpi_handle handle, u32 event, void *data)
+{
+        struct pci_dev *dev;
+        struct pci_bus *bus = pci_find_bus(0, 1);
+
+        if (event != ACPI_NOTIFY_BUS_CHECK)
+                return;
+
+        if (!bus) {
+                printk(EEEPC_WARNING "Unable to find PCI bus 1?\n");
+                return;
+        }
+
+        if (get_acpi(CM_ASL_WLAN) == 1) {
+                dev = pci_get_slot(bus, 0);
+                if (dev) {
+                        /* Device already present */
+                        pci_dev_put(dev);
+                        return;
+                }
+                dev = pci_scan_single_device(bus, 0);
+                if (dev) {
+                        pci_bus_assign_resources(bus);
+                        if (pci_bus_add_device(dev))
+                                printk(EEEPC_ERR "Unable to hotplug wifi\n");
+                }
+        } else {
+                dev = pci_get_slot(bus, 0);
+                if (dev) {
+                        pci_remove_bus_device(dev);
+                        pci_dev_put(dev);
+                }
+        }
 }
 
 static void eeepc_hotk_notify(acpi_handle handle, u32 event, void *data)
@@ -520,8 +561,9 @@ static void eeepc_hotk_notify(acpi_handle handle, u32 event, void *data)
                 return;
         if (event >= NOTIFY_BRN_MIN && event <= NOTIFY_BRN_MAX)
                 notify_brn();
-        acpi_bus_generate_proc_event(ehotk->device, event,
-                                     ehotk->event_count[event % 128]++);
+        acpi_bus_generate_netlink_event(ehotk->device->pnp.device_class,
+                                        dev_name(&ehotk->device->dev), event,
+                                        ehotk->event_count[event % 128]++);
         if (ehotk->inputdev) {
                 key = eepc_get_entry_by_scancode(event);
                 if (key) {
@@ -539,6 +581,45 @@ static void eeepc_hotk_notify(acpi_handle handle, u32 event, void *data)
         }
 }
 
+static int eeepc_register_rfkill_notifier(char *node)
+{
+        acpi_status status = AE_OK;
+        acpi_handle handle;
+
+        status = acpi_get_handle(NULL, node, &handle);
+
+        if (ACPI_SUCCESS(status)) {
+                status = acpi_install_notify_handler(handle,
+                                                     ACPI_SYSTEM_NOTIFY,
+                                                     eeepc_rfkill_notify,
+                                                     NULL);
+                if (ACPI_FAILURE(status))
+                        printk(EEEPC_WARNING
+                               "Failed to register notify on %s\n", node);
+        } else
+                return -ENODEV;
+
+        return 0;
+}
+
+static void eeepc_unregister_rfkill_notifier(char *node)
+{
+        acpi_status status = AE_OK;
+        acpi_handle handle;
+
+        status = acpi_get_handle(NULL, node, &handle);
+
+        if (ACPI_SUCCESS(status)) {
+                status = acpi_remove_notify_handler(handle,
+                                                     ACPI_SYSTEM_NOTIFY,
+                                                     eeepc_rfkill_notify);
+                if (ACPI_FAILURE(status))
+                        printk(EEEPC_ERR
+                               "Error removing rfkill notify handler %s\n",
+                                node);
+        }
+}
+
 static int eeepc_hotk_add(struct acpi_device *device)
 {
         acpi_status status = AE_OK;
@@ -558,7 +639,7 @@ static int eeepc_hotk_add(struct acpi_device *device)
         ehotk->device = device;
         result = eeepc_hotk_check();
         if (result)
-                goto end;
+                goto ehotk_fail;
         status = acpi_install_notify_handler(ehotk->handle, ACPI_SYSTEM_NOTIFY,
                                              eeepc_hotk_notify, ehotk);
         if (ACPI_FAILURE(status))
@@ -569,18 +650,25 @@ static int eeepc_hotk_add(struct acpi_device *device)
                                                            RFKILL_TYPE_WLAN);
 
                 if (!ehotk->eeepc_wlan_rfkill)
-                        goto end;
+                        goto wlan_fail;
 
                 ehotk->eeepc_wlan_rfkill->name = "eeepc-wlan";
                 ehotk->eeepc_wlan_rfkill->toggle_radio = eeepc_wlan_rfkill_set;
                 ehotk->eeepc_wlan_rfkill->get_state = eeepc_wlan_rfkill_state;
-                if (get_acpi(CM_ASL_WLAN) == 1)
+                if (get_acpi(CM_ASL_WLAN) == 1) {
                         ehotk->eeepc_wlan_rfkill->state =
                                 RFKILL_STATE_UNBLOCKED;
-                else
+                        rfkill_set_default(RFKILL_TYPE_WLAN,
+                                           RFKILL_STATE_UNBLOCKED);
+                } else {
                         ehotk->eeepc_wlan_rfkill->state =
                                 RFKILL_STATE_SOFT_BLOCKED;
-                rfkill_register(ehotk->eeepc_wlan_rfkill);
+                        rfkill_set_default(RFKILL_TYPE_WLAN,
+                                           RFKILL_STATE_SOFT_BLOCKED);
+                }
+                result = rfkill_register(ehotk->eeepc_wlan_rfkill);
+                if (result)
+                        goto wlan_fail;
         }
 
         if (get_acpi(CM_ASL_BLUETOOTH) != -1) {
@@ -588,27 +676,47 @@ static int eeepc_hotk_add(struct acpi_device *device)
                         rfkill_allocate(&device->dev, RFKILL_TYPE_BLUETOOTH);
 
                 if (!ehotk->eeepc_bluetooth_rfkill)
-                        goto end;
+                        goto bluetooth_fail;
 
                 ehotk->eeepc_bluetooth_rfkill->name = "eeepc-bluetooth";
                 ehotk->eeepc_bluetooth_rfkill->toggle_radio =
                         eeepc_bluetooth_rfkill_set;
                 ehotk->eeepc_bluetooth_rfkill->get_state =
                         eeepc_bluetooth_rfkill_state;
-                if (get_acpi(CM_ASL_BLUETOOTH) == 1)
+                if (get_acpi(CM_ASL_BLUETOOTH) == 1) {
                         ehotk->eeepc_bluetooth_rfkill->state =
                                 RFKILL_STATE_UNBLOCKED;
-                else
+                        rfkill_set_default(RFKILL_TYPE_BLUETOOTH,
+                                           RFKILL_STATE_UNBLOCKED);
+                } else {
                         ehotk->eeepc_bluetooth_rfkill->state =
                                 RFKILL_STATE_SOFT_BLOCKED;
-                rfkill_register(ehotk->eeepc_bluetooth_rfkill);
-        }
+                        rfkill_set_default(RFKILL_TYPE_BLUETOOTH,
+                                           RFKILL_STATE_SOFT_BLOCKED);
+                }
 
- end:
-        if (result) {
-                kfree(ehotk);
-                ehotk = NULL;
+                result = rfkill_register(ehotk->eeepc_bluetooth_rfkill);
+                if (result)
+                        goto bluetooth_fail;
         }
+
+        eeepc_register_rfkill_notifier("\\_SB.PCI0.P0P6");
+        eeepc_register_rfkill_notifier("\\_SB.PCI0.P0P7");
+
+        return 0;
+
+ bluetooth_fail:
+        if (ehotk->eeepc_bluetooth_rfkill)
+                rfkill_free(ehotk->eeepc_bluetooth_rfkill);
+        rfkill_unregister(ehotk->eeepc_wlan_rfkill);
+        ehotk->eeepc_wlan_rfkill = NULL;
+ wlan_fail:
+        if (ehotk->eeepc_wlan_rfkill)
+                rfkill_free(ehotk->eeepc_wlan_rfkill);
+ ehotk_fail:
+        kfree(ehotk);
+        ehotk = NULL;
+
         return result;
 }
 
@@ -622,6 +730,10 @@ static int eeepc_hotk_remove(struct acpi_device *device, int type)
                                             eeepc_hotk_notify);
         if (ACPI_FAILURE(status))
                 printk(EEEPC_ERR "Error removing notify handler\n");
+
+        eeepc_unregister_rfkill_notifier("\\_SB.PCI0.P0P6");
+        eeepc_unregister_rfkill_notifier("\\_SB.PCI0.P0P7");
+
         kfree(ehotk);
         return 0;
 }
@@ -737,13 +849,21 @@ static void eeepc_backlight_exit(void)
 {
         if (eeepc_backlight_device)
                 backlight_device_unregister(eeepc_backlight_device);
-        if (ehotk->inputdev)
-                input_unregister_device(ehotk->inputdev);
+        eeepc_backlight_device = NULL;
+}
+
+static void eeepc_rfkill_exit(void)
+{
         if (ehotk->eeepc_wlan_rfkill)
                 rfkill_unregister(ehotk->eeepc_wlan_rfkill);
         if (ehotk->eeepc_bluetooth_rfkill)
                 rfkill_unregister(ehotk->eeepc_bluetooth_rfkill);
-        eeepc_backlight_device = NULL;
+}
+
+static void eeepc_input_exit(void)
+{
+        if (ehotk->inputdev)
+                input_unregister_device(ehotk->inputdev);
 }
 
 static void eeepc_hwmon_exit(void)
@@ -762,6 +882,8 @@ static void eeepc_hwmon_exit(void)
 static void __exit eeepc_laptop_exit(void)
 {
         eeepc_backlight_exit();
+        eeepc_rfkill_exit();
+        eeepc_input_exit();
         eeepc_hwmon_exit();
         acpi_bus_unregister_driver(&eeepc_hotk_driver);
         sysfs_remove_group(&platform_device->dev.kobj,
@@ -865,6 +987,8 @@ fail_platform_driver:
 fail_hwmon:
         eeepc_backlight_exit();
 fail_backlight:
+        eeepc_input_exit();
+        eeepc_rfkill_exit();
         return result;
 }
 
diff --git a/drivers/platform/x86/hp-wmi.c b/drivers/platform/x86/hp-wmi.c
index de91ddab0a86..f41135f2fb29 100644
--- a/drivers/platform/x86/hp-wmi.c
+++ b/drivers/platform/x86/hp-wmi.c
@@ -463,9 +463,11 @@ static int __init hp_wmi_bios_setup(struct platform_device *device)
 
         return 0;
 register_wwan_err:
-        rfkill_unregister(bluetooth_rfkill);
+        if (bluetooth_rfkill)
+                rfkill_unregister(bluetooth_rfkill);
 register_bluetooth_error:
-        rfkill_unregister(wifi_rfkill);
+        if (wifi_rfkill)
+                rfkill_unregister(wifi_rfkill);
 add_sysfs_error:
         cleanup_sysfs(device);
         return err;
diff --git a/drivers/platform/x86/panasonic-laptop.c b/drivers/platform/x86/panasonic-laptop.c
index f30db367c82e..c47a44dcb702 100644
--- a/drivers/platform/x86/panasonic-laptop.c
+++ b/drivers/platform/x86/panasonic-laptop.c
@@ -507,7 +507,7 @@ static void acpi_pcc_generate_keyinput(struct pcc_acpi *pcc)
 
         hkey_num = result & 0xf;
 
-        if (hkey_num < 0 || hkey_num > ARRAY_SIZE(pcc->keymap)) {
+        if (hkey_num < 0 || hkey_num >= ARRAY_SIZE(pcc->keymap)) {
                 ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
                                   "hotkey number out of range: %d\n",
                                   hkey_num));
diff --git a/drivers/rtc/Kconfig b/drivers/rtc/Kconfig
index cced4d108319..81450fbd8b12 100644
--- a/drivers/rtc/Kconfig
+++ b/drivers/rtc/Kconfig
@@ -241,6 +241,12 @@ config RTC_DRV_M41T80_WDT
           If you say Y here you will get support for the
           watchdog timer in the ST M41T60 and M41T80 RTC chips series.
 
+config RTC_DRV_DM355EVM
+        tristate "TI DaVinci DM355 EVM RTC"
+        depends on MFD_DM355EVM_MSP
+        help
+          Supports the RTC firmware in the MSP430 on the DM355 EVM.
+
 config RTC_DRV_TWL92330
         boolean "TI TWL92330/Menelaus"
         depends on MENELAUS
diff --git a/drivers/rtc/Makefile b/drivers/rtc/Makefile
index 6e28021abb9d..0e697aa51caa 100644
--- a/drivers/rtc/Makefile
+++ b/drivers/rtc/Makefile
@@ -23,6 +23,7 @@ obj-$(CONFIG_RTC_DRV_AT91SAM9)	+= rtc-at91sam9.o
 obj-$(CONFIG_RTC_DRV_AU1XXX)    += rtc-au1xxx.o
 obj-$(CONFIG_RTC_DRV_BFIN)      += rtc-bfin.o
 obj-$(CONFIG_RTC_DRV_CMOS)      += rtc-cmos.o
+obj-$(CONFIG_RTC_DRV_DM355EVM)  += rtc-dm355evm.o
 obj-$(CONFIG_RTC_DRV_DS1216)    += rtc-ds1216.o
 obj-$(CONFIG_RTC_DRV_DS1286)    += rtc-ds1286.o
 obj-$(CONFIG_RTC_DRV_DS1302)    += rtc-ds1302.o
diff --git a/drivers/rtc/rtc-dm355evm.c b/drivers/rtc/rtc-dm355evm.c
new file mode 100644
index 000000000000..58d4e18530da
--- /dev/null
+++ b/drivers/rtc/rtc-dm355evm.c
@@ -0,0 +1,175 @@
+/*
+ * rtc-dm355evm.c - access battery-backed counter in MSP430 firmware
+ *
+ * Copyright (c) 2008 by David Brownell
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version
+ * 2 of the License, or (at your option) any later version.
+ */
+#include <linux/kernel.h>
+#include <linux/init.h>
+#include <linux/rtc.h>
+#include <linux/platform_device.h>
+
+#include <linux/i2c/dm355evm_msp.h>
+
+
+/*
+ * The MSP430 firmware on the DM355 EVM uses a watch crystal to feed
+ * a 1 Hz counter.  When a backup battery is supplied, that makes a
+ * reasonable RTC for applications where alarms and non-NTP drift
+ * compensation aren't important.
+ *
+ * The only real glitch is the inability to read or write all four
+ * counter bytes atomically:  the count may increment in the middle
+ * of an operation, causing trouble when the LSB rolls over.
+ *
+ * This driver was tested with firmware revision A4.
+ */
+union evm_time {
+        u8      bytes[4];
+        u32     value;
+};
+
+static int dm355evm_rtc_read_time(struct device *dev, struct rtc_time *tm)
+{
+        union evm_time  time;
+        int             status;
+        int             tries = 0;
+
+        do {
+                /*
+                 * Read LSB(0) to MSB(3) bytes.  Defend against the counter
+                 * rolling over by re-reading until the value is stable,
+                 * and assuming the four reads take at most a few seconds.
+                 */
+                status = dm355evm_msp_read(DM355EVM_MSP_RTC_0);
+                if (status < 0)
+                        return status;
+                if (tries && time.bytes[0] == status)
+                        break;
+                time.bytes[0] = status;
+
+                status = dm355evm_msp_read(DM355EVM_MSP_RTC_1);
+                if (status < 0)
+                        return status;
+                if (tries && time.bytes[1] == status)
+                        break;
+                time.bytes[1] = status;
+
+                status = dm355evm_msp_read(DM355EVM_MSP_RTC_2);
+                if (status < 0)
+                        return status;
+                if (tries && time.bytes[2] == status)
+                        break;
+                time.bytes[2] = status;
+
+                status = dm355evm_msp_read(DM355EVM_MSP_RTC_3);
+                if (status < 0)
+                        return status;
+                if (tries && time.bytes[3] == status)
+                        break;
+                time.bytes[3] = status;
+
+        } while (++tries < 5);
+
+        dev_dbg(dev, "read timestamp %08x\n", time.value);
+
+        rtc_time_to_tm(le32_to_cpu(time.value), tm);
+        return 0;
+}
+
+static int dm355evm_rtc_set_time(struct device *dev, struct rtc_time *tm)
+{
+        union evm_time  time;
+        unsigned long   value;
+        int             status;
+
+        rtc_tm_to_time(tm, &value);
+        time.value = cpu_to_le32(value);
+
+        dev_dbg(dev, "write timestamp %08x\n", time.value);
+
+        /*
+         * REVISIT handle non-atomic writes ... maybe just retry until
+         * byte[1] sticks (no rollover)?
+         */
+        status = dm355evm_msp_write(time.bytes[0], DM355EVM_MSP_RTC_0);
+        if (status < 0)
+                return status;
+
+        status = dm355evm_msp_write(time.bytes[1], DM355EVM_MSP_RTC_1);
+        if (status < 0)
+                return status;
+
+        status = dm355evm_msp_write(time.bytes[2], DM355EVM_MSP_RTC_2);
+        if (status < 0)
+                return status;
+
+        status = dm355evm_msp_write(time.bytes[3], DM355EVM_MSP_RTC_3);
+        if (status < 0)
+                return status;
+
+        return 0;
+}
+
+static struct rtc_class_ops dm355evm_rtc_ops = {
+        .read_time      = dm355evm_rtc_read_time,
+        .set_time       = dm355evm_rtc_set_time,
+};
+
+/*----------------------------------------------------------------------*/
+
+static int __devinit dm355evm_rtc_probe(struct platform_device *pdev)
+{
+        struct rtc_device *rtc;
+
+        rtc = rtc_device_register(pdev->name,
+                                  &pdev->dev, &dm355evm_rtc_ops, THIS_MODULE);
+        if (IS_ERR(rtc)) {
+                dev_err(&pdev->dev, "can't register RTC device, err %ld\n",
+                        PTR_ERR(rtc));
+                return PTR_ERR(rtc);
+        }
+        platform_set_drvdata(pdev, rtc);
+
+        return 0;
+}
+
+static int __devexit dm355evm_rtc_remove(struct platform_device *pdev)
+{
+        struct rtc_device *rtc = platform_get_drvdata(pdev);
+
+        rtc_device_unregister(rtc);
+        platform_set_drvdata(pdev, NULL);
+        return 0;
+}
+
+/*
+ * I2C is used to talk to the MSP430, but this platform device is
+ * exposed by an MFD driver that manages I2C communications.
+ */
+static struct platform_driver rtc_dm355evm_driver = {
+        .probe          = dm355evm_rtc_probe,
+        .remove         = __devexit_p(dm355evm_rtc_remove),
+        .driver         = {
+                .owner  = THIS_MODULE,
+                .name   = "rtc-dm355evm",
+        },
+};
+
+static int __init dm355evm_rtc_init(void)
+{
+        return platform_driver_register(&rtc_dm355evm_driver);
+}
+module_init(dm355evm_rtc_init);
+
+static void __exit dm355evm_rtc_exit(void)
+{
+        platform_driver_unregister(&rtc_dm355evm_driver);
+}
+module_exit(dm355evm_rtc_exit);
+
+MODULE_LICENSE("GPL");
diff --git a/drivers/rtc/rtc-ds1390.c b/drivers/rtc/rtc-ds1390.c
index e54b5c619bdf..e01b955db077 100644
--- a/drivers/rtc/rtc-ds1390.c
+++ b/drivers/rtc/rtc-ds1390.c
@@ -122,7 +122,6 @@ static const struct rtc_class_ops ds1390_rtc_ops = {
 
 static int __devinit ds1390_probe(struct spi_device *spi)
 {
-        struct rtc_device *rtc;
         unsigned char tmp;
         struct ds1390 *chip;
         int res;
diff --git a/drivers/video/aty/aty128fb.c b/drivers/video/aty/aty128fb.c
index db16112cf197..e6e299feb51b 100644
--- a/drivers/video/aty/aty128fb.c
+++ b/drivers/video/aty/aty128fb.c
@@ -1475,7 +1475,7 @@ static int aty128fb_set_par(struct fb_info *info)
         aty128_set_pll(&par->pll, par);
         aty128_set_fifo(&par->fifo_reg, par);
 
-        config = aty_ld_le32(CONFIG_CNTL) & ~3;
+        config = aty_ld_le32(CNFG_CNTL) & ~3;
 
 #if defined(__BIG_ENDIAN)
         if (par->crtc.bpp == 32)
@@ -1484,7 +1484,7 @@ static int aty128fb_set_par(struct fb_info *info)
                 config |= 1;    /* make aperture do 16 bit swapping */
 #endif
 
-        aty_st_le32(CONFIG_CNTL, config);
+        aty_st_le32(CNFG_CNTL, config);
         aty_st_8(CRTC_EXT_CNTL + 1, 0); /* turn the video back on */
 
         info->fix.line_length = (par->crtc.vxres * par->crtc.bpp) >> 3;
@@ -1875,7 +1875,7 @@ static int __devinit aty128_init(struct pci_dev *pdev, const struct pci_device_i
         u32 dac;
 
         /* Get the chip revision */
-        chip_rev = (aty_ld_le32(CONFIG_CNTL) >> 16) & 0x1F;
+        chip_rev = (aty_ld_le32(CNFG_CNTL) >> 16) & 0x1F;
 
         strcpy(video_card, "Rage128 XX ");
         video_card[8] = ent->device >> 8;
@@ -2057,7 +2057,7 @@ static int __devinit aty128_probe(struct pci_dev *pdev, const struct pci_device_
 
         /* Grab memory size from the card */
         // How does this relate to the resource length from the PCI hardware?
-        par->vram_size = aty_ld_le32(CONFIG_MEMSIZE) & 0x03FFFFFF;
+        par->vram_size = aty_ld_le32(CNFG_MEMSIZE) & 0x03FFFFFF;
 
         /* Virtualize the framebuffer */
         info->screen_base = ioremap(fb_addr, par->vram_size);
@@ -2374,6 +2374,8 @@ static void aty128_set_suspend(struct aty128fb_par *par, int suspend)
         /* Set the chip into the appropriate suspend mode (we use D2,
          * D3 would require a complete re-initialisation of the chip,
          * including PCI config registers, clocks, AGP configuration, ...)
+         *
+         * For resume, the core will have already brought us back to D0
          */
         if (suspend) {
                 /* Make sure CRTC2 is reset. Remove that the day we decide to
@@ -2391,17 +2393,9 @@ static void aty128_set_suspend(struct aty128fb_par *par, int suspend)
                 aty_st_le32(BUS_CNTL1, 0x00000010);
                 aty_st_le32(MEM_POWER_MISC, 0x0c830000);
                 mdelay(100);
-                pci_read_config_word(pdev, par->pm_reg+PCI_PM_CTRL, &pwr_command);
+
                 /* Switch PCI power management to D2 */
-                pci_write_config_word(pdev, par->pm_reg+PCI_PM_CTRL,
-                        (pwr_command & ~PCI_PM_CTRL_STATE_MASK) | 2);
-                pci_read_config_word(pdev, par->pm_reg+PCI_PM_CTRL, &pwr_command);
-        } else {
-                /* Switch back PCI power management to D0 */
-                mdelay(100);
-                pci_write_config_word(pdev, par->pm_reg+PCI_PM_CTRL, 0);
-                pci_read_config_word(pdev, par->pm_reg+PCI_PM_CTRL, &pwr_command);
-                mdelay(100);
+                pci_set_power_state(pdev, PCI_D2);
         }
 }
 
@@ -2410,6 +2404,12 @@ static int aty128_pci_suspend(struct pci_dev *pdev, pm_message_t state)
         struct fb_info *info = pci_get_drvdata(pdev);
         struct aty128fb_par *par = info->par;
 
+        /* Because we may change PCI D state ourselves, we need to
+         * first save the config space content so the core can
+         * restore it properly on resume.
+         */
+        pci_save_state(pdev);
+
         /* We don't do anything but D2, for now we return 0, but
          * we may want to change that. How do we know if the BIOS
          * can properly take care of D3 ? Also, with swsusp, we
@@ -2476,6 +2476,11 @@ static int aty128_do_resume(struct pci_dev *pdev)
         if (pdev->dev.power.power_state.event == PM_EVENT_ON)
                 return 0;
 
+        /* PCI state will have been restored by the core, so
+         * we should be in D0 now with our config space fully
+         * restored
+         */
+
         /* Wakeup chip */
         aty128_set_suspend(par, 0);
         par->asleep = 0;
diff --git a/drivers/video/aty/atyfb_base.c b/drivers/video/aty/atyfb_base.c
index cc6b470073da..1207c208a30b 100644
--- a/drivers/video/aty/atyfb_base.c
+++ b/drivers/video/aty/atyfb_base.c
@@ -135,7 +135,7 @@
 #if defined(CONFIG_PM) || defined(CONFIG_PMAC_BACKLIGHT) || \
 defined (CONFIG_FB_ATY_GENERIC_LCD) || defined(CONFIG_FB_ATY_BACKLIGHT)
 static const u32 lt_lcd_regs[] = {
-        CONFIG_PANEL_LG,
+        CNFG_PANEL_LG,
         LCD_GEN_CNTL_LG,
         DSTN_CONTROL_LG,
         HFB_PITCH_ADDR_LG,
@@ -446,7 +446,7 @@ static int __devinit correct_chipset(struct atyfb_par *par)
         par->pll_limits.ecp_max = aty_chips[i].ecp_max;
         par->features = aty_chips[i].features;
 
-        chip_id = aty_ld_le32(CONFIG_CHIP_ID, par);
+        chip_id = aty_ld_le32(CNFG_CHIP_ID, par);
         type = chip_id & CFG_CHIP_TYPE;
         rev = (chip_id & CFG_CHIP_REV) >> 24;
 
@@ -629,7 +629,7 @@ static void aty_get_crtc(const struct atyfb_par *par, struct crtc *crtc)
                     crtc->lcd_index = aty_ld_le32(LCD_INDEX, par);
                     aty_st_le32(LCD_INDEX, crtc->lcd_index, par);
                 }
-                crtc->lcd_config_panel = aty_ld_lcd(CONFIG_PANEL, par);
+                crtc->lcd_config_panel = aty_ld_lcd(CNFG_PANEL, par);
                 crtc->lcd_gen_cntl = aty_ld_lcd(LCD_GEN_CNTL, par);
 
 
@@ -676,7 +676,7 @@ static void aty_set_crtc(const struct atyfb_par *par, const struct crtc *crtc)
                 aty_st_le32(CRTC_GEN_CNTL, crtc->gen_cntl & ~(CRTC_EXT_DISP_EN | CRTC_EN), par);
 
                 /* update non-shadow registers first */
-                aty_st_lcd(CONFIG_PANEL, crtc->lcd_config_panel, par);
+                aty_st_lcd(CNFG_PANEL, crtc->lcd_config_panel, par);
                 aty_st_lcd(LCD_GEN_CNTL, crtc->lcd_gen_cntl &
                         ~(CRTC_RW_SELECT | SHADOW_EN | SHADOW_RW_EN), par);
 
@@ -858,7 +858,7 @@ static int aty_var_to_crtc(const struct fb_info *info,
                 if (!M64_HAS(MOBIL_BUS))
                         crtc->lcd_index |= CRTC2_DISPLAY_DIS;
 
-                crtc->lcd_config_panel = aty_ld_lcd(CONFIG_PANEL, par) | 0x4000;
+                crtc->lcd_config_panel = aty_ld_lcd(CNFG_PANEL, par) | 0x4000;
                 crtc->lcd_gen_cntl = aty_ld_lcd(LCD_GEN_CNTL, par) & ~CRTC_RW_SELECT;
 
                 crtc->lcd_gen_cntl &=
@@ -1978,7 +1978,7 @@ static int aty_power_mgmt(int sleep, struct atyfb_par *par)
 
         return timeout ? 0 : -EIO;
 }
-#endif
+#endif /* CONFIG_PPC_PMAC */
 
 static int atyfb_pci_suspend(struct pci_dev *pdev, pm_message_t state)
 {
@@ -2002,9 +2002,15 @@ static int atyfb_pci_suspend(struct pci_dev *pdev, pm_message_t state)
         par->asleep = 1;
         par->lock_blank = 1;
 
+        /* Because we may change PCI D state ourselves, we need to
+         * first save the config space content so the core can
+         * restore it properly on resume.
+         */
+        pci_save_state(pdev);
+
 #ifdef CONFIG_PPC_PMAC
         /* Set chip to "suspend" mode */
-        if (aty_power_mgmt(1, par)) {
+        if (machine_is(powermac) && aty_power_mgmt(1, par)) {
                 par->asleep = 0;
                 par->lock_blank = 0;
                 atyfb_blank(FB_BLANK_UNBLANK, info);
@@ -2047,11 +2053,15 @@ static int atyfb_pci_resume(struct pci_dev *pdev)
 
         acquire_console_sem();
 
+        /* PCI state will have been restored by the core, so
+         * we should be in D0 now with our config space fully
+         * restored
+         */
+
 #ifdef CONFIG_PPC_PMAC
-        if (pdev->dev.power.power_state.event == 2)
+        if (machine_is(powermac) &&
+            pdev->dev.power.power_state.event == PM_EVENT_SUSPEND)
                 aty_power_mgmt(0, par);
-#else
-        pci_set_power_state(pdev, PCI_D0);
 #endif
 
         aty_resume_chip(info);
@@ -2254,7 +2264,7 @@ static int __devinit aty_init(struct fb_info *info)
         if (!M64_HAS(INTEGRATED)) {
                 u32 stat0;
                 u8 dac_type, dac_subtype, clk_type;
-                stat0 = aty_ld_le32(CONFIG_STAT0, par);
+                stat0 = aty_ld_le32(CNFG_STAT0, par);
                 par->bus_type = (stat0 >> 0) & 0x07;
                 par->ram_type = (stat0 >> 3) & 0x07;
                 ramname = aty_gx_ram[par->ram_type];
@@ -2324,7 +2334,7 @@ static int __devinit aty_init(struct fb_info *info)
                 par->dac_ops = &aty_dac_ct;
                 par->pll_ops = &aty_pll_ct;
                 par->bus_type = PCI;
-                par->ram_type = (aty_ld_le32(CONFIG_STAT0, par) & 0x07);
+                par->ram_type = (aty_ld_le32(CNFG_STAT0, par) & 0x07);
                 ramname = aty_ct_ram[par->ram_type];
                 /* for many chips, the mclk is 67 MHz for SDRAM, 63 MHz otherwise */
                 if (par->pll_limits.mclk == 67 && par->ram_type < SDRAM)
@@ -2433,7 +2443,7 @@ static int __devinit aty_init(struct fb_info *info)
                 }
 
         if (M64_HAS(MAGIC_VRAM_SIZE)) {
-                if (aty_ld_le32(CONFIG_STAT1, par) & 0x40000000)
+                if (aty_ld_le32(CNFG_STAT1, par) & 0x40000000)
                         info->fix.smem_len += 0x400000;
         }
 
@@ -2946,7 +2956,7 @@ static int __devinit atyfb_setup_sparc(struct pci_dev *pdev,
                  * Fix PROMs idea of MEM_CNTL settings...
                  */
                 mem = aty_ld_le32(MEM_CNTL, par);
-                chip_id = aty_ld_le32(CONFIG_CHIP_ID, par);
+                chip_id = aty_ld_le32(CNFG_CHIP_ID, par);
                 if (((chip_id & CFG_CHIP_TYPE) == VT_CHIP_ID) && !((chip_id >> 24) & 1)) {
                         switch (mem & 0x0f) {
                         case 3:
@@ -2964,7 +2974,7 @@ static int __devinit atyfb_setup_sparc(struct pci_dev *pdev,
                         default:
                                 break;
                         }
-                        if ((aty_ld_le32(CONFIG_STAT0, par) & 7) >= SDRAM)
+                        if ((aty_ld_le32(CNFG_STAT0, par) & 7) >= SDRAM)
                                 mem &= ~(0x00700000);
                 }
                 mem &= ~(0xcf80e000);   /* Turn off all undocumented bits. */
@@ -3572,7 +3582,7 @@ static int __init atyfb_atari_probe(void)
                 }
 
                 /* Fake pci_id for correct_chipset() */
-                switch (aty_ld_le32(CONFIG_CHIP_ID, par) & CFG_CHIP_TYPE) {
+                switch (aty_ld_le32(CNFG_CHIP_ID, par) & CFG_CHIP_TYPE) {
                 case 0x00d7:
                         par->pci_id = PCI_CHIP_MACH64GX;
                         break;
diff --git a/drivers/video/aty/radeon_base.c b/drivers/video/aty/radeon_base.c
index d0f1a7fc2c9d..16bb7e3c0310 100644
--- a/drivers/video/aty/radeon_base.c
+++ b/drivers/video/aty/radeon_base.c
@@ -1936,8 +1936,8 @@ static void fixup_memory_mappings(struct radeonfb_info *rinfo)
         OUTREG(CRTC_GEN_CNTL, save_crtc_gen_cntl | CRTC_DISP_REQ_EN_B);
         mdelay(100);
 
-        aper_base = INREG(CONFIG_APER_0_BASE);
-        aper_size = INREG(CONFIG_APER_SIZE);
+        aper_base = INREG(CNFG_APER_0_BASE);
+        aper_size = INREG(CNFG_APER_SIZE);
 
 #ifdef SET_MC_FB_FROM_APERTURE
         /* Set framebuffer to be at the same address as set in PCI BAR */
@@ -2024,11 +2024,11 @@ static void radeon_identify_vram(struct radeonfb_info *rinfo)
                      ~CRTC_H_CUTOFF_ACTIVE_EN);
           }
         } else {
-          tmp = INREG(CONFIG_MEMSIZE);
+          tmp = INREG(CNFG_MEMSIZE);
         }
 
         /* mem size is bits [28:0], mask off the rest */
-        rinfo->video_ram = tmp & CONFIG_MEMSIZE_MASK;
+        rinfo->video_ram = tmp & CNFG_MEMSIZE_MASK;
 
         /*
          * Hack to get around some busted production M6's
@@ -2228,7 +2228,7 @@ static int __devinit radeonfb_pci_register (struct pci_dev *pdev,
          */
         rinfo->errata = 0;
         if (rinfo->family == CHIP_FAMILY_R300 &&
-            (INREG(CONFIG_CNTL) & CFG_ATI_REV_ID_MASK)
+            (INREG(CNFG_CNTL) & CFG_ATI_REV_ID_MASK)
             == CFG_ATI_REV_A11)
                 rinfo->errata |= CHIP_ERRATA_R300_CG;
 
diff --git a/drivers/video/aty/radeon_pm.c b/drivers/video/aty/radeon_pm.c
index 675abdafc2d8..ca5f0dc28546 100644
--- a/drivers/video/aty/radeon_pm.c
+++ b/drivers/video/aty/radeon_pm.c
@@ -333,7 +333,7 @@ static void radeon_pm_enable_dynamic_mode(struct radeonfb_info *rinfo)
         if (!rinfo->has_CRTC2) {
                 tmp = INPLL(pllSCLK_CNTL);
 
-                if ((INREG(CONFIG_CNTL) & CFG_ATI_REV_ID_MASK) > CFG_ATI_REV_A13)
+                if ((INREG(CNFG_CNTL) & CFG_ATI_REV_ID_MASK) > CFG_ATI_REV_A13)
                     tmp &= ~(SCLK_CNTL__FORCE_CP        | SCLK_CNTL__FORCE_RB);
                 tmp &= ~(SCLK_CNTL__FORCE_HDP           | SCLK_CNTL__FORCE_DISP1 |
                          SCLK_CNTL__FORCE_TOP           | SCLK_CNTL__FORCE_SE   |
@@ -468,9 +468,9 @@ static void radeon_pm_enable_dynamic_mode(struct radeonfb_info *rinfo)
 
         /*RAGE_6::A11 A12 A12N1 A13, RV250::A11 A12, R300*/
         if ((rinfo->family == CHIP_FAMILY_RV250 &&
-             ((INREG(CONFIG_CNTL) & CFG_ATI_REV_ID_MASK) < CFG_ATI_REV_A13)) ||
+             ((INREG(CNFG_CNTL) & CFG_ATI_REV_ID_MASK) < CFG_ATI_REV_A13)) ||
             ((rinfo->family == CHIP_FAMILY_RV100) &&
-             ((INREG(CONFIG_CNTL) & CFG_ATI_REV_ID_MASK) <= CFG_ATI_REV_A13))) {
+             ((INREG(CNFG_CNTL) & CFG_ATI_REV_ID_MASK) <= CFG_ATI_REV_A13))) {
                 tmp |= SCLK_CNTL__FORCE_CP;
                 tmp |= SCLK_CNTL__FORCE_VIP;
         }
@@ -486,7 +486,7 @@ static void radeon_pm_enable_dynamic_mode(struct radeonfb_info *rinfo)
                 /* RV200::A11 A12 RV250::A11 A12 */
                 if (((rinfo->family == CHIP_FAMILY_RV200) ||
                      (rinfo->family == CHIP_FAMILY_RV250)) &&
-                    ((INREG(CONFIG_CNTL) & CFG_ATI_REV_ID_MASK) < CFG_ATI_REV_A13))
+                    ((INREG(CNFG_CNTL) & CFG_ATI_REV_ID_MASK) < CFG_ATI_REV_A13))
                         tmp |= SCLK_MORE_CNTL__FORCEON;
 
                 OUTPLL(pllSCLK_MORE_CNTL, tmp);
@@ -497,7 +497,7 @@ static void radeon_pm_enable_dynamic_mode(struct radeonfb_info *rinfo)
         /* RV200::A11 A12, RV250::A11 A12 */
         if (((rinfo->family == CHIP_FAMILY_RV200) ||
              (rinfo->family == CHIP_FAMILY_RV250)) &&
-            ((INREG(CONFIG_CNTL) & CFG_ATI_REV_ID_MASK) < CFG_ATI_REV_A13)) {
+            ((INREG(CNFG_CNTL) & CFG_ATI_REV_ID_MASK) < CFG_ATI_REV_A13)) {
                 tmp = INPLL(pllPLL_PWRMGT_CNTL);
                 tmp |= PLL_PWRMGT_CNTL__TCL_BYPASS_DISABLE;
                 OUTPLL(pllPLL_PWRMGT_CNTL, tmp);
@@ -702,7 +702,7 @@ static void radeon_pm_restore_regs(struct radeonfb_info *rinfo)
         OUTREG(DISPLAY_BASE_ADDR, rinfo->save_regs[31]);
         OUTREG(MC_AGP_LOCATION, rinfo->save_regs[32]);
         OUTREG(CRTC2_DISPLAY_BASE_ADDR, rinfo->save_regs[33]);
-        OUTREG(CONFIG_MEMSIZE, rinfo->video_ram);
+        OUTREG(CNFG_MEMSIZE, rinfo->video_ram);
 
         OUTREG(DISP_MISC_CNTL, rinfo->save_regs[9]);
         OUTREG(DISP_PWR_MAN, rinfo->save_regs[10]);
@@ -1723,7 +1723,7 @@ static void radeon_reinitialize_M10(struct radeonfb_info *rinfo)
         OUTREG(CRTC2_DISPLAY_BASE_ADDR, rinfo->save_regs[33]);
         OUTREG(MC_FB_LOCATION, rinfo->save_regs[30]);
         OUTREG(OV0_BASE_ADDR, rinfo->save_regs[80]);
-        OUTREG(CONFIG_MEMSIZE, rinfo->video_ram);
+        OUTREG(CNFG_MEMSIZE, rinfo->video_ram);
         OUTREG(BUS_CNTL, rinfo->save_regs[36]);
         OUTREG(BUS_CNTL1, rinfo->save_regs[14]);
         OUTREG(MPP_TB_CONFIG, rinfo->save_regs[37]);
@@ -1961,7 +1961,7 @@ static void radeon_pm_m9p_reconfigure_mc(struct radeonfb_info *rinfo)
         OUTMC(rinfo, ixMC_CHP_IO_CNTL_B1, rinfo->save_regs[68] /*0x141555ff*/);
         OUTMC(rinfo, ixMC_IMP_CNTL_0, rinfo->save_regs[71] /*0x00009249*/);
         OUTREG(MC_IND_INDEX, 0);
-        OUTREG(CONFIG_MEMSIZE, rinfo->video_ram);
+        OUTREG(CNFG_MEMSIZE, rinfo->video_ram);
 
         mdelay(20);
 }
@@ -2361,7 +2361,7 @@ static void radeon_reinitialize_QW(struct radeonfb_info *rinfo)
         OUTMC(rinfo, ixMC_IMP_CNTL_0, 0x00009249);
         OUTREG(MC_IND_INDEX, 0);
 
-        OUTREG(CONFIG_MEMSIZE, rinfo->video_ram);
+        OUTREG(CNFG_MEMSIZE, rinfo->video_ram);
 
         radeon_pm_full_reset_sdram(rinfo);
 
@@ -2509,9 +2509,7 @@ static void radeon_reinitialize_QW(struct radeonfb_info *rinfo)
 
 static void radeon_set_suspend(struct radeonfb_info *rinfo, int suspend)
 {
-        u16 pwr_cmd;
         u32 tmp;
-        int i;
 
         if (!rinfo->pm_reg)
                 return;
@@ -2557,32 +2555,14 @@ static void radeon_set_suspend(struct radeonfb_info *rinfo, int suspend)
                         }
                 }
 
-                for (i = 0; i < 64; ++i)
-                        pci_read_config_dword(rinfo->pdev, i * 4,
-                                              &rinfo->cfg_save[i]);
-
                 /* Switch PCI power management to D2. */
                 pci_disable_device(rinfo->pdev);
-                for (;;) {
-                        pci_read_config_word(
-                                rinfo->pdev, rinfo->pm_reg+PCI_PM_CTRL,
-                                &pwr_cmd);
-                        if (pwr_cmd & 2)
-                                break;                  
-                        pci_write_config_word(
-                                rinfo->pdev, rinfo->pm_reg+PCI_PM_CTRL,
-                                (pwr_cmd & ~PCI_PM_CTRL_STATE_MASK) | 2);
-                        mdelay(500);
-                }
+                pci_save_state(rinfo->pdev);
+                pci_set_power_state(rinfo->pdev, PCI_D2);
         } else {
                 printk(KERN_DEBUG "radeonfb (%s): switching to D0 state...\n",
                        pci_name(rinfo->pdev));
 
-                /* Switch back PCI powermanagment to D0 */
-                mdelay(200);
-                pci_write_config_word(rinfo->pdev, rinfo->pm_reg+PCI_PM_CTRL, 0);
-                mdelay(500);
-
                 if (rinfo->family <= CHIP_FAMILY_RV250) {
                         /* Reset the SDRAM controller  */
                         radeon_pm_full_reset_sdram(rinfo);
@@ -2598,37 +2578,10 @@ static void radeon_set_suspend(struct radeonfb_info *rinfo, int suspend)
         }
 }
 
-static int radeon_restore_pci_cfg(struct radeonfb_info *rinfo)
-{
-        int i;
-        static u32 radeon_cfg_after_resume[64];
-
-        for (i = 0; i < 64; ++i)
-                pci_read_config_dword(rinfo->pdev, i * 4,
-                                      &radeon_cfg_after_resume[i]);
-
-        if (radeon_cfg_after_resume[PCI_BASE_ADDRESS_0/4]
-            == rinfo->cfg_save[PCI_BASE_ADDRESS_0/4])
-                return 0;       /* assume everything is ok */
-
-        for (i = PCI_BASE_ADDRESS_0/4; i < 64; ++i) {
-                if (radeon_cfg_after_resume[i] != rinfo->cfg_save[i])
-                        pci_write_config_dword(rinfo->pdev, i * 4,
-                                               rinfo->cfg_save[i]);
-        }
-        pci_write_config_word(rinfo->pdev, PCI_CACHE_LINE_SIZE,
-                              rinfo->cfg_save[PCI_CACHE_LINE_SIZE/4]);
-        pci_write_config_word(rinfo->pdev, PCI_COMMAND,
-                              rinfo->cfg_save[PCI_COMMAND/4]);
-        return 1;
-}
-
-
 int radeonfb_pci_suspend(struct pci_dev *pdev, pm_message_t mesg)
 {
         struct fb_info *info = pci_get_drvdata(pdev);
         struct radeonfb_info *rinfo = info->par;
-        int i;
 
         if (mesg.event == pdev->dev.power.power_state.event)
                 return 0;
@@ -2674,6 +2627,11 @@ int radeonfb_pci_suspend(struct pci_dev *pdev, pm_message_t mesg)
         pmac_suspend_agp_for_card(pdev);
 #endif /* CONFIG_PPC_PMAC */
 
+        /* It's unclear whether or when the generic code will do that, so let's
+         * do it ourselves. We save state before we do any power management
+         */
+        pci_save_state(pdev);
+
         /* If we support wakeup from poweroff, we save all regs we can including cfg
          * space
          */
@@ -2698,9 +2656,6 @@ int radeonfb_pci_suspend(struct pci_dev *pdev, pm_message_t mesg)
                         mdelay(20);
                         OUTREG(LVDS_GEN_CNTL, INREG(LVDS_GEN_CNTL) & ~(LVDS_DIGON));
                 }
-                // FIXME: Use PCI layer
-                for (i = 0; i < 64; ++i)
-                        pci_read_config_dword(pdev, i * 4, &rinfo->cfg_save[i]);
                 pci_disable_device(pdev);
         }
         /* If we support D2, we go to it (should be fixed later with a flag forcing
@@ -2717,6 +2672,13 @@ int radeonfb_pci_suspend(struct pci_dev *pdev, pm_message_t mesg)
         return 0;
 }
 
+static int radeon_check_power_loss(struct radeonfb_info *rinfo)
+{
+        return rinfo->save_regs[4] != INPLL(CLK_PIN_CNTL) ||
+               rinfo->save_regs[2] != INPLL(MCLK_CNTL) ||
+               rinfo->save_regs[3] != INPLL(SCLK_CNTL);
+}
+
 int radeonfb_pci_resume(struct pci_dev *pdev)
 {
         struct fb_info *info = pci_get_drvdata(pdev);
@@ -2735,20 +2697,13 @@ int radeonfb_pci_resume(struct pci_dev *pdev)
         printk(KERN_DEBUG "radeonfb (%s): resuming from state: %d...\n",
                pci_name(pdev), pdev->dev.power.power_state.event);
 
-
-        if (pci_enable_device(pdev)) {
-                rc = -ENODEV;
-                printk(KERN_ERR "radeonfb (%s): can't enable PCI device !\n",
-                       pci_name(pdev));
-                goto bail;
-        }
-        pci_set_master(pdev);
-
+        /* PCI state will have been restored by the core, so
+         * we should be in D0 now with our config space fully
+         * restored
+         */
         if (pdev->dev.power.power_state.event == PM_EVENT_SUSPEND) {
-                /* Wakeup chip. Check from config space if we were powered off
-                 * (todo: additionally, check CLK_PIN_CNTL too)
-                 */
-                if ((rinfo->pm_mode & radeon_pm_off) && radeon_restore_pci_cfg(rinfo)) {
+                /* Wakeup chip */
+                if ((rinfo->pm_mode & radeon_pm_off) && radeon_check_power_loss(rinfo)) {
                         if (rinfo->reinit_func != NULL)
                                 rinfo->reinit_func(rinfo);
                         else {
diff --git a/drivers/video/aty/radeonfb.h b/drivers/video/aty/radeonfb.h
index 3ea1b00fdd22..7351e66c7f54 100644
--- a/drivers/video/aty/radeonfb.h
+++ b/drivers/video/aty/radeonfb.h
@@ -361,8 +361,6 @@ struct radeonfb_info {
 #ifdef CONFIG_FB_RADEON_I2C
         struct radeon_i2c_chan  i2c[4];
 #endif
-
-        u32                     cfg_save[64];
 };
 
 
diff --git a/drivers/video/backlight/Makefile b/drivers/video/backlight/Makefile
index 363b3cb2f01b..63d759498165 100644
--- a/drivers/video/backlight/Makefile
+++ b/drivers/video/backlight/Makefile
@@ -18,7 +18,7 @@ obj-$(CONFIG_BACKLIGHT_OMAP1)	+= omap1_bl.o
 obj-$(CONFIG_BACKLIGHT_PROGEAR) += progear_bl.o
 obj-$(CONFIG_BACKLIGHT_CARILLO_RANCH) += cr_bllcd.o
 obj-$(CONFIG_BACKLIGHT_PWM)     += pwm_bl.o
-obj-$(CONFIG_BACKLIGHT_DA903X)  += da903x.o
+obj-$(CONFIG_BACKLIGHT_DA903X)  += da903x_bl.o
 obj-$(CONFIG_BACKLIGHT_MBP_NVIDIA) += mbp_nvidia_bl.o
 obj-$(CONFIG_BACKLIGHT_TOSA)    += tosa_bl.o
 obj-$(CONFIG_BACKLIGHT_SAHARA)  += kb3886_bl.o
diff --git a/drivers/video/backlight/da903x.c b/drivers/video/backlight/da903x_bl.c
index 93bb4340cc64..93bb4340cc64 100644
--- a/drivers/video/backlight/da903x.c
+++ b/drivers/video/backlight/da903x_bl.c
diff --git a/drivers/video/fbcmap.c b/drivers/video/fbcmap.c
index 91b78e691505..f53b9f1d6aba 100644
--- a/drivers/video/fbcmap.c
+++ b/drivers/video/fbcmap.c
@@ -250,10 +250,6 @@ int fb_set_user_cmap(struct fb_cmap_user *cmap, struct fb_info *info)
         int rc, size = cmap->len * sizeof(u16);
         struct fb_cmap umap;
 
-        if (cmap->start < 0 || (!info->fbops->fb_setcolreg &&
-                                !info->fbops->fb_setcmap))
-                return -EINVAL;
-
         memset(&umap, 0, sizeof(struct fb_cmap));
         rc = fb_alloc_cmap(&umap, cmap->len, cmap->transp != NULL);
         if (rc)
@@ -262,11 +258,23 @@ int fb_set_user_cmap(struct fb_cmap_user *cmap, struct fb_info *info)
             copy_from_user(umap.green, cmap->green, size) ||
             copy_from_user(umap.blue, cmap->blue, size) ||
             (cmap->transp && copy_from_user(umap.transp, cmap->transp, size))) {
-                fb_dealloc_cmap(&umap);
-                return -EFAULT;
+                rc = -EFAULT;
+                goto out;
         }
         umap.start = cmap->start;
+        if (!lock_fb_info(info)) {
+                rc = -ENODEV;
+                goto out;
+        }
+        if (cmap->start < 0 || (!info->fbops->fb_setcolreg &&
+                                !info->fbops->fb_setcmap)) {
+                rc = -EINVAL;
+                goto out1;
+        }
         rc = fb_set_cmap(&umap, info);
+out1:
+        unlock_fb_info(info);
+out:
         fb_dealloc_cmap(&umap);
         return rc;
 }
diff --git a/drivers/video/fbmem.c b/drivers/video/fbmem.c
index 756efeb91abc..cfd9dce1ce0b 100644
--- a/drivers/video/fbmem.c
+++ b/drivers/video/fbmem.c
@@ -1013,132 +1013,139 @@ static long do_fb_ioctl(struct fb_info *info, unsigned int cmd,
         struct fb_var_screeninfo var;
         struct fb_fix_screeninfo fix;
         struct fb_con2fbmap con2fb;
+        struct fb_cmap cmap_from;
         struct fb_cmap_user cmap;
         struct fb_event event;
         void __user *argp = (void __user *)arg;
         long ret = 0;
 
-        fb = info->fbops;
-        if (!fb)
-                return -ENODEV;
-
         switch (cmd) {
         case FBIOGET_VSCREENINFO:
-                ret = copy_to_user(argp, &info->var,
-                                    sizeof(var)) ? -EFAULT : 0;
+                if (!lock_fb_info(info))
+                        return -ENODEV;
+                var = info->var;
+                unlock_fb_info(info);
+
+                ret = copy_to_user(argp, &var, sizeof(var)) ? -EFAULT : 0;
                 break;
         case FBIOPUT_VSCREENINFO:
-                if (copy_from_user(&var, argp, sizeof(var))) {
-                        ret =  -EFAULT;
-                        break;
-                }
+                if (copy_from_user(&var, argp, sizeof(var)))
+                        return -EFAULT;
+                if (!lock_fb_info(info))
+                        return -ENODEV;
                 acquire_console_sem();
                 info->flags |= FBINFO_MISC_USEREVENT;
                 ret = fb_set_var(info, &var);
                 info->flags &= ~FBINFO_MISC_USEREVENT;
                 release_console_sem();
-                if (ret == 0 && copy_to_user(argp, &var, sizeof(var)))
+                unlock_fb_info(info);
+                if (!ret && copy_to_user(argp, &var, sizeof(var)))
                         ret = -EFAULT;
                 break;
         case FBIOGET_FSCREENINFO:
-                ret = copy_to_user(argp, &info->fix,
-                                    sizeof(fix)) ? -EFAULT : 0;
+                if (!lock_fb_info(info))
+                        return -ENODEV;
+                fix = info->fix;
+                unlock_fb_info(info);
+
+                ret = copy_to_user(argp, &fix, sizeof(fix)) ? -EFAULT : 0;
                 break;
         case FBIOPUTCMAP:
                 if (copy_from_user(&cmap, argp, sizeof(cmap)))
-                        ret = -EFAULT;
-                else
-                        ret = fb_set_user_cmap(&cmap, info);
+                        return -EFAULT;
+                ret = fb_set_user_cmap(&cmap, info);
                 break;
         case FBIOGETCMAP:
                 if (copy_from_user(&cmap, argp, sizeof(cmap)))
-                        ret = -EFAULT;
-                else
-                        ret = fb_cmap_to_user(&info->cmap, &cmap);
+                        return -EFAULT;
+                if (!lock_fb_info(info))
+                        return -ENODEV;
+                cmap_from = info->cmap;
+                unlock_fb_info(info);
+                ret = fb_cmap_to_user(&cmap_from, &cmap);
                 break;
         case FBIOPAN_DISPLAY:
-                if (copy_from_user(&var, argp, sizeof(var))) {
-                        ret = -EFAULT;
-                        break;
-                }
+                if (copy_from_user(&var, argp, sizeof(var)))
+                        return -EFAULT;
+                if (!lock_fb_info(info))
+                        return -ENODEV;
                 acquire_console_sem();
                 ret = fb_pan_display(info, &var);
                 release_console_sem();
+                unlock_fb_info(info);
                 if (ret == 0 && copy_to_user(argp, &var, sizeof(var)))
-                        ret = -EFAULT;
+                        return -EFAULT;
                 break;
         case FBIO_CURSOR:
                 ret = -EINVAL;
                 break;
         case FBIOGET_CON2FBMAP:
                 if (copy_from_user(&con2fb, argp, sizeof(con2fb)))
-                        ret = -EFAULT;
-                else if (con2fb.console < 1 || con2fb.console > MAX_NR_CONSOLES)
-                        ret = -EINVAL;
-                else {
-                        con2fb.framebuffer = -1;
-                        event.info = info;
-                        event.data = &con2fb;
-                        fb_notifier_call_chain(FB_EVENT_GET_CONSOLE_MAP,
-                                                                &event);
-                        ret = copy_to_user(argp, &con2fb,
-                                    sizeof(con2fb)) ? -EFAULT : 0;
-                }
+                        return -EFAULT;
+                if (con2fb.console < 1 || con2fb.console > MAX_NR_CONSOLES)
+                        return -EINVAL;
+                con2fb.framebuffer = -1;
+                event.data = &con2fb;
+
+                if (!lock_fb_info(info))
+                        return -ENODEV;
+                event.info = info;
+                fb_notifier_call_chain(FB_EVENT_GET_CONSOLE_MAP, &event);
+                unlock_fb_info(info);
+
+                ret = copy_to_user(argp, &con2fb, sizeof(con2fb)) ? -EFAULT : 0;
                 break;
         case FBIOPUT_CON2FBMAP:
-                if (copy_from_user(&con2fb, argp, sizeof(con2fb))) {
-                        ret = -EFAULT;
-                        break;
-                }
-                if (con2fb.console < 1 || con2fb.console > MAX_NR_CONSOLES) {
-                        ret = -EINVAL;
-                        break;
-                }
-                if (con2fb.framebuffer < 0 || con2fb.framebuffer >= FB_MAX) {
-                        ret = -EINVAL;
-                        break;
-                }
+                if (copy_from_user(&con2fb, argp, sizeof(con2fb)))
+                        return -EFAULT;
+                if (con2fb.console < 1 || con2fb.console > MAX_NR_CONSOLES)
+                        return -EINVAL;
+                if (con2fb.framebuffer < 0 || con2fb.framebuffer >= FB_MAX)
+                        return -EINVAL;
                 if (!registered_fb[con2fb.framebuffer])
                         request_module("fb%d", con2fb.framebuffer);
                 if (!registered_fb[con2fb.framebuffer]) {
                         ret = -EINVAL;
                         break;
                 }
-                event.info = info;
                 event.data = &con2fb;
+                if (!lock_fb_info(info))
+                        return -ENODEV;
+                event.info = info;
                 ret = fb_notifier_call_chain(FB_EVENT_SET_CONSOLE_MAP,
                                               &event);
+                unlock_fb_info(info);
                 break;
         case FBIOBLANK:
+                if (!lock_fb_info(info))
+                        return -ENODEV;
                 acquire_console_sem();
                 info->flags |= FBINFO_MISC_USEREVENT;
                 ret = fb_blank(info, arg);
                 info->flags &= ~FBINFO_MISC_USEREVENT;
                 release_console_sem();
-                break;;
+                unlock_fb_info(info);
+                break;
         default:
-                if (fb->fb_ioctl == NULL)
-                        ret = -ENOTTY;
-                else
+                if (!lock_fb_info(info))
+                        return -ENODEV;
+                fb = info->fbops;
+                if (fb->fb_ioctl)
                         ret = fb->fb_ioctl(info, cmd, arg);
+                else
+                        ret = -ENOTTY;
+                unlock_fb_info(info);
         }
         return ret;
 }
 
 static long fb_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
-__acquires(&info->lock)
-__releases(&info->lock)
 {
         struct inode *inode = file->f_path.dentry->d_inode;
         int fbidx = iminor(inode);
-        struct fb_info *info;
-        long ret;
+        struct fb_info *info = registered_fb[fbidx];
 
-        info = registered_fb[fbidx];
-        mutex_lock(&info->lock);
-        ret = do_fb_ioctl(info, cmd, arg);
-        mutex_unlock(&info->lock);
-        return ret;
+        return do_fb_ioctl(info, cmd, arg);
 }
 
 #ifdef CONFIG_COMPAT
@@ -1257,8 +1264,6 @@ static int fb_get_fscreeninfo(struct fb_info *info, unsigned int cmd,
 
 static long fb_compat_ioctl(struct file *file, unsigned int cmd,
                             unsigned long arg)
-__acquires(&info->lock)
-__releases(&info->lock)
 {
         struct inode *inode = file->f_path.dentry->d_inode;
         int fbidx = iminor(inode);
@@ -1266,7 +1271,6 @@ __releases(&info->lock)
         struct fb_ops *fb = info->fbops;
         long ret = -ENOIOCTLCMD;
 
-        mutex_lock(&info->lock);
         switch(cmd) {
         case FBIOGET_VSCREENINFO:
         case FBIOPUT_VSCREENINFO:
@@ -1292,7 +1296,6 @@ __releases(&info->lock)
                         ret = fb->fb_compat_ioctl(info, cmd, arg);
                 break;
         }
-        mutex_unlock(&info->lock);
         return ret;
 }
 #endif