Merge master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6 into for-linus

333 files changed, 4283 insertions, 3685 deletions

diff --git a/drivers/acpi/Kconfig b/drivers/acpi/Kconfig
index f688c214be0c..b4f5e8542829 100644
--- a/drivers/acpi/Kconfig
+++ b/drivers/acpi/Kconfig
@@ -283,34 +283,22 @@ config ACPI_TOSHIBA
           If you have a legacy free Toshiba laptop (such as the Libretto L1
           series), say Y.
 
-config ACPI_CUSTOM_DSDT
-        bool "Include Custom DSDT"
+config ACPI_CUSTOM_DSDT_FILE
+        string "Custom DSDT Table file to include"
+        default ""
         depends on !STANDALONE
-        default n 
         help
           This option supports a custom DSDT by linking it into the kernel.
           See Documentation/acpi/dsdt-override.txt
 
-          If unsure, say N.
-
-config ACPI_CUSTOM_DSDT_FILE
-        string "Custom DSDT Table file to include"
-        depends on ACPI_CUSTOM_DSDT
-        default ""
-        help
           Enter the full path name to the file which includes the AmlCode
           declaration.
 
-config ACPI_CUSTOM_DSDT_INITRD
-        bool "Read Custom DSDT from initramfs"
-        depends on BLK_DEV_INITRD
-        default n
-        help
-          This option supports a custom DSDT by optionally loading it from initrd.
-          See Documentation/acpi/dsdt-override.txt
+          If unsure, don't enter a file name.
 
-          If you are not using this feature now, but may use it later,
-          it is safe to say Y here.
+config ACPI_CUSTOM_DSDT
+        bool
+        default ACPI_CUSTOM_DSDT_FILE != ""
 
 config ACPI_BLACKLIST_YEAR
         int "Disable ACPI for systems before Jan 1st this year" if X86_32
diff --git a/drivers/acpi/asus_acpi.c b/drivers/acpi/asus_acpi.c
index d25ef961415c..44ad90c03c2e 100644
--- a/drivers/acpi/asus_acpi.c
+++ b/drivers/acpi/asus_acpi.c
@@ -610,7 +610,7 @@ write_led(const char __user * buffer, unsigned long count,
             (led_out) ? (hotk->status | ledmask) : (hotk->status & ~ledmask);
 
         if (invert)             /* invert target value */
-                led_out = !led_out & 0x1;
+                led_out = !led_out;
 
         if (!write_acpi_int(hotk->handle, ledname, led_out, NULL))
                 printk(KERN_WARNING "Asus ACPI: LED (%s) write failed\n",
diff --git a/drivers/acpi/battery.c b/drivers/acpi/battery.c
index f6215e809808..d5729d5dc190 100644
--- a/drivers/acpi/battery.c
+++ b/drivers/acpi/battery.c
@@ -293,13 +293,12 @@ static int extract_package(struct acpi_battery *battery,
                                 strncpy(ptr, (u8 *)&element->integer.value,
                                         sizeof(acpi_integer));
                                 ptr[sizeof(acpi_integer)] = 0;
-                        } else return -EFAULT;
+                        } else
+                                *ptr = 0; /* don't have value */
                 } else {
-                        if (element->type == ACPI_TYPE_INTEGER) {
-                                int *x = (int *)((u8 *)battery +
-                                                offsets[i].offset);
-                                *x = element->integer.value;
-                        } else return -EFAULT;
+                        int *x = (int *)((u8 *)battery + offsets[i].offset);
+                        *x = (element->type == ACPI_TYPE_INTEGER) ?
+                                element->integer.value : -1;
                 }
         }
         return 0;
diff --git a/drivers/acpi/bus.c b/drivers/acpi/bus.c
index ce3c0a2cbac4..5b6760e0f957 100644
--- a/drivers/acpi/bus.c
+++ b/drivers/acpi/bus.c
@@ -776,7 +776,7 @@ static int __init acpi_init(void)
 
         acpi_kobj = kobject_create_and_add("acpi", firmware_kobj);
         if (!acpi_kobj) {
-                printk(KERN_WARNING "%s: kset create error\n", __FUNCTION__);
+                printk(KERN_WARNING "%s: kset create error\n", __func__);
                 acpi_kobj = NULL;
         }
 
diff --git a/drivers/acpi/button.c b/drivers/acpi/button.c
index 24a7865a57cb..6c5da83cdb68 100644
--- a/drivers/acpi/button.c
+++ b/drivers/acpi/button.c
@@ -449,6 +449,7 @@ static int acpi_button_add(struct acpi_device *device)
         input->phys = button->phys;
         input->id.bustype = BUS_HOST;
         input->id.product = button->type;
+        input->dev.parent = &device->dev;
 
         switch (button->type) {
         case ACPI_BUTTON_TYPE_POWER:
diff --git a/drivers/acpi/dock.c b/drivers/acpi/dock.c
index 307cef65c247..fa44fb96fc34 100644
--- a/drivers/acpi/dock.c
+++ b/drivers/acpi/dock.c
@@ -710,6 +710,7 @@ static ssize_t write_undock(struct device *dev, struct device_attribute *attr,
         if (!count)
                 return -EINVAL;
 
+        begin_undock(dock_station);
         ret = handle_eject_request(dock_station, ACPI_NOTIFY_EJECT_REQUEST);
         return ret ? ret: count;
 }
diff --git a/drivers/acpi/ec.c b/drivers/acpi/ec.c
index caf873c14bfb..7222a18a0319 100644
--- a/drivers/acpi/ec.c
+++ b/drivers/acpi/ec.c
@@ -943,11 +943,7 @@ int __init acpi_ec_ecdt_probe(void)
                 boot_ec->command_addr = ecdt_ptr->control.address;
                 boot_ec->data_addr = ecdt_ptr->data.address;
                 boot_ec->gpe = ecdt_ptr->gpe;
-                if (ACPI_FAILURE(acpi_get_handle(NULL, ecdt_ptr->id,
-                                &boot_ec->handle))) {
-                        pr_info("Failed to locate handle for boot EC\n");
-                        boot_ec->handle = ACPI_ROOT_OBJECT;
-                }
+                boot_ec->handle = ACPI_ROOT_OBJECT;
         } else {
                 /* This workaround is needed only on some broken machines,
                  * which require early EC, but fail to provide ECDT */
diff --git a/drivers/acpi/osl.c b/drivers/acpi/osl.c
index 8edba7b678eb..a697fb6cf050 100644
--- a/drivers/acpi/osl.c
+++ b/drivers/acpi/osl.c
@@ -91,10 +91,6 @@ static DEFINE_SPINLOCK(acpi_res_lock);
 #define OSI_STRING_LENGTH_MAX 64        /* arbitrary */
 static char osi_additional_string[OSI_STRING_LENGTH_MAX];
 
-#ifdef CONFIG_ACPI_CUSTOM_DSDT_INITRD
-static int acpi_no_initrd_override;
-#endif
-
 /*
  * "Ode to _OSI(Linux)"
  *
@@ -324,67 +320,6 @@ acpi_os_predefined_override(const struct acpi_predefined_names *init_val,
         return AE_OK;
 }
 
-#ifdef CONFIG_ACPI_CUSTOM_DSDT_INITRD
-static struct acpi_table_header *acpi_find_dsdt_initrd(void)
-{
-        struct file *firmware_file;
-        mm_segment_t oldfs;
-        unsigned long len, len2;
-        struct acpi_table_header *dsdt_buffer, *ret = NULL;
-        struct kstat stat;
-        char *ramfs_dsdt_name = "/DSDT.aml";
-
-        printk(KERN_INFO PREFIX "Checking initramfs for custom DSDT\n");
-
-        /*
-         * Never do this at home, only the user-space is allowed to open a file.
-         * The clean way would be to use the firmware loader.
-         * But this code must be run before there is any userspace available.
-         * A static/init firmware infrastructure doesn't exist yet...
-         */
-        if (vfs_stat(ramfs_dsdt_name, &stat) < 0)
-                return ret;
-
-        len = stat.size;
-        /* check especially against empty files */
-        if (len <= 4) {
-                printk(KERN_ERR PREFIX "Failed: DSDT only %lu bytes.\n", len);
-                return ret;
-        }
-
-        firmware_file = filp_open(ramfs_dsdt_name, O_RDONLY, 0);
-        if (IS_ERR(firmware_file)) {
-                printk(KERN_ERR PREFIX "Failed to open %s.\n", ramfs_dsdt_name);
-                return ret;
-        }
-
-        dsdt_buffer = kmalloc(len, GFP_ATOMIC);
-        if (!dsdt_buffer) {
-                printk(KERN_ERR PREFIX "Failed to allocate %lu bytes.\n", len);
-                goto err;
-        }
-
-        oldfs = get_fs();
-        set_fs(KERNEL_DS);
-        len2 = vfs_read(firmware_file, (char __user *)dsdt_buffer, len,
-                &firmware_file->f_pos);
-        set_fs(oldfs);
-        if (len2 < len) {
-                printk(KERN_ERR PREFIX "Failed to read %lu bytes from %s.\n",
-                        len, ramfs_dsdt_name);
-                ACPI_FREE(dsdt_buffer);
-                goto err;
-        }
-
-        printk(KERN_INFO PREFIX "Found %lu byte DSDT in %s.\n",
-                        len, ramfs_dsdt_name);
-        ret = dsdt_buffer;
-err:
-        filp_close(firmware_file, NULL);
-        return ret;
-}
-#endif
-
 acpi_status
 acpi_os_table_override(struct acpi_table_header * existing_table,
                        struct acpi_table_header ** new_table)
@@ -398,16 +333,6 @@ acpi_os_table_override(struct acpi_table_header * existing_table,
         if (strncmp(existing_table->signature, "DSDT", 4) == 0)
                 *new_table = (struct acpi_table_header *)AmlCode;
 #endif
-#ifdef CONFIG_ACPI_CUSTOM_DSDT_INITRD
-        if ((strncmp(existing_table->signature, "DSDT", 4) == 0) &&
-            !acpi_no_initrd_override) {
-                struct acpi_table_header *initrd_table;
-
-                initrd_table = acpi_find_dsdt_initrd();
-                if (initrd_table)
-                        *new_table = initrd_table;
-        }
-#endif
         if (*new_table != NULL) {
                 printk(KERN_WARNING PREFIX "Override [%4.4s-%8.8s], "
                            "this is unsafe: tainting kernel\n",
@@ -418,15 +343,6 @@ acpi_os_table_override(struct acpi_table_header * existing_table,
         return AE_OK;
 }
 
-#ifdef CONFIG_ACPI_CUSTOM_DSDT_INITRD
-static int __init acpi_no_initrd_override_setup(char *s)
-{
-        acpi_no_initrd_override = 1;
-        return 1;
-}
-__setup("acpi_no_initrd_override", acpi_no_initrd_override_setup);
-#endif
-
 static irqreturn_t acpi_irq(int irq, void *dev_id)
 {
         u32 handled;
@@ -1237,7 +1153,7 @@ int acpi_check_resource_conflict(struct resource *res)
 
         if (clash) {
                 if (acpi_enforce_resources != ENFORCE_RESOURCES_NO) {
-                        printk(KERN_INFO "%sACPI: %s resource %s [0x%llx-0x%llx]"
+                        printk("%sACPI: %s resource %s [0x%llx-0x%llx]"
                                " conflicts with ACPI region %s"
                                " [0x%llx-0x%llx]\n",
                                acpi_enforce_resources == ENFORCE_RESOURCES_LAX
diff --git a/drivers/acpi/pci_irq.c b/drivers/acpi/pci_irq.c
index 7f19859580c7..89022a74faee 100644
--- a/drivers/acpi/pci_irq.c
+++ b/drivers/acpi/pci_irq.c
@@ -25,6 +25,7 @@
  */
 
 
+#include <linux/dmi.h>
 #include <linux/kernel.h>
 #include <linux/module.h>
 #include <linux/init.h>
@@ -76,6 +77,101 @@ static struct acpi_prt_entry *acpi_pci_irq_find_prt_entry(int segment,
         return NULL;
 }
 
+/* http://bugzilla.kernel.org/show_bug.cgi?id=4773 */
+static struct dmi_system_id medion_md9580[] = {
+        {
+                .ident = "Medion MD9580-F laptop",
+                .matches = {
+                        DMI_MATCH(DMI_SYS_VENDOR, "MEDIONNB"),
+                        DMI_MATCH(DMI_PRODUCT_NAME, "A555"),
+                },
+        },
+        { }
+};
+
+/* http://bugzilla.kernel.org/show_bug.cgi?id=5044 */
+static struct dmi_system_id dell_optiplex[] = {
+        {
+                .ident = "Dell Optiplex GX1",
+                .matches = {
+                        DMI_MATCH(DMI_SYS_VENDOR, "Dell Computer Corporation"),
+                        DMI_MATCH(DMI_PRODUCT_NAME, "OptiPlex GX1 600S+"),
+                },
+        },
+        { }
+};
+
+/* http://bugzilla.kernel.org/show_bug.cgi?id=10138 */
+static struct dmi_system_id hp_t5710[] = {
+        {
+                .ident = "HP t5710",
+                .matches = {
+                        DMI_MATCH(DMI_SYS_VENDOR, "Hewlett-Packard"),
+                        DMI_MATCH(DMI_PRODUCT_NAME, "hp t5000 series"),
+                        DMI_MATCH(DMI_BOARD_NAME, "098Ch"),
+                },
+        },
+        { }
+};
+
+struct prt_quirk {
+        struct dmi_system_id    *system;
+        unsigned int            segment;
+        unsigned int            bus;
+        unsigned int            device;
+        unsigned char           pin;
+        char                    *source;        /* according to BIOS */
+        char                    *actual_source;
+};
+
+/*
+ * These systems have incorrect _PRT entries.  The BIOS claims the PCI
+ * interrupt at the listed segment/bus/device/pin is connected to the first
+ * link device, but it is actually connected to the second.
+ */
+static struct prt_quirk prt_quirks[] = {
+        { medion_md9580, 0, 0, 9, 'A',
+                "\\_SB_.PCI0.ISA_.LNKA",
+                "\\_SB_.PCI0.ISA_.LNKB"},
+        { dell_optiplex, 0, 0, 0xd, 'A',
+                "\\_SB_.LNKB",
+                "\\_SB_.LNKA"},
+        { hp_t5710, 0, 0, 1, 'A',
+                "\\_SB_.PCI0.LNK1",
+                "\\_SB_.PCI0.LNK3"},
+};
+
+static void
+do_prt_fixups(struct acpi_prt_entry *entry, struct acpi_pci_routing_table *prt)
+{
+        int i;
+        struct prt_quirk *quirk;
+
+        for (i = 0; i < ARRAY_SIZE(prt_quirks); i++) {
+                quirk = &prt_quirks[i];
+
+                /* All current quirks involve link devices, not GSIs */
+                if (!prt->source)
+                        continue;
+
+                if (dmi_check_system(quirk->system) &&
+                    entry->id.segment == quirk->segment &&
+                    entry->id.bus == quirk->bus &&
+                    entry->id.device == quirk->device &&
+                    entry->pin + 'A' == quirk->pin &&
+                    !strcmp(prt->source, quirk->source) &&
+                    strlen(prt->source) >= strlen(quirk->actual_source)) {
+                        printk(KERN_WARNING PREFIX "firmware reports "
+                                "%04x:%02x:%02x[%c] connected to %s; "
+                                "changing to %s\n",
+                                entry->id.segment, entry->id.bus,
+                                entry->id.device, 'A' + entry->pin,
+                                prt->source, quirk->actual_source);
+                        strcpy(prt->source, quirk->actual_source);
+                }
+        }
+}
+
 static int
 acpi_pci_irq_add_entry(acpi_handle handle,
                        int segment, int bus, struct acpi_pci_routing_table *prt)
@@ -96,6 +192,8 @@ acpi_pci_irq_add_entry(acpi_handle handle,
         entry->id.function = prt->address & 0xFFFF;
         entry->pin = prt->pin;
 
+        do_prt_fixups(entry, prt);
+
         /*
          * Type 1: Dynamic
          * ---------------
diff --git a/drivers/acpi/pci_root.c b/drivers/acpi/pci_root.c
index f14ff1ffab29..c3fed31166b5 100644
--- a/drivers/acpi/pci_root.c
+++ b/drivers/acpi/pci_root.c
@@ -184,7 +184,7 @@ static void acpi_pci_bridge_scan(struct acpi_device *device)
                 }
 }
 
-static int acpi_pci_root_add(struct acpi_device *device)
+static int __devinit acpi_pci_root_add(struct acpi_device *device)
 {
         int result = 0;
         struct acpi_pci_root *root = NULL;
diff --git a/drivers/acpi/processor_core.c b/drivers/acpi/processor_core.c
index a3cc8a98255c..36a68fa114e3 100644
--- a/drivers/acpi/processor_core.c
+++ b/drivers/acpi/processor_core.c
@@ -840,17 +840,19 @@ static int is_processor_present(acpi_handle handle)
 
 
         status = acpi_evaluate_integer(handle, "_STA", NULL, &sta);
-        /*
-         * if a processor object does not have an _STA object,
-         * OSPM assumes that the processor is present.
-         */
-        if (status == AE_NOT_FOUND)
-                return 1;
 
         if (ACPI_SUCCESS(status) && (sta & ACPI_STA_DEVICE_PRESENT))
                 return 1;
 
-        ACPI_EXCEPTION((AE_INFO, status, "Processor Device is not present"));
+        /*
+         * _STA is mandatory for a processor that supports hot plug
+         */
+        if (status == AE_NOT_FOUND)
+                ACPI_DEBUG_PRINT((ACPI_DB_INFO,
+                                "Processor does not support hot plug\n"));
+        else
+                ACPI_EXCEPTION((AE_INFO, status,
+                                "Processor Device is not present"));
         return 0;
 }
 
@@ -886,8 +888,8 @@ int acpi_processor_device_add(acpi_handle handle, struct acpi_device **device)
         return 0;
 }
 
-static void
-acpi_processor_hotplug_notify(acpi_handle handle, u32 event, void *data)
+static void __ref acpi_processor_hotplug_notify(acpi_handle handle,
+                                                u32 event, void *data)
 {
         struct acpi_processor *pr;
         struct acpi_device *device = NULL;
@@ -897,9 +899,10 @@ acpi_processor_hotplug_notify(acpi_handle handle, u32 event, void *data)
         switch (event) {
         case ACPI_NOTIFY_BUS_CHECK:
         case ACPI_NOTIFY_DEVICE_CHECK:
-                printk("Processor driver received %s event\n",
+                ACPI_DEBUG_PRINT((ACPI_DB_INFO,
+                "Processor driver received %s event\n",
                        (event == ACPI_NOTIFY_BUS_CHECK) ?
-                       "ACPI_NOTIFY_BUS_CHECK" : "ACPI_NOTIFY_DEVICE_CHECK");
+                       "ACPI_NOTIFY_BUS_CHECK" : "ACPI_NOTIFY_DEVICE_CHECK"));
 
                 if (!is_processor_present(handle))
                         break;
diff --git a/drivers/acpi/processor_idle.c b/drivers/acpi/processor_idle.c
index 6f3b217699e9..788da9781f80 100644
--- a/drivers/acpi/processor_idle.c
+++ b/drivers/acpi/processor_idle.c
@@ -216,8 +216,10 @@ static void acpi_safe_halt(void)
          * test NEED_RESCHED:
          */
         smp_mb();
-        if (!need_resched())
+        if (!need_resched()) {
                 safe_halt();
+                local_irq_disable();
+        }
         current_thread_info()->status |= TS_POLLING;
 }
 
@@ -421,7 +423,9 @@ static void acpi_processor_idle(void)
                 else
                         acpi_safe_halt();
 
-                local_irq_enable();
+                if (irqs_disabled())
+                        local_irq_enable();
+
                 return;
         }
 
@@ -530,7 +534,9 @@ static void acpi_processor_idle(void)
                  *       skew otherwise.
                  */
                 sleep_ticks = 0xFFFFFFFF;
-                local_irq_enable();
+                if (irqs_disabled())
+                        local_irq_enable();
+
                 break;
 
         case ACPI_STATE_C2:
@@ -1481,7 +1487,6 @@ static int acpi_idle_enter_simple(struct cpuidle_device *dev,
                 return 0;
         }
 
-        acpi_unlazy_tlb(smp_processor_id());
         /*
          * Must be done before busmaster disable as we might need to
          * access HPET !
@@ -1571,6 +1576,8 @@ static int acpi_idle_enter_bm(struct cpuidle_device *dev,
                 return 0;
         }
 
+        acpi_unlazy_tlb(smp_processor_id());
+
         /* Tell the scheduler that we are going deep-idle: */
         sched_clock_idle_sleep_event();
         /*
@@ -1686,7 +1693,9 @@ static int acpi_processor_setup_cpuidle(struct acpi_processor *pr)
                 switch (cx->type) {
                         case ACPI_STATE_C1:
                         state->flags |= CPUIDLE_FLAG_SHALLOW;
-                        state->flags |= CPUIDLE_FLAG_TIME_VALID;
+                        if (cx->entry_method == ACPI_CSTATE_FFH)
+                                state->flags |= CPUIDLE_FLAG_TIME_VALID;
+
                         state->enter = acpi_idle_enter_c1;
                         dev->safe_state = state;
                         break;
diff --git a/drivers/acpi/sbshc.c b/drivers/acpi/sbshc.c
index a2cf3008ce6c..bcf2c70fca87 100644
--- a/drivers/acpi/sbshc.c
+++ b/drivers/acpi/sbshc.c
@@ -130,7 +130,6 @@ static int acpi_smbus_transaction(struct acpi_smb_hc *hc, u8 protocol,
                 goto end;
         }
         smb_hc_write(hc, ACPI_SMB_COMMAND, command);
-        smb_hc_write(hc, ACPI_SMB_COMMAND, command);
         if (!(protocol & 0x01)) {
                 smb_hc_write(hc, ACPI_SMB_BLOCK_COUNT, length);
                 for (i = 0; i < length; ++i)
diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c
index 3fac011f9cf9..e6ce262b5d44 100644
--- a/drivers/acpi/scan.c
+++ b/drivers/acpi/scan.c
@@ -39,20 +39,26 @@ static int create_modalias(struct acpi_device *acpi_dev, char *modalias,
                            int size)
 {
         int len;
+        int count;
 
-        if (!acpi_dev->flags.hardware_id)
+        if (!acpi_dev->flags.hardware_id && !acpi_dev->flags.compatible_ids)
                 return -ENODEV;
 
-        len = snprintf(modalias, size, "acpi:%s:",
-                       acpi_dev->pnp.hardware_id);
-        if (len < 0 || len >= size)
-                return -EINVAL;
+        len = snprintf(modalias, size, "acpi:");
         size -= len;
 
+        if (acpi_dev->flags.hardware_id) {
+                count = snprintf(&modalias[len], size, "%s:",
+                                 acpi_dev->pnp.hardware_id);
+                if (count < 0 || count >= size)
+                        return -EINVAL;
+                len += count;
+                size -= count;
+        }
+
         if (acpi_dev->flags.compatible_ids) {
                 struct acpi_compatible_id_list *cid_list;
                 int i;
-                int count;
 
                 cid_list = acpi_dev->pnp.cid_list;
                 for (i = 0; i < cid_list->count; i++) {
@@ -609,7 +615,8 @@ acpi_bus_get_ejd(acpi_handle handle, acpi_handle *ejd)
         status = acpi_evaluate_object(handle, "_EJD", NULL, &buffer);
         if (ACPI_SUCCESS(status)) {
                 obj = buffer.pointer;
-                status = acpi_get_handle(NULL, obj->string.pointer, ejd);
+                status = acpi_get_handle(ACPI_ROOT_OBJECT, obj->string.pointer,
+                                         ejd);
                 kfree(buffer.pointer);
         }
         return status;
@@ -966,7 +973,7 @@ static void acpi_device_set_id(struct acpi_device *device,
         case ACPI_BUS_TYPE_DEVICE:
                 status = acpi_get_object_info(handle, &buffer);
                 if (ACPI_FAILURE(status)) {
-                        printk(KERN_ERR PREFIX "%s: Error reading device info\n", __FUNCTION__);
+                        printk(KERN_ERR PREFIX "%s: Error reading device info\n", __func__);
                         return;
                 }
 
diff --git a/drivers/acpi/sleep/main.c b/drivers/acpi/sleep/main.c
index 293a1cbb47c0..d2f71a54726c 100644
--- a/drivers/acpi/sleep/main.c
+++ b/drivers/acpi/sleep/main.c
@@ -504,7 +504,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", __FUNCTION__);
+        printk("%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/system.c b/drivers/acpi/system.c
index 55cf4c05bb74..4749f379a915 100644
--- a/drivers/acpi/system.c
+++ b/drivers/acpi/system.c
@@ -319,7 +319,7 @@ void acpi_irq_stats_init(void)
                 goto fail;
 
         for (i = 0; i < num_counters; ++i) {
-                char buffer[10];
+                char buffer[12];
                 char *name;
 
                 if (i < num_gpes)
diff --git a/drivers/acpi/thermal.c b/drivers/acpi/thermal.c
index 8d4b79b4f933..c4e00ac8ea85 100644
--- a/drivers/acpi/thermal.c
+++ b/drivers/acpi/thermal.c
@@ -879,6 +879,8 @@ static void acpi_thermal_check(void *data)
 }
 
 /* sys I/F for generic thermal sysfs support */
+#define KELVIN_TO_MILLICELSIUS(t) (t * 100 - 273200)
+
 static int thermal_get_temp(struct thermal_zone_device *thermal, char *buf)
 {
         struct acpi_thermal *tz = thermal->devdata;
@@ -886,7 +888,7 @@ static int thermal_get_temp(struct thermal_zone_device *thermal, char *buf)
         if (!tz)
                 return -EINVAL;
 
-        return sprintf(buf, "%ld\n", KELVIN_TO_CELSIUS(tz->temperature));
+        return sprintf(buf, "%ld\n", KELVIN_TO_MILLICELSIUS(tz->temperature));
 }
 
 static const char enabled[] = "kernel";
@@ -980,21 +982,21 @@ static int thermal_get_trip_temp(struct thermal_zone_device *thermal,
 
         if (tz->trips.critical.flags.valid) {
                 if (!trip)
-                        return sprintf(buf, "%ld\n", KELVIN_TO_CELSIUS(
+                        return sprintf(buf, "%ld\n", KELVIN_TO_MILLICELSIUS(
                                 tz->trips.critical.temperature));
                 trip--;
         }
 
         if (tz->trips.hot.flags.valid) {
                 if (!trip)
-                        return sprintf(buf, "%ld\n", KELVIN_TO_CELSIUS(
+                        return sprintf(buf, "%ld\n", KELVIN_TO_MILLICELSIUS(
                                         tz->trips.hot.temperature));
                 trip--;
         }
 
         if (tz->trips.passive.flags.valid) {
                 if (!trip)
-                        return sprintf(buf, "%ld\n", KELVIN_TO_CELSIUS(
+                        return sprintf(buf, "%ld\n", KELVIN_TO_MILLICELSIUS(
                                         tz->trips.passive.temperature));
                 trip--;
         }
@@ -1002,7 +1004,7 @@ static int thermal_get_trip_temp(struct thermal_zone_device *thermal,
         for (i = 0; i < ACPI_THERMAL_MAX_ACTIVE &&
                 tz->trips.active[i].flags.valid; i++) {
                 if (!trip)
-                        return sprintf(buf, "%ld\n", KELVIN_TO_CELSIUS(
+                        return sprintf(buf, "%ld\n", KELVIN_TO_MILLICELSIUS(
                                         tz->trips.active[i].temperature));
                 trip--;
         }
diff --git a/drivers/acpi/toshiba_acpi.c b/drivers/acpi/toshiba_acpi.c
index 9e8c20c6a0b7..0a43c8e0eff3 100644
--- a/drivers/acpi/toshiba_acpi.c
+++ b/drivers/acpi/toshiba_acpi.c
@@ -99,6 +99,13 @@ MODULE_LICENSE("GPL");
 #define HCI_VIDEO_OUT_CRT               0x2
 #define HCI_VIDEO_OUT_TV                0x4
 
+static const struct acpi_device_id toshiba_device_ids[] = {
+        {"TOS6200", 0},
+        {"TOS1900", 0},
+        {"", 0},
+};
+MODULE_DEVICE_TABLE(acpi, toshiba_device_ids);
+
 /* utility
  */
 
diff --git a/drivers/acpi/utilities/utdebug.c b/drivers/acpi/utilities/utdebug.c
index c7e128e5369b..7361204b1eef 100644
--- a/drivers/acpi/utilities/utdebug.c
+++ b/drivers/acpi/utilities/utdebug.c
@@ -109,7 +109,7 @@ void acpi_ut_track_stack_ptr(void)
  * RETURN:      Updated pointer to the function name
  *
  * DESCRIPTION: Remove the "Acpi" prefix from the function name, if present.
- *              This allows compiler macros such as __FUNCTION__ to be used
+ *              This allows compiler macros such as __func__ to be used
  *              with no change to the debug output.
  *
  ******************************************************************************/
diff --git a/drivers/acpi/utilities/utobject.c b/drivers/acpi/utilities/utobject.c
index 76ee766c84f9..e08b3fa6639f 100644
--- a/drivers/acpi/utilities/utobject.c
+++ b/drivers/acpi/utilities/utobject.c
@@ -432,7 +432,7 @@ acpi_ut_get_simple_object_size(union acpi_operand_object *internal_object,
          * element -- which is legal)
          */
         if (!internal_object) {
-                *obj_length = 0;
+                *obj_length = sizeof(union acpi_object);
                 return_ACPI_STATUS(AE_OK);
         }
 
diff --git a/drivers/acpi/utils.c b/drivers/acpi/utils.c
index eba55b7d6c95..44ea60cf21c0 100644
--- a/drivers/acpi/utils.c
+++ b/drivers/acpi/utils.c
@@ -407,6 +407,12 @@ acpi_evaluate_reference(acpi_handle handle,
                         break;
                 }
 
+                if (!element->reference.handle) {
+                        printk(KERN_WARNING PREFIX "Invalid reference in"
+                               " package %s\n", pathname);
+                        status = AE_NULL_ENTRY;
+                        break;
+                }
                 /* Get the  acpi_handle. */
 
                 list->handles[i] = element->reference.handle;
diff --git a/drivers/acpi/video.c b/drivers/acpi/video.c
index 12cce69b5441..12fb44f16766 100644
--- a/drivers/acpi/video.c
+++ b/drivers/acpi/video.c
@@ -713,7 +713,7 @@ static void acpi_video_device_find_cap(struct acpi_video_device *device)
 
         kfree(obj);
 
-        if (device->cap._BCL && device->cap._BCM && device->cap._BQC && max_level > 0){
+        if (device->cap._BCL && device->cap._BCM && max_level > 0) {
                 int result;
                 static int count = 0;
                 char *name;
@@ -807,40 +807,11 @@ static void acpi_video_bus_find_cap(struct acpi_video_bus *video)
 static int acpi_video_bus_check(struct acpi_video_bus *video)
 {
         acpi_status status = -ENOENT;
-        long device_id;
-        struct device *dev;
-        struct acpi_device *device;
+
 
         if (!video)
                 return -EINVAL;
 
-        device = video->device;
-
-        status =
-            acpi_evaluate_integer(device->handle, "_ADR", NULL, &device_id);
-
-        if (!ACPI_SUCCESS(status))
-                return -ENODEV;
-
-        /* We need to attempt to determine whether the _ADR refers to a
-           PCI device or not. There's no terribly good way to do this,
-           so the best we can hope for is to assume that there'll never
-           be a video device in the host bridge */
-        if (device_id >= 0x10000) {
-                /* It looks like a PCI device. Does it exist? */
-                dev = acpi_get_physical_device(device->handle);
-        } else {
-                /* It doesn't look like a PCI device. Does its parent
-                   exist? */
-                acpi_handle phandle;
-                if (acpi_get_parent(device->handle, &phandle))
-                        return -ENODEV;
-                dev = acpi_get_physical_device(phandle);
-        }
-        if (!dev)
-                return -ENODEV;
-        put_device(dev);
-
         /* Since there is no HID, CID and so on for VGA driver, we have
          * to check well known required nodes.
          */
@@ -1201,7 +1172,7 @@ static int acpi_video_bus_ROM_seq_show(struct seq_file *seq, void *offset)
         if (!video)
                 goto end;
 
-        printk(KERN_INFO PREFIX "Please implement %s\n", __FUNCTION__);
+        printk(KERN_INFO PREFIX "Please implement %s\n", __func__);
         seq_printf(seq, "<TODO>\n");
 
       end:
@@ -1366,37 +1337,8 @@ acpi_video_bus_write_DOS(struct file *file,
 
 static int acpi_video_bus_add_fs(struct acpi_device *device)
 {
-        long device_id;
-        int status;
         struct proc_dir_entry *entry = NULL;
         struct acpi_video_bus *video;
-        struct device *dev;
-
-        status =
-            acpi_evaluate_integer(device->handle, "_ADR", NULL, &device_id);
-
-        if (!ACPI_SUCCESS(status))
-                return -ENODEV;
-
-        /* We need to attempt to determine whether the _ADR refers to a
-           PCI device or not. There's no terribly good way to do this,
-           so the best we can hope for is to assume that there'll never
-           be a video device in the host bridge */
-        if (device_id >= 0x10000) {
-                /* It looks like a PCI device. Does it exist? */
-                dev = acpi_get_physical_device(device->handle);
-        } else {
-                /* It doesn't look like a PCI device. Does its parent
-                   exist? */
-                acpi_handle phandle;
-                if (acpi_get_parent(device->handle, &phandle))
-                        return -ENODEV;
-                dev = acpi_get_physical_device(phandle);
-        }
-        if (!dev)
-                return -ENODEV;
-        put_device(dev);
-
 
 
         video = acpi_driver_data(device);
diff --git a/drivers/acpi/wmi.c b/drivers/acpi/wmi.c
index efacc9f8bfe3..c33b1c6e93b1 100644
--- a/drivers/acpi/wmi.c
+++ b/drivers/acpi/wmi.c
@@ -293,7 +293,7 @@ struct acpi_buffer *out)
 {
         struct guid_block *block = NULL;
         struct wmi_block *wblock = NULL;
-        acpi_handle handle;
+        acpi_handle handle, wc_handle;
         acpi_status status, wc_status = AE_ERROR;
         struct acpi_object_list input, wc_input;
         union acpi_object wc_params[1], wq_params[1];
@@ -338,8 +338,10 @@ struct acpi_buffer *out)
                  * expensive, but have no corresponding WCxx method. So we
                  * should not fail if this happens.
                  */
-                wc_status = acpi_evaluate_object(handle, wc_method,
-                        &wc_input, NULL);
+                wc_status = acpi_get_handle(handle, wc_method, &wc_handle);
+                if (ACPI_SUCCESS(wc_status))
+                        wc_status = acpi_evaluate_object(handle, wc_method,
+                                &wc_input, NULL);
         }
 
         strcpy(method, "WQ");
@@ -351,7 +353,7 @@ struct acpi_buffer *out)
          * If ACPI_WMI_EXPENSIVE, call the relevant WCxx method, even if
          * the WQxx method failed - we should disable collection anyway.
          */
-        if ((block->flags & ACPI_WMI_EXPENSIVE) && wc_status) {
+        if ((block->flags & ACPI_WMI_EXPENSIVE) && ACPI_SUCCESS(wc_status)) {
                 wc_params[0].integer.value = 0;
                 status = acpi_evaluate_object(handle,
                 wc_method, &wc_input, NULL);
diff --git a/drivers/ata/Kconfig b/drivers/ata/Kconfig
index e469647330de..25aba69b59b4 100644
--- a/drivers/ata/Kconfig
+++ b/drivers/ata/Kconfig
@@ -30,6 +30,7 @@ config ATA_NONSTANDARD
 config ATA_ACPI
         bool
         depends on ACPI && PCI
+        select ACPI_DOCK
         default y
         help
           This option adds support for ATA-related ACPI objects.
diff --git a/drivers/ata/ahci.c b/drivers/ata/ahci.c
index 6978469eb16d..b1eb4e24c86a 100644
--- a/drivers/ata/ahci.c
+++ b/drivers/ata/ahci.c
@@ -49,6 +49,10 @@
 #define DRV_NAME        "ahci"
 #define DRV_VERSION     "3.0"
 
+static int ahci_skip_host_reset;
+module_param_named(skip_host_reset, ahci_skip_host_reset, int, 0444);
+MODULE_PARM_DESC(skip_host_reset, "skip global host reset (0=don't skip, 1=skip)");
+
 static int ahci_enable_alpm(struct ata_port *ap,
                 enum link_pm policy);
 static void ahci_disable_alpm(struct ata_port *ap);
@@ -429,6 +433,7 @@ static const struct ata_port_info ahci_port_info[] = {
         /* board_ahci_sb600 */
         {
                 AHCI_HFLAGS     (AHCI_HFLAG_IGN_SERR_INTERNAL |
+                                 AHCI_HFLAG_32BIT_ONLY |
                                  AHCI_HFLAG_SECT255 | AHCI_HFLAG_NO_PMP),
                 .flags          = AHCI_FLAG_COMMON,
                 .link_flags     = AHCI_LFLAG_COMMON,
@@ -587,6 +592,7 @@ static const struct pci_device_id ahci_pci_tbl[] = {
 
         /* Marvell */
         { PCI_VDEVICE(MARVELL, 0x6145), board_ahci_mv },        /* 6145 */
+        { PCI_VDEVICE(MARVELL, 0x6121), board_ahci_mv },        /* 6121 */
 
         /* Generic, PCI class code for AHCI */
         { PCI_ANY_ID, PCI_ANY_ID, PCI_ANY_ID, PCI_ANY_ID,
@@ -661,6 +667,7 @@ static void ahci_save_initial_config(struct pci_dev *pdev,
         void __iomem *mmio = pcim_iomap_table(pdev)[AHCI_PCI_BAR];
         u32 cap, port_map;
         int i;
+        int mv;
 
         /* make sure AHCI mode is enabled before accessing CAP */
         ahci_enable_ahci(mmio);
@@ -696,12 +703,16 @@ static void ahci_save_initial_config(struct pci_dev *pdev,
          * presence register, as bit 4 (counting from 0)
          */
         if (hpriv->flags & AHCI_HFLAG_MV_PATA) {
+                if (pdev->device == 0x6121)
+                        mv = 0x3;
+                else
+                        mv = 0xf;
                 dev_printk(KERN_ERR, &pdev->dev,
                            "MV_AHCI HACK: port_map %x -> %x\n",
-                           hpriv->port_map,
-                           hpriv->port_map & 0xf);
+                           port_map,
+                           port_map & mv);
 
-                port_map &= 0xf;
+                port_map &= mv;
         }
 
         /* cross check port_map and cap.n_ports */
@@ -1088,29 +1099,35 @@ static int ahci_reset_controller(struct ata_host *host)
         ahci_enable_ahci(mmio);
 
         /* global controller reset */
-        tmp = readl(mmio + HOST_CTL);
-        if ((tmp & HOST_RESET) == 0) {
-                writel(tmp | HOST_RESET, mmio + HOST_CTL);
-                readl(mmio + HOST_CTL); /* flush */
-        }
+        if (!ahci_skip_host_reset) {
+                tmp = readl(mmio + HOST_CTL);
+                if ((tmp & HOST_RESET) == 0) {
+                        writel(tmp | HOST_RESET, mmio + HOST_CTL);
+                        readl(mmio + HOST_CTL); /* flush */
+                }
 
-        /* reset must complete within 1 second, or
-         * the hardware should be considered fried.
-         */
-        ssleep(1);
+                /* reset must complete within 1 second, or
+                 * the hardware should be considered fried.
+                 */
+                ssleep(1);
 
-        tmp = readl(mmio + HOST_CTL);
-        if (tmp & HOST_RESET) {
-                dev_printk(KERN_ERR, host->dev,
-                           "controller reset failed (0x%x)\n", tmp);
-                return -EIO;
-        }
+                tmp = readl(mmio + HOST_CTL);
+                if (tmp & HOST_RESET) {
+                        dev_printk(KERN_ERR, host->dev,
+                                   "controller reset failed (0x%x)\n", tmp);
+                        return -EIO;
+                }
 
-        /* turn on AHCI mode */
-        ahci_enable_ahci(mmio);
+                /* turn on AHCI mode */
+                ahci_enable_ahci(mmio);
 
-        /* some registers might be cleared on reset.  restore initial values */
-        ahci_restore_initial_config(host);
+                /* Some registers might be cleared on reset.  Restore
+                 * initial values.
+                 */
+                ahci_restore_initial_config(host);
+        } else
+                dev_printk(KERN_INFO, host->dev,
+                           "skipping global host reset\n");
 
         if (pdev->vendor == PCI_VENDOR_ID_INTEL) {
                 u16 tmp16;
@@ -1162,9 +1179,14 @@ static void ahci_init_controller(struct ata_host *host)
         int i;
         void __iomem *port_mmio;
         u32 tmp;
+        int mv;
 
         if (hpriv->flags & AHCI_HFLAG_MV_PATA) {
-                port_mmio = __ahci_port_base(host, 4);
+                if (pdev->device == 0x6121)
+                        mv = 2;
+                else
+                        mv = 4;
+                port_mmio = __ahci_port_base(host, mv);
 
                 writel(0, port_mmio + PORT_IRQ_MASK);
 
@@ -1196,8 +1218,11 @@ static void ahci_dev_config(struct ata_device *dev)
 {
         struct ahci_host_priv *hpriv = dev->link->ap->host->private_data;
 
-        if (hpriv->flags & AHCI_HFLAG_SECT255)
+        if (hpriv->flags & AHCI_HFLAG_SECT255) {
                 dev->max_sectors = 255;
+                ata_dev_printk(dev, KERN_INFO,
+                               "SB600 AHCI: limiting to 255 sectors per cmd\n");
+        }
 }
 
 static unsigned int ahci_dev_classify(struct ata_port *ap)
@@ -2241,7 +2266,10 @@ static int ahci_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
         if (rc)
                 return rc;
 
-        rc = pcim_iomap_regions(pdev, 1 << AHCI_PCI_BAR, DRV_NAME);
+        /* AHCI controllers often implement SFF compatible interface.
+         * Grab all PCI BARs just in case.
+         */
+        rc = pcim_iomap_regions_request_all(pdev, 1 << AHCI_PCI_BAR, DRV_NAME);
         if (rc == -EBUSY)
                 pcim_pin_device(pdev);
         if (rc)
diff --git a/drivers/ata/libata-acpi.c b/drivers/ata/libata-acpi.c
index 0770cb7391a4..bf98a566adac 100644
--- a/drivers/ata/libata-acpi.c
+++ b/drivers/ata/libata-acpi.c
@@ -118,45 +118,77 @@ static void ata_acpi_associate_ide_port(struct ata_port *ap)
                 ap->pflags |= ATA_PFLAG_INIT_GTM_VALID;
 }
 
-static void ata_acpi_handle_hotplug(struct ata_port *ap, struct kobject *kobj,
+static void ata_acpi_handle_hotplug(struct ata_port *ap, struct ata_device *dev,
                                     u32 event)
 {
         char event_string[12];
         char *envp[] = { event_string, NULL };
-        struct ata_eh_info *ehi = &ap->link.eh_info;
-
-        if (event == 0 || event == 1) {
-               unsigned long flags;
-               spin_lock_irqsave(ap->lock, flags);
-               ata_ehi_clear_desc(ehi);
-               ata_ehi_push_desc(ehi, "ACPI event");
-               ata_ehi_hotplugged(ehi);
-               ata_port_freeze(ap);
-               spin_unlock_irqrestore(ap->lock, flags);
+        struct ata_eh_info *ehi;
+        struct kobject *kobj = NULL;
+        int wait = 0;
+        unsigned long flags;
+
+        if (!ap)
+                ap = dev->link->ap;
+        ehi = &ap->link.eh_info;
+
+        spin_lock_irqsave(ap->lock, flags);
+
+        switch (event) {
+        case ACPI_NOTIFY_BUS_CHECK:
+        case ACPI_NOTIFY_DEVICE_CHECK:
+                ata_ehi_push_desc(ehi, "ACPI event");
+                ata_ehi_hotplugged(ehi);
+                ata_port_freeze(ap);
+                break;
+
+        case ACPI_NOTIFY_EJECT_REQUEST:
+                ata_ehi_push_desc(ehi, "ACPI event");
+                if (dev)
+                        dev->flags |= ATA_DFLAG_DETACH;
+                else {
+                        struct ata_link *tlink;
+                        struct ata_device *tdev;
+
+                        ata_port_for_each_link(tlink, ap)
+                                ata_link_for_each_dev(tdev, tlink)
+                                        tdev->flags |= ATA_DFLAG_DETACH;
+                }
+
+                ata_port_schedule_eh(ap);
+                wait = 1;
+                break;
         }
 
+        if (dev) {
+                if (dev->sdev)
+                        kobj = &dev->sdev->sdev_gendev.kobj;
+        } else
+                kobj = &ap->dev->kobj;
+
         if (kobj) {
                 sprintf(event_string, "BAY_EVENT=%d", event);
                 kobject_uevent_env(kobj, KOBJ_CHANGE, envp);
         }
+
+        spin_unlock_irqrestore(ap->lock, flags);
+
+        if (wait)
+                ata_port_wait_eh(ap);
 }
 
 static void ata_acpi_dev_notify(acpi_handle handle, u32 event, void *data)
 {
         struct ata_device *dev = data;
-        struct kobject *kobj = NULL;
 
-        if (dev->sdev)
-                kobj = &dev->sdev->sdev_gendev.kobj;
-
-        ata_acpi_handle_hotplug(dev->link->ap, kobj, event);
+        ata_acpi_handle_hotplug(NULL, dev, event);
 }
 
 static void ata_acpi_ap_notify(acpi_handle handle, u32 event, void *data)
 {
         struct ata_port *ap = data;
 
-        ata_acpi_handle_hotplug(ap, &ap->dev->kobj, event);
+        ata_acpi_handle_hotplug(ap, NULL, event);
 }
 
 /**
@@ -191,20 +223,30 @@ void ata_acpi_associate(struct ata_host *host)
                 else
                         ata_acpi_associate_ide_port(ap);
 
-                if (ap->acpi_handle)
-                        acpi_install_notify_handler (ap->acpi_handle,
-                                                     ACPI_SYSTEM_NOTIFY,
-                                                     ata_acpi_ap_notify,
-                                                     ap);
+                if (ap->acpi_handle) {
+                        acpi_install_notify_handler(ap->acpi_handle,
+                                                    ACPI_SYSTEM_NOTIFY,
+                                                    ata_acpi_ap_notify, ap);
+#if defined(CONFIG_ACPI_DOCK) || defined(CONFIG_ACPI_DOCK_MODULE)
+                        /* we might be on a docking station */
+                        register_hotplug_dock_device(ap->acpi_handle,
+                                                     ata_acpi_ap_notify, ap);
+#endif
+                }
 
                 for (j = 0; j < ata_link_max_devices(&ap->link); j++) {
                         struct ata_device *dev = &ap->link.device[j];
 
-                        if (dev->acpi_handle)
-                                acpi_install_notify_handler (dev->acpi_handle,
-                                                             ACPI_SYSTEM_NOTIFY,
-                                                             ata_acpi_dev_notify,
-                                                             dev);
+                        if (dev->acpi_handle) {
+                                acpi_install_notify_handler(dev->acpi_handle,
+                                                ACPI_SYSTEM_NOTIFY,
+                                                ata_acpi_dev_notify, dev);
+#if defined(CONFIG_ACPI_DOCK) || defined(CONFIG_ACPI_DOCK_MODULE)
+                                /* we might be on a docking station */
+                                register_hotplug_dock_device(dev->acpi_handle,
+                                                ata_acpi_dev_notify, dev);
+#endif
+                        }
                 }
         }
 }
diff --git a/drivers/ata/libata-core.c b/drivers/ata/libata-core.c
index 4bbe31f98ef8..48519887f94a 100644
--- a/drivers/ata/libata-core.c
+++ b/drivers/ata/libata-core.c
@@ -972,7 +972,7 @@ static void ata_dev_disable_pm(struct ata_device *dev)
 void ata_lpm_schedule(struct ata_port *ap, enum link_pm policy)
 {
         ap->pm_policy = policy;
-        ap->link.eh_info.action |= ATA_EHI_LPM;
+        ap->link.eh_info.action |= ATA_EH_LPM;
         ap->link.eh_info.flags |= ATA_EHI_NO_AUTOPSY;
         ata_port_schedule_eh(ap);
 }
@@ -1416,12 +1416,12 @@ static int ata_hpa_resize(struct ata_device *dev)
         /* read native max address */
         rc = ata_read_native_max_address(dev, &native_sectors);
         if (rc) {
-                /* If HPA isn't going to be unlocked, skip HPA
-                 * resizing from the next try.
+                /* If device aborted the command or HPA isn't going to
+                 * be unlocked, skip HPA resizing.
                  */
-                if (!ata_ignore_hpa) {
+                if (rc == -EACCES || !ata_ignore_hpa) {
                         ata_dev_printk(dev, KERN_WARNING, "HPA support seems "
-                                       "broken, will skip HPA handling\n");
+                                       "broken, skipping HPA handling\n");
                         dev->horkage |= ATA_HORKAGE_BROKEN_HPA;
 
                         /* we can continue if device aborted the command */
@@ -2092,24 +2092,34 @@ int ata_dev_read_id(struct ata_device *dev, unsigned int *p_class,
                                      id, sizeof(id[0]) * ATA_ID_WORDS, 0);
         if (err_mask) {
                 if (err_mask & AC_ERR_NODEV_HINT) {
-                        DPRINTK("ata%u.%d: NODEV after polling detection\n",
-                                ap->print_id, dev->devno);
+                        ata_dev_printk(dev, KERN_DEBUG,
+                                       "NODEV after polling detection\n");
                         return -ENOENT;
                 }
 
-                /* Device or controller might have reported the wrong
-                 * device class.  Give a shot at the other IDENTIFY if
-                 * the current one is aborted by the device.
-                 */
-                if (may_fallback &&
-                    (err_mask == AC_ERR_DEV) && (tf.feature & ATA_ABORTED)) {
-                        may_fallback = 0;
+                if ((err_mask == AC_ERR_DEV) && (tf.feature & ATA_ABORTED)) {
+                        /* Device or controller might have reported
+                         * the wrong device class.  Give a shot at the
+                         * other IDENTIFY if the current one is
+                         * aborted by the device.
+                         */
+                        if (may_fallback) {
+                                may_fallback = 0;
 
-                        if (class == ATA_DEV_ATA)
-                                class = ATA_DEV_ATAPI;
-                        else
-                                class = ATA_DEV_ATA;
-                        goto retry;
+                                if (class == ATA_DEV_ATA)
+                                        class = ATA_DEV_ATAPI;
+                                else
+                                        class = ATA_DEV_ATA;
+                                goto retry;
+                        }
+
+                        /* Control reaches here iff the device aborted
+                         * both flavors of IDENTIFYs which happens
+                         * sometimes with phantom devices.
+                         */
+                        ata_dev_printk(dev, KERN_DEBUG,
+                                       "both IDENTIFYs aborted, assuming NODEV\n");
+                        return -ENOENT;
                 }
 
                 rc = -EIO;
diff --git a/drivers/ata/libata-eh.c b/drivers/ata/libata-eh.c
index 681252fd8143..a5830329eda4 100644
--- a/drivers/ata/libata-eh.c
+++ b/drivers/ata/libata-eh.c
@@ -2748,7 +2748,7 @@ int ata_eh_recover(struct ata_port *ap, ata_prereset_fn_t prereset,
                         ehc->i.flags &= ~ATA_EHI_SETMODE;
                 }
 
-                if (ehc->i.action & ATA_EHI_LPM)
+                if (ehc->i.action & ATA_EH_LPM)
                         ata_link_for_each_dev(dev, link)
                                 ata_dev_enable_pm(dev, ap->pm_policy);
 
diff --git a/drivers/ata/libata-scsi.c b/drivers/ata/libata-scsi.c
index 8f0e8f2bc628..15795394b0a8 100644
--- a/drivers/ata/libata-scsi.c
+++ b/drivers/ata/libata-scsi.c
@@ -527,6 +527,14 @@ static struct ata_queued_cmd *ata_scsi_qc_new(struct ata_device *dev,
         return qc;
 }
 
+static void ata_qc_set_pc_nbytes(struct ata_queued_cmd *qc)
+{
+        struct scsi_cmnd *scmd = qc->scsicmd;
+
+        qc->extrabytes = scmd->request->extra_len;
+        qc->nbytes = scsi_bufflen(scmd) + qc->extrabytes;
+}
+
 /**
  *      ata_dump_status - user friendly display of error info
  *      @id: id of the port in question
@@ -2539,7 +2547,7 @@ static unsigned int atapi_xlat(struct ata_queued_cmd *qc)
         }
 
         qc->tf.command = ATA_CMD_PACKET;
-        qc->nbytes = scsi_bufflen(scmd) + scmd->request->extra_len;
+        ata_qc_set_pc_nbytes(qc);
 
         /* check whether ATAPI DMA is safe */
         if (!using_pio && ata_check_atapi_dma(qc))
@@ -2550,7 +2558,7 @@ static unsigned int atapi_xlat(struct ata_queued_cmd *qc)
          * want to set it properly, and for DMA where it is
          * effectively meaningless.
          */
-        nbytes = min(scmd->request->data_len, (unsigned int)63 * 1024);
+        nbytes = min(ata_qc_raw_nbytes(qc), (unsigned int)63 * 1024);
 
         /* Most ATAPI devices which honor transfer chunk size don't
          * behave according to the spec when odd chunk size which
@@ -2876,7 +2884,7 @@ static unsigned int ata_scsi_pass_thru(struct ata_queued_cmd *qc)
          * TODO: find out if we need to do more here to
          *       cover scatter/gather case.
          */
-        qc->nbytes = scsi_bufflen(scmd) + scmd->request->extra_len;
+        ata_qc_set_pc_nbytes(qc);
 
         /* request result TF and be quiet about device error */
         qc->flags |= ATA_QCFLAG_RESULT_TF | ATA_QCFLAG_QUIET;
diff --git a/drivers/ata/pata_ali.c b/drivers/ata/pata_ali.c
index 7e68edf3c0f3..8786455c901d 100644
--- a/drivers/ata/pata_ali.c
+++ b/drivers/ata/pata_ali.c
@@ -295,7 +295,7 @@ static void ali_lock_sectors(struct ata_device *adev)
 static int ali_check_atapi_dma(struct ata_queued_cmd *qc)
 {
         /* If its not a media command, its not worth it */
-        if (qc->nbytes < 2048)
+        if (atapi_cmd_type(qc->cdb[0]) == ATAPI_MISC)
                 return -EOPNOTSUPP;
         return 0;
 }
diff --git a/drivers/ata/pata_it821x.c b/drivers/ata/pata_it821x.c
index 109ddd42c266..257951d03dbb 100644
--- a/drivers/ata/pata_it821x.c
+++ b/drivers/ata/pata_it821x.c
@@ -564,7 +564,7 @@ static int it821x_check_atapi_dma(struct ata_queued_cmd *qc)
         struct it821x_dev *itdev = ap->private_data;
 
         /* Only use dma for transfers to/from the media. */
-        if (qc->nbytes < 2048)
+        if (ata_qc_raw_nbytes(qc) < 2048)
                 return -EOPNOTSUPP;
 
         /* No ATAPI DMA in smart mode */
diff --git a/drivers/ata/pata_sil680.c b/drivers/ata/pata_sil680.c
index 503245a1eafa..3988e44f4934 100644
--- a/drivers/ata/pata_sil680.c
+++ b/drivers/ata/pata_sil680.c
@@ -269,7 +269,11 @@ static u8 sil680_init_chip(struct pci_dev *pdev, int *try_mmio)
         dev_dbg(&pdev->dev, "sil680: BA5_EN = %d clock = %02X\n",
                 tmpbyte & 1, tmpbyte & 0x30);
 
-        *try_mmio = (tmpbyte & 1) || pci_resource_start(pdev, 5);
+        *try_mmio = 0;
+#ifdef CONFIG_PPC
+        if (machine_is(cell))
+                *try_mmio = (tmpbyte & 1) || pci_resource_start(pdev, 5);
+#endif
 
         switch(tmpbyte & 0x30) {
                 case 0x00:
diff --git a/drivers/ata/sata_promise.c b/drivers/ata/sata_promise.c
index f251a5f569d5..11c1afea2db2 100644
--- a/drivers/ata/sata_promise.c
+++ b/drivers/ata/sata_promise.c
@@ -46,7 +46,7 @@
 #include "sata_promise.h"
 
 #define DRV_NAME        "sata_promise"
-#define DRV_VERSION     "2.11"
+#define DRV_VERSION     "2.12"
 
 enum {
         PDC_MAX_PORTS           = 4,
@@ -145,7 +145,9 @@ static int pdc_old_sata_check_atapi_dma(struct ata_queued_cmd *qc);
 static void pdc_irq_clear(struct ata_port *ap);
 static unsigned int pdc_qc_issue_prot(struct ata_queued_cmd *qc);
 static void pdc_freeze(struct ata_port *ap);
+static void pdc_sata_freeze(struct ata_port *ap);
 static void pdc_thaw(struct ata_port *ap);
+static void pdc_sata_thaw(struct ata_port *ap);
 static void pdc_pata_error_handler(struct ata_port *ap);
 static void pdc_sata_error_handler(struct ata_port *ap);
 static void pdc_post_internal_cmd(struct ata_queued_cmd *qc);
@@ -180,8 +182,8 @@ static const struct ata_port_operations pdc_sata_ops = {
 
         .qc_prep                = pdc_qc_prep,
         .qc_issue               = pdc_qc_issue_prot,
-        .freeze                 = pdc_freeze,
-        .thaw                   = pdc_thaw,
+        .freeze                 = pdc_sata_freeze,
+        .thaw                   = pdc_sata_thaw,
         .error_handler          = pdc_sata_error_handler,
         .post_internal_cmd      = pdc_post_internal_cmd,
         .cable_detect           = pdc_sata_cable_detect,
@@ -205,8 +207,8 @@ static const struct ata_port_operations pdc_old_sata_ops = {
 
         .qc_prep                = pdc_qc_prep,
         .qc_issue               = pdc_qc_issue_prot,
-        .freeze                 = pdc_freeze,
-        .thaw                   = pdc_thaw,
+        .freeze                 = pdc_sata_freeze,
+        .thaw                   = pdc_sata_thaw,
         .error_handler          = pdc_sata_error_handler,
         .post_internal_cmd      = pdc_post_internal_cmd,
         .cable_detect           = pdc_sata_cable_detect,
@@ -631,6 +633,41 @@ static void pdc_qc_prep(struct ata_queued_cmd *qc)
         }
 }
 
+static int pdc_is_sataii_tx4(unsigned long flags)
+{
+        const unsigned long mask = PDC_FLAG_GEN_II | PDC_FLAG_4_PORTS;
+        return (flags & mask) == mask;
+}
+
+static unsigned int pdc_port_no_to_ata_no(unsigned int port_no,
+                                          int is_sataii_tx4)
+{
+        static const unsigned char sataii_tx4_port_remap[4] = { 3, 1, 0, 2};
+        return is_sataii_tx4 ? sataii_tx4_port_remap[port_no] : port_no;
+}
+
+static unsigned int pdc_sata_nr_ports(const struct ata_port *ap)
+{
+        return (ap->flags & PDC_FLAG_4_PORTS) ? 4 : 2;
+}
+
+static unsigned int pdc_sata_ata_port_to_ata_no(const struct ata_port *ap)
+{
+        const struct ata_host *host = ap->host;
+        unsigned int nr_ports = pdc_sata_nr_ports(ap);
+        unsigned int i;
+
+        for(i = 0; i < nr_ports && host->ports[i] != ap; ++i)
+                ;
+        BUG_ON(i >= nr_ports);
+        return pdc_port_no_to_ata_no(i, pdc_is_sataii_tx4(ap->flags));
+}
+
+static unsigned int pdc_sata_hotplug_offset(const struct ata_port *ap)
+{
+        return (ap->flags & PDC_FLAG_GEN_II) ? PDC2_SATA_PLUG_CSR : PDC_SATA_PLUG_CSR;
+}
+
 static void pdc_freeze(struct ata_port *ap)
 {
         void __iomem *mmio = ap->ioaddr.cmd_addr;
@@ -643,6 +680,29 @@ static void pdc_freeze(struct ata_port *ap)
         readl(mmio + PDC_CTLSTAT); /* flush */
 }
 
+static void pdc_sata_freeze(struct ata_port *ap)
+{
+        struct ata_host *host = ap->host;
+        void __iomem *host_mmio = host->iomap[PDC_MMIO_BAR];
+        unsigned int hotplug_offset = pdc_sata_hotplug_offset(ap);
+        unsigned int ata_no = pdc_sata_ata_port_to_ata_no(ap);
+        u32 hotplug_status;
+
+        /* Disable hotplug events on this port.
+         *
+         * Locking:
+         * 1) hotplug register accesses must be serialised via host->lock
+         * 2) ap->lock == &ap->host->lock
+         * 3) ->freeze() and ->thaw() are called with ap->lock held
+         */
+        hotplug_status = readl(host_mmio + hotplug_offset);
+        hotplug_status |= 0x11 << (ata_no + 16);
+        writel(hotplug_status, host_mmio + hotplug_offset);
+        readl(host_mmio + hotplug_offset); /* flush */
+
+        pdc_freeze(ap);
+}
+
 static void pdc_thaw(struct ata_port *ap)
 {
         void __iomem *mmio = ap->ioaddr.cmd_addr;
@@ -658,6 +718,26 @@ static void pdc_thaw(struct ata_port *ap)
         readl(mmio + PDC_CTLSTAT); /* flush */
 }
 
+static void pdc_sata_thaw(struct ata_port *ap)
+{
+        struct ata_host *host = ap->host;
+        void __iomem *host_mmio = host->iomap[PDC_MMIO_BAR];
+        unsigned int hotplug_offset = pdc_sata_hotplug_offset(ap);
+        unsigned int ata_no = pdc_sata_ata_port_to_ata_no(ap);
+        u32 hotplug_status;
+
+        pdc_thaw(ap);
+
+        /* Enable hotplug events on this port.
+         * Locking: see pdc_sata_freeze().
+         */
+        hotplug_status = readl(host_mmio + hotplug_offset);
+        hotplug_status |= 0x11 << ata_no;
+        hotplug_status &= ~(0x11 << (ata_no + 16));
+        writel(hotplug_status, host_mmio + hotplug_offset);
+        readl(host_mmio + hotplug_offset); /* flush */
+}
+
 static void pdc_common_error_handler(struct ata_port *ap, ata_reset_fn_t hardreset)
 {
         if (!(ap->pflags & ATA_PFLAG_FROZEN))
@@ -765,19 +845,6 @@ static void pdc_irq_clear(struct ata_port *ap)
         readl(mmio + PDC_INT_SEQMASK);
 }
 
-static int pdc_is_sataii_tx4(unsigned long flags)
-{
-        const unsigned long mask = PDC_FLAG_GEN_II | PDC_FLAG_4_PORTS;
-        return (flags & mask) == mask;
-}
-
-static unsigned int pdc_port_no_to_ata_no(unsigned int port_no,
-                                          int is_sataii_tx4)
-{
-        static const unsigned char sataii_tx4_port_remap[4] = { 3, 1, 0, 2};
-        return is_sataii_tx4 ? sataii_tx4_port_remap[port_no] : port_no;
-}
-
 static irqreturn_t pdc_interrupt(int irq, void *dev_instance)
 {
         struct ata_host *host = dev_instance;
@@ -799,6 +866,8 @@ static irqreturn_t pdc_interrupt(int irq, void *dev_instance)
 
         mmio_base = host->iomap[PDC_MMIO_BAR];
 
+        spin_lock(&host->lock);
+
         /* read and clear hotplug flags for all ports */
         if (host->ports[0]->flags & PDC_FLAG_GEN_II)
                 hotplug_offset = PDC2_SATA_PLUG_CSR;
@@ -814,11 +883,9 @@ static irqreturn_t pdc_interrupt(int irq, void *dev_instance)
 
         if (mask == 0xffffffff && hotplug_status == 0) {
                 VPRINTK("QUICK EXIT 2\n");
-                return IRQ_NONE;
+                goto done_irq;
         }
 
-        spin_lock(&host->lock);
-
         mask &= 0xffff;         /* only 16 tags possible */
         if (mask == 0 && hotplug_status == 0) {
                 VPRINTK("QUICK EXIT 3\n");
diff --git a/drivers/atm/firestream.c b/drivers/atm/firestream.c
index c662d686154a..47c57a4294b7 100644
--- a/drivers/atm/firestream.c
+++ b/drivers/atm/firestream.c
@@ -331,8 +331,8 @@ module_param(fs_keystream, int, 0);
 #define FS_DEBUG_QSIZE   0x00001000
 
 
-#define func_enter() fs_dprintk (FS_DEBUG_FLOW, "fs: enter %s\n", __FUNCTION__)
-#define func_exit()  fs_dprintk (FS_DEBUG_FLOW, "fs: exit  %s\n", __FUNCTION__)
+#define func_enter() fs_dprintk(FS_DEBUG_FLOW, "fs: enter %s\n", __func__)
+#define func_exit()  fs_dprintk(FS_DEBUG_FLOW, "fs: exit  %s\n", __func__)
 
 
 static struct fs_dev *fs_boards = NULL;
diff --git a/drivers/atm/fore200e.c b/drivers/atm/fore200e.c
index f97e050338f0..432181ed7bb5 100644
--- a/drivers/atm/fore200e.c
+++ b/drivers/atm/fore200e.c
@@ -95,8 +95,8 @@
 #if 1
 #define ASSERT(expr)     if (!(expr)) { \
                              printk(FORE200E "assertion failed! %s[%d]: %s\n", \
-                                    __FUNCTION__, __LINE__, #expr); \
-                             panic(FORE200E "%s", __FUNCTION__); \
+                                    __func__, __LINE__, #expr); \
+                             panic(FORE200E "%s", __func__); \
                          }
 #else
 #define ASSERT(expr)     do {} while (0)
@@ -1988,19 +1988,19 @@ fore200e_fetch_stats(struct fore200e* fore200e, struct sonet_stats __user *arg)
     if (fore200e_getstats(fore200e) < 0)
         return -EIO;
 
-    tmp.section_bip = cpu_to_be32(fore200e->stats->oc3.section_bip8_errors);
-    tmp.line_bip    = cpu_to_be32(fore200e->stats->oc3.line_bip24_errors);
-    tmp.path_bip    = cpu_to_be32(fore200e->stats->oc3.path_bip8_errors);
-    tmp.line_febe   = cpu_to_be32(fore200e->stats->oc3.line_febe_errors);
-    tmp.path_febe   = cpu_to_be32(fore200e->stats->oc3.path_febe_errors);
-    tmp.corr_hcs    = cpu_to_be32(fore200e->stats->oc3.corr_hcs_errors);
-    tmp.uncorr_hcs  = cpu_to_be32(fore200e->stats->oc3.ucorr_hcs_errors);
-    tmp.tx_cells    = cpu_to_be32(fore200e->stats->aal0.cells_transmitted)  +
-                      cpu_to_be32(fore200e->stats->aal34.cells_transmitted) +
-                      cpu_to_be32(fore200e->stats->aal5.cells_transmitted);
-    tmp.rx_cells    = cpu_to_be32(fore200e->stats->aal0.cells_received)     +
-                      cpu_to_be32(fore200e->stats->aal34.cells_received)    +
-                      cpu_to_be32(fore200e->stats->aal5.cells_received);
+    tmp.section_bip = be32_to_cpu(fore200e->stats->oc3.section_bip8_errors);
+    tmp.line_bip    = be32_to_cpu(fore200e->stats->oc3.line_bip24_errors);
+    tmp.path_bip    = be32_to_cpu(fore200e->stats->oc3.path_bip8_errors);
+    tmp.line_febe   = be32_to_cpu(fore200e->stats->oc3.line_febe_errors);
+    tmp.path_febe   = be32_to_cpu(fore200e->stats->oc3.path_febe_errors);
+    tmp.corr_hcs    = be32_to_cpu(fore200e->stats->oc3.corr_hcs_errors);
+    tmp.uncorr_hcs  = be32_to_cpu(fore200e->stats->oc3.ucorr_hcs_errors);
+    tmp.tx_cells    = be32_to_cpu(fore200e->stats->aal0.cells_transmitted)  +
+                      be32_to_cpu(fore200e->stats->aal34.cells_transmitted) +
+                      be32_to_cpu(fore200e->stats->aal5.cells_transmitted);
+    tmp.rx_cells    = be32_to_cpu(fore200e->stats->aal0.cells_received)     +
+                      be32_to_cpu(fore200e->stats->aal34.cells_received)    +
+                      be32_to_cpu(fore200e->stats->aal5.cells_received);
 
     if (arg)
         return copy_to_user(arg, &tmp, sizeof(struct sonet_stats)) ? -EFAULT : 0;       
@@ -2587,7 +2587,7 @@ fore200e_start_fw(struct fore200e* fore200e)
 static int __devinit
 fore200e_load_fw(struct fore200e* fore200e)
 {
-    u32* fw_data = (u32*) fore200e->bus->fw_data;
+    __le32* fw_data = (__le32*) fore200e->bus->fw_data;
     u32  fw_size = (u32) *fore200e->bus->fw_size / sizeof(u32);
 
     struct fw_header* fw_header = (struct fw_header*) fw_data;
@@ -2965,8 +2965,8 @@ fore200e_proc_read(struct atm_dev *dev, loff_t* pos, char* page)
                        "  4b5b:\n"
                        "     crc_header_errors:\t\t%10u\n"
                        "     framing_errors:\t\t%10u\n",
-                       cpu_to_be32(fore200e->stats->phy.crc_header_errors),
-                       cpu_to_be32(fore200e->stats->phy.framing_errors));
+                       be32_to_cpu(fore200e->stats->phy.crc_header_errors),
+                       be32_to_cpu(fore200e->stats->phy.framing_errors));
     
     if (!left--)
         return sprintf(page, "\n"
@@ -2978,13 +2978,13 @@ fore200e_proc_read(struct atm_dev *dev, loff_t* pos, char* page)
                        "     path_febe_errors:\t\t%10u\n"
                        "     corr_hcs_errors:\t\t%10u\n"
                        "     ucorr_hcs_errors:\t\t%10u\n",
-                       cpu_to_be32(fore200e->stats->oc3.section_bip8_errors),
-                       cpu_to_be32(fore200e->stats->oc3.path_bip8_errors),
-                       cpu_to_be32(fore200e->stats->oc3.line_bip24_errors),
-                       cpu_to_be32(fore200e->stats->oc3.line_febe_errors),
-                       cpu_to_be32(fore200e->stats->oc3.path_febe_errors),
-                       cpu_to_be32(fore200e->stats->oc3.corr_hcs_errors),
-                       cpu_to_be32(fore200e->stats->oc3.ucorr_hcs_errors));
+                       be32_to_cpu(fore200e->stats->oc3.section_bip8_errors),
+                       be32_to_cpu(fore200e->stats->oc3.path_bip8_errors),
+                       be32_to_cpu(fore200e->stats->oc3.line_bip24_errors),
+                       be32_to_cpu(fore200e->stats->oc3.line_febe_errors),
+                       be32_to_cpu(fore200e->stats->oc3.path_febe_errors),
+                       be32_to_cpu(fore200e->stats->oc3.corr_hcs_errors),
+                       be32_to_cpu(fore200e->stats->oc3.ucorr_hcs_errors));
 
     if (!left--)
         return sprintf(page,"\n"
@@ -2995,12 +2995,12 @@ fore200e_proc_read(struct atm_dev *dev, loff_t* pos, char* page)
                        "     vpi no conn:\t\t%10u\n"
                        "     vci out of range:\t\t%10u\n"
                        "     vci no conn:\t\t%10u\n",
-                       cpu_to_be32(fore200e->stats->atm.cells_transmitted),
-                       cpu_to_be32(fore200e->stats->atm.cells_received),
-                       cpu_to_be32(fore200e->stats->atm.vpi_bad_range),
-                       cpu_to_be32(fore200e->stats->atm.vpi_no_conn),
-                       cpu_to_be32(fore200e->stats->atm.vci_bad_range),
-                       cpu_to_be32(fore200e->stats->atm.vci_no_conn));
+                       be32_to_cpu(fore200e->stats->atm.cells_transmitted),
+                       be32_to_cpu(fore200e->stats->atm.cells_received),
+                       be32_to_cpu(fore200e->stats->atm.vpi_bad_range),
+                       be32_to_cpu(fore200e->stats->atm.vpi_no_conn),
+                       be32_to_cpu(fore200e->stats->atm.vci_bad_range),
+                       be32_to_cpu(fore200e->stats->atm.vci_no_conn));
     
     if (!left--)
         return sprintf(page,"\n"
@@ -3008,9 +3008,9 @@ fore200e_proc_read(struct atm_dev *dev, loff_t* pos, char* page)
                        "     TX:\t\t\t%10u\n"
                        "     RX:\t\t\t%10u\n"
                        "     dropped:\t\t\t%10u\n",
-                       cpu_to_be32(fore200e->stats->aal0.cells_transmitted),
-                       cpu_to_be32(fore200e->stats->aal0.cells_received),
-                       cpu_to_be32(fore200e->stats->aal0.cells_dropped));
+                       be32_to_cpu(fore200e->stats->aal0.cells_transmitted),
+                       be32_to_cpu(fore200e->stats->aal0.cells_received),
+                       be32_to_cpu(fore200e->stats->aal0.cells_dropped));
     
     if (!left--)
         return sprintf(page,"\n"
@@ -3026,15 +3026,15 @@ fore200e_proc_read(struct atm_dev *dev, loff_t* pos, char* page)
                        "       RX:\t\t\t%10u\n"
                        "       dropped:\t\t\t%10u\n"
                        "       protocol errors:\t\t%10u\n",
-                       cpu_to_be32(fore200e->stats->aal34.cells_transmitted),
-                       cpu_to_be32(fore200e->stats->aal34.cells_received),
-                       cpu_to_be32(fore200e->stats->aal34.cells_dropped),
-                       cpu_to_be32(fore200e->stats->aal34.cells_crc_errors),
-                       cpu_to_be32(fore200e->stats->aal34.cells_protocol_errors),
-                       cpu_to_be32(fore200e->stats->aal34.cspdus_transmitted),
-                       cpu_to_be32(fore200e->stats->aal34.cspdus_received),
-                       cpu_to_be32(fore200e->stats->aal34.cspdus_dropped),
-                       cpu_to_be32(fore200e->stats->aal34.cspdus_protocol_errors));
+                       be32_to_cpu(fore200e->stats->aal34.cells_transmitted),
+                       be32_to_cpu(fore200e->stats->aal34.cells_received),
+                       be32_to_cpu(fore200e->stats->aal34.cells_dropped),
+                       be32_to_cpu(fore200e->stats->aal34.cells_crc_errors),
+                       be32_to_cpu(fore200e->stats->aal34.cells_protocol_errors),
+                       be32_to_cpu(fore200e->stats->aal34.cspdus_transmitted),
+                       be32_to_cpu(fore200e->stats->aal34.cspdus_received),
+                       be32_to_cpu(fore200e->stats->aal34.cspdus_dropped),
+                       be32_to_cpu(fore200e->stats->aal34.cspdus_protocol_errors));
     
     if (!left--)
         return sprintf(page,"\n"
@@ -3050,15 +3050,15 @@ fore200e_proc_read(struct atm_dev *dev, loff_t* pos, char* page)
                        "       dropped:\t\t\t%10u\n"
                        "       CRC errors:\t\t%10u\n"
                        "       protocol errors:\t\t%10u\n",
-                       cpu_to_be32(fore200e->stats->aal5.cells_transmitted),
-                       cpu_to_be32(fore200e->stats->aal5.cells_received),
-                       cpu_to_be32(fore200e->stats->aal5.cells_dropped),
-                       cpu_to_be32(fore200e->stats->aal5.congestion_experienced),
-                       cpu_to_be32(fore200e->stats->aal5.cspdus_transmitted),
-                       cpu_to_be32(fore200e->stats->aal5.cspdus_received),
-                       cpu_to_be32(fore200e->stats->aal5.cspdus_dropped),
-                       cpu_to_be32(fore200e->stats->aal5.cspdus_crc_errors),
-                       cpu_to_be32(fore200e->stats->aal5.cspdus_protocol_errors));
+                       be32_to_cpu(fore200e->stats->aal5.cells_transmitted),
+                       be32_to_cpu(fore200e->stats->aal5.cells_received),
+                       be32_to_cpu(fore200e->stats->aal5.cells_dropped),
+                       be32_to_cpu(fore200e->stats->aal5.congestion_experienced),
+                       be32_to_cpu(fore200e->stats->aal5.cspdus_transmitted),
+                       be32_to_cpu(fore200e->stats->aal5.cspdus_received),
+                       be32_to_cpu(fore200e->stats->aal5.cspdus_dropped),
+                       be32_to_cpu(fore200e->stats->aal5.cspdus_crc_errors),
+                       be32_to_cpu(fore200e->stats->aal5.cspdus_protocol_errors));
     
     if (!left--)
         return sprintf(page,"\n"
@@ -3069,11 +3069,11 @@ fore200e_proc_read(struct atm_dev *dev, loff_t* pos, char* page)
                        "     large b2:\t\t\t%10u\n"
                        "     RX PDUs:\t\t\t%10u\n"
                        "     TX PDUs:\t\t\t%10lu\n",
-                       cpu_to_be32(fore200e->stats->aux.small_b1_failed),
-                       cpu_to_be32(fore200e->stats->aux.large_b1_failed),
-                       cpu_to_be32(fore200e->stats->aux.small_b2_failed),
-                       cpu_to_be32(fore200e->stats->aux.large_b2_failed),
-                       cpu_to_be32(fore200e->stats->aux.rpd_alloc_failed),
+                       be32_to_cpu(fore200e->stats->aux.small_b1_failed),
+                       be32_to_cpu(fore200e->stats->aux.large_b1_failed),
+                       be32_to_cpu(fore200e->stats->aux.small_b2_failed),
+                       be32_to_cpu(fore200e->stats->aux.large_b2_failed),
+                       be32_to_cpu(fore200e->stats->aux.rpd_alloc_failed),
                        fore200e->tx_sat);
     
     if (!left--)
diff --git a/drivers/atm/fore200e.h b/drivers/atm/fore200e.h
index b85a54613dea..183841cc8fdf 100644
--- a/drivers/atm/fore200e.h
+++ b/drivers/atm/fore200e.h
@@ -349,90 +349,90 @@ typedef struct oc3_block {
 /* physical encoding statistics */
 
 typedef struct stats_phy {
-    u32 crc_header_errors;    /* cells received with bad header CRC */
-    u32 framing_errors;       /* cells received with bad framing    */
-    u32 pad[ 2 ];             /* i960 padding                       */
+    __be32 crc_header_errors;    /* cells received with bad header CRC */
+    __be32 framing_errors;       /* cells received with bad framing    */
+    __be32 pad[ 2 ];             /* i960 padding                       */
 } stats_phy_t;
 
 
 /* OC-3 statistics */
 
 typedef struct stats_oc3 {
-    u32 section_bip8_errors;    /* section 8 bit interleaved parity    */
-    u32 path_bip8_errors;       /* path 8 bit interleaved parity       */
-    u32 line_bip24_errors;      /* line 24 bit interleaved parity      */
-    u32 line_febe_errors;       /* line far end block errors           */
-    u32 path_febe_errors;       /* path far end block errors           */
-    u32 corr_hcs_errors;        /* correctable header check sequence   */
-    u32 ucorr_hcs_errors;       /* uncorrectable header check sequence */
-    u32 pad[ 1 ];               /* i960 padding                        */
+    __be32 section_bip8_errors;    /* section 8 bit interleaved parity    */
+    __be32 path_bip8_errors;       /* path 8 bit interleaved parity       */
+    __be32 line_bip24_errors;      /* line 24 bit interleaved parity      */
+    __be32 line_febe_errors;       /* line far end block errors           */
+    __be32 path_febe_errors;       /* path far end block errors           */
+    __be32 corr_hcs_errors;        /* correctable header check sequence   */
+    __be32 ucorr_hcs_errors;       /* uncorrectable header check sequence */
+    __be32 pad[ 1 ];               /* i960 padding                        */
 } stats_oc3_t;
 
 
 /* ATM statistics */
 
 typedef struct stats_atm {
-    u32 cells_transmitted;    /* cells transmitted                 */
-    u32 cells_received;       /* cells received                    */
-    u32 vpi_bad_range;        /* cell drops: VPI out of range      */
-    u32 vpi_no_conn;          /* cell drops: no connection for VPI */
-    u32 vci_bad_range;        /* cell drops: VCI out of range      */
-    u32 vci_no_conn;          /* cell drops: no connection for VCI */
-    u32 pad[ 2 ];             /* i960 padding                      */
+    __be32      cells_transmitted;    /* cells transmitted                 */
+    __be32      cells_received;       /* cells received                    */
+    __be32      vpi_bad_range;        /* cell drops: VPI out of range      */
+    __be32      vpi_no_conn;          /* cell drops: no connection for VPI */
+    __be32      vci_bad_range;        /* cell drops: VCI out of range      */
+    __be32      vci_no_conn;          /* cell drops: no connection for VCI */
+    __be32      pad[ 2 ];             /* i960 padding                      */
 } stats_atm_t;
 
 /* AAL0 statistics */
 
 typedef struct stats_aal0 {
-    u32 cells_transmitted;    /* cells transmitted */
-    u32 cells_received;       /* cells received    */
-    u32 cells_dropped;        /* cells dropped     */
-    u32 pad[ 1 ];             /* i960 padding      */
+    __be32      cells_transmitted;    /* cells transmitted */
+    __be32      cells_received;       /* cells received    */
+    __be32      cells_dropped;        /* cells dropped     */
+    __be32      pad[ 1 ];             /* i960 padding      */
 } stats_aal0_t;
 
 
 /* AAL3/4 statistics */
 
 typedef struct stats_aal34 {
-    u32 cells_transmitted;         /* cells transmitted from segmented PDUs */
-    u32 cells_received;            /* cells reassembled into PDUs           */
-    u32 cells_crc_errors;          /* payload CRC error count               */
-    u32 cells_protocol_errors;     /* SAR or CS layer protocol errors       */
-    u32 cells_dropped;             /* cells dropped: partial reassembly     */
-    u32 cspdus_transmitted;        /* CS PDUs transmitted                   */
-    u32 cspdus_received;           /* CS PDUs received                      */
-    u32 cspdus_protocol_errors;    /* CS layer protocol errors              */
-    u32 cspdus_dropped;            /* reassembled PDUs drop'd (in cells)    */
-    u32 pad[ 3 ];                  /* i960 padding                          */
+    __be32      cells_transmitted;         /* cells transmitted from segmented PDUs */
+    __be32      cells_received;            /* cells reassembled into PDUs           */
+    __be32      cells_crc_errors;          /* payload CRC error count               */
+    __be32      cells_protocol_errors;     /* SAR or CS layer protocol errors       */
+    __be32      cells_dropped;             /* cells dropped: partial reassembly     */
+    __be32      cspdus_transmitted;        /* CS PDUs transmitted                   */
+    __be32      cspdus_received;           /* CS PDUs received                      */
+    __be32      cspdus_protocol_errors;    /* CS layer protocol errors              */
+    __be32      cspdus_dropped;            /* reassembled PDUs drop'd (in cells)    */
+    __be32      pad[ 3 ];                  /* i960 padding                          */
 } stats_aal34_t;
 
 
 /* AAL5 statistics */
 
 typedef struct stats_aal5 {
-    u32 cells_transmitted;         /* cells transmitted from segmented SDUs */
-    u32 cells_received;            /* cells reassembled into SDUs           */
-    u32 cells_dropped;             /* reassembled PDUs dropped (in cells)   */
-    u32 congestion_experienced;    /* CRC error and length wrong            */
-    u32 cspdus_transmitted;        /* CS PDUs transmitted                   */
-    u32 cspdus_received;           /* CS PDUs received                      */
-    u32 cspdus_crc_errors;         /* CS PDUs CRC errors                    */
-    u32 cspdus_protocol_errors;    /* CS layer protocol errors              */
-    u32 cspdus_dropped;            /* reassembled PDUs dropped              */
-    u32 pad[ 3 ];                  /* i960 padding                          */
+    __be32      cells_transmitted;         /* cells transmitted from segmented SDUs */
+    __be32      cells_received;            /* cells reassembled into SDUs           */
+    __be32      cells_dropped;             /* reassembled PDUs dropped (in cells)   */
+    __be32      congestion_experienced;    /* CRC error and length wrong            */
+    __be32      cspdus_transmitted;        /* CS PDUs transmitted                   */
+    __be32      cspdus_received;           /* CS PDUs received                      */
+    __be32      cspdus_crc_errors;         /* CS PDUs CRC errors                    */
+    __be32      cspdus_protocol_errors;    /* CS layer protocol errors              */
+    __be32      cspdus_dropped;            /* reassembled PDUs dropped              */
+    __be32      pad[ 3 ];                  /* i960 padding                          */
 } stats_aal5_t;
 
 
 /* auxiliary statistics */
 
 typedef struct stats_aux {
-    u32 small_b1_failed;     /* receive BD allocation failures  */
-    u32 large_b1_failed;     /* receive BD allocation failures  */
-    u32 small_b2_failed;     /* receive BD allocation failures  */
-    u32 large_b2_failed;     /* receive BD allocation failures  */
-    u32 rpd_alloc_failed;    /* receive PDU allocation failures */
-    u32 receive_carrier;     /* no carrier = 0, carrier = 1     */
-    u32 pad[ 2 ];            /* i960 padding                    */
+    __be32      small_b1_failed;     /* receive BD allocation failures  */
+    __be32      large_b1_failed;     /* receive BD allocation failures  */
+    __be32      small_b2_failed;     /* receive BD allocation failures  */
+    __be32      large_b2_failed;     /* receive BD allocation failures  */
+    __be32      rpd_alloc_failed;    /* receive PDU allocation failures */
+    __be32      receive_carrier;     /* no carrier = 0, carrier = 1     */
+    __be32      pad[ 2 ];            /* i960 padding                    */
 } stats_aux_t;
 
 
@@ -643,10 +643,10 @@ typedef struct host_bsq {
 /* header of the firmware image */
 
 typedef struct fw_header {
-    u32 magic;           /* magic number                               */
-    u32 version;         /* firmware version id                        */
-    u32 load_offset;     /* fw load offset in board memory             */
-    u32 start_offset;    /* fw execution start address in board memory */
+    __le32 magic;           /* magic number                               */
+    __le32 version;         /* firmware version id                        */
+    __le32 load_offset;     /* fw load offset in board memory             */
+    __le32 start_offset;    /* fw execution start address in board memory */
 } fw_header_t;
 
 #define FW_HEADER_MAGIC  0x65726f66    /* 'fore' */
diff --git a/drivers/atm/idt77252.c b/drivers/atm/idt77252.c
index eee54c0cde68..b967919fb7e2 100644
--- a/drivers/atm/idt77252.c
+++ b/drivers/atm/idt77252.c
@@ -555,7 +555,7 @@ idt77252_tx_dump(struct idt77252_dev *card)
         struct vc_map *vc;
         int i;
 
-        printk("%s\n", __FUNCTION__);
+        printk("%s\n", __func__);
         for (i = 0; i < card->tct_size; i++) {
                 vc = card->vcs[i];
                 if (!vc)
@@ -1035,7 +1035,7 @@ dequeue_rx(struct idt77252_dev *card, struct rsq_entry *rsqe)
         skb = sb_pool_skb(card, le32_to_cpu(rsqe->word_2));
         if (skb == NULL) {
                 printk("%s: NULL skb in %s, rsqe: %08x %08x %08x %08x\n",
-                       card->name, __FUNCTION__,
+                       card->name, __func__,
                        le32_to_cpu(rsqe->word_1), le32_to_cpu(rsqe->word_2),
                        le32_to_cpu(rsqe->word_3), le32_to_cpu(rsqe->word_4));
                 return;
@@ -1873,7 +1873,7 @@ add_rx_skb(struct idt77252_dev *card, int queue,
                         return;
 
                 if (sb_pool_add(card, skb, queue)) {
-                        printk("%s: SB POOL full\n", __FUNCTION__);
+                        printk("%s: SB POOL full\n", __func__);
                         goto outfree;
                 }
 
@@ -1883,7 +1883,7 @@ add_rx_skb(struct idt77252_dev *card, int queue,
                 IDT77252_PRV_PADDR(skb) = paddr;
 
                 if (push_rx_skb(card, skb, queue)) {
-                        printk("%s: FB QUEUE full\n", __FUNCTION__);
+                        printk("%s: FB QUEUE full\n", __func__);
                         goto outunmap;
                 }
         }
@@ -3821,12 +3821,12 @@ static int __init idt77252_init(void)
 {
         struct sk_buff *skb;
 
-        printk("%s: at %p\n", __FUNCTION__, idt77252_init);
+        printk("%s: at %p\n", __func__, idt77252_init);
 
         if (sizeof(skb->cb) < sizeof(struct atm_skb_data) +
                               sizeof(struct idt77252_skb_prv)) {
                 printk(KERN_ERR "%s: skb->cb is too small (%lu < %lu)\n",
-                       __FUNCTION__, (unsigned long) sizeof(skb->cb),
+                       __func__, (unsigned long) sizeof(skb->cb),
                        (unsigned long) sizeof(struct atm_skb_data) +
                                        sizeof(struct idt77252_skb_prv));
                 return -EIO;
diff --git a/drivers/base/core.c b/drivers/base/core.c
index 7de543d1d0b4..24198ad01976 100644
--- a/drivers/base/core.c
+++ b/drivers/base/core.c
@@ -19,6 +19,7 @@
 #include <linux/kdev_t.h>
 #include <linux/notifier.h>
 #include <linux/genhd.h>
+#include <linux/kallsyms.h>
 #include <asm/semaphore.h>
 
 #include "base.h"
@@ -68,6 +69,10 @@ static ssize_t dev_attr_show(struct kobject *kobj, struct attribute *attr,
 
         if (dev_attr->show)
                 ret = dev_attr->show(dev, dev_attr, buf);
+        if (ret >= (ssize_t)PAGE_SIZE) {
+                print_symbol("dev_attr_show: %s returned bad count\n",
+                                (unsigned long)dev_attr->show);
+        }
         return ret;
 }
 
diff --git a/drivers/base/driver.c b/drivers/base/driver.c
index bf31a0170a48..9a6537f14401 100644
--- a/drivers/base/driver.c
+++ b/drivers/base/driver.c
@@ -133,6 +133,7 @@ int driver_add_kobj(struct device_driver *drv, struct kobject *kobj,
 {
         va_list args;
         char *name;
+        int ret;
 
         va_start(args, fmt);
         name = kvasprintf(GFP_KERNEL, fmt, args);
@@ -141,7 +142,9 @@ int driver_add_kobj(struct device_driver *drv, struct kobject *kobj,
         if (!name)
                 return -ENOMEM;
 
-        return kobject_add(kobj, &drv->p->kobj, "%s", name);
+        ret = kobject_add(kobj, &drv->p->kobj, "%s", name);
+        kfree(name);
+        return ret;
 }
 EXPORT_SYMBOL_GPL(driver_add_kobj);
 
diff --git a/drivers/block/Kconfig b/drivers/block/Kconfig
index b6d230b3209f..0d1d2133d9bc 100644
--- a/drivers/block/Kconfig
+++ b/drivers/block/Kconfig
@@ -44,16 +44,6 @@ config MAC_FLOPPY
           If you have a SWIM-3 (Super Woz Integrated Machine 3; from Apple)
           floppy controller, say Y here. Most commonly found in PowerMacs.
 
-config BLK_DEV_PS2
-        tristate "PS/2 ESDI hard disk support"
-        depends on MCA && MCA_LEGACY && BROKEN
-        help
-          Say Y here if you have a PS/2 machine with a MCA bus and an ESDI
-          hard disk.
-
-          To compile this driver as a module, choose M here: the
-          module will be called ps2esdi.
-
 config AMIGA_Z2RAM
         tristate "Amiga Zorro II ramdisk support"
         depends on ZORRO
diff --git a/drivers/block/Makefile b/drivers/block/Makefile
index 01c972415cb2..5e584306be99 100644
--- a/drivers/block/Makefile
+++ b/drivers/block/Makefile
@@ -13,7 +13,6 @@ obj-$(CONFIG_ATARI_FLOPPY)	+= ataflop.o
 obj-$(CONFIG_AMIGA_Z2RAM)       += z2ram.o
 obj-$(CONFIG_BLK_DEV_RAM)       += brd.o
 obj-$(CONFIG_BLK_DEV_LOOP)      += loop.o
-obj-$(CONFIG_BLK_DEV_PS2)       += ps2esdi.o
 obj-$(CONFIG_BLK_DEV_XD)        += xd.o
 obj-$(CONFIG_BLK_CPQ_DA)        += cpqarray.o
 obj-$(CONFIG_BLK_CPQ_CISS_DA)  += cciss.o
diff --git a/drivers/block/floppy.c b/drivers/block/floppy.c
index 32c79a55511b..7652e87d60c5 100644
--- a/drivers/block/floppy.c
+++ b/drivers/block/floppy.c
@@ -217,7 +217,6 @@ static int use_virtual_dma;
  */
 
 static DEFINE_SPINLOCK(floppy_lock);
-static struct completion device_release;
 
 static unsigned short virtual_dma_port = 0x3f0;
 irqreturn_t floppy_interrupt(int irq, void *dev_id);
@@ -4144,7 +4143,6 @@ DEVICE_ATTR(cmos,S_IRUGO,floppy_cmos_show,NULL);
 
 static void floppy_device_release(struct device *dev)
 {
-        complete(&device_release);
 }
 
 static struct platform_device floppy_device[N_DRIVE];
@@ -4539,7 +4537,6 @@ void cleanup_module(void)
 {
         int drive;
 
-        init_completion(&device_release);
         blk_unregister_region(MKDEV(FLOPPY_MAJOR, 0), 256);
         unregister_blkdev(FLOPPY_MAJOR, "fd");
 
@@ -4564,8 +4561,6 @@ void cleanup_module(void)
 
         /* eject disk, if any */
         fd_eject(0);
-
-        wait_for_completion(&device_release);
 }
 
 module_param(floppy, charp, 0);
diff --git a/drivers/block/ps2esdi.c b/drivers/block/ps2esdi.c
deleted file mode 100644
index 3c796e236253..000000000000
--- a/drivers/block/ps2esdi.c
+++ /dev/null
@@ -1,1079 +0,0 @@
-/* ps2esdi driver based on assembler code by Arindam Banerji,
-   written by Peter De Schrijver */
-/* Reassuring note to IBM : This driver was NOT developed by vice-versa
-   engineering the PS/2's BIOS */
-/* Dedicated to Wannes, Tofke, Ykke, Godot, Killroy and all those 
-   other lovely fish out there... */
-/* This code was written during the long and boring WINA 
-   elections 1994 */
-/* Thanks to Arindam Banerij for giving me the source of his driver */
-/* This code may be freely distributed and modified in any way, 
-   as long as these notes remain intact */
-
-/*  Revised: 05/07/94 by Arindam Banerji (axb@cse.nd.edu) */
-/*  Revised: 09/08/94 by Peter De Schrijver (stud11@cc4.kuleuven.ac.be)
-   Thanks to Arindam Banerij for sending me the docs of the adapter */
-
-/* BA Modified for ThinkPad 720 by Boris Ashkinazi */
-/*                    (bash@vnet.ibm.com) 08/08/95 */
-
-/* Modified further for ThinkPad-720C by Uri Blumenthal */
-/*                    (uri@watson.ibm.com) Sep 11, 1995 */
-
-/* TODO : 
-   + Timeouts
-   + Get disk parameters
-   + DMA above 16MB
-   + reset after read/write error
- */
-
-#define DEVICE_NAME "PS/2 ESDI"
-
-#include <linux/major.h>
-#include <linux/errno.h>
-#include <linux/wait.h>
-#include <linux/interrupt.h>
-#include <linux/fs.h>
-#include <linux/kernel.h>
-#include <linux/genhd.h>
-#include <linux/ps2esdi.h>
-#include <linux/blkdev.h>
-#include <linux/mca-legacy.h>
-#include <linux/init.h>
-#include <linux/ioport.h>
-#include <linux/module.h>
-#include <linux/hdreg.h>
-
-#include <asm/system.h>
-#include <asm/io.h>
-#include <asm/dma.h>
-#include <asm/mca_dma.h>
-#include <asm/uaccess.h>
-
-#define PS2ESDI_IRQ 14
-#define MAX_HD 2
-#define MAX_RETRIES 5
-#define MAX_16BIT 65536
-#define ESDI_TIMEOUT   0xf000
-#define ESDI_STAT_TIMEOUT 4
-
-#define TYPE_0_CMD_BLK_LENGTH 2
-#define TYPE_1_CMD_BLK_LENGTH 4
-
-static void reset_ctrl(void);
-
-static int ps2esdi_geninit(void);
-
-static void do_ps2esdi_request(struct request_queue * q);
-
-static void ps2esdi_readwrite(int cmd, struct request *req);
-
-static void ps2esdi_fill_cmd_block(u_short * cmd_blk, u_short cmd,
-u_short cyl, u_short head, u_short sector, u_short length, u_char drive);
-
-static int ps2esdi_out_cmd_blk(u_short * cmd_blk);
-
-static void ps2esdi_prep_dma(char *buffer, u_short length, u_char dma_xmode);
-
-static irqreturn_t ps2esdi_interrupt_handler(int irq, void *dev_id);
-static void (*current_int_handler) (u_int) = NULL;
-static void ps2esdi_normal_interrupt_handler(u_int);
-static void ps2esdi_initial_reset_int_handler(u_int);
-static void ps2esdi_geometry_int_handler(u_int);
-static int ps2esdi_getgeo(struct block_device *bdev, struct hd_geometry *geo);
-
-static int ps2esdi_read_status_words(int num_words, int max_words, u_short * buffer);
-
-static void dump_cmd_complete_status(u_int int_ret_code);
-
-static void ps2esdi_get_device_cfg(void);
-
-static void ps2esdi_reset_timer(unsigned long unused);
-
-static u_int dma_arb_level;             /* DMA arbitration level */
-
-static DECLARE_WAIT_QUEUE_HEAD(ps2esdi_int);
-
-static int no_int_yet;
-static int ps2esdi_drives;
-static u_short io_base;
-static DEFINE_TIMER(esdi_timer, ps2esdi_reset_timer, 0, 0);
-static int reset_status;
-static int ps2esdi_slot = -1;
-static int tp720esdi = 0;       /* Is it Integrated ESDI of ThinkPad-720? */
-static int intg_esdi = 0;       /* If integrated adapter */
-struct ps2esdi_i_struct {
-        unsigned int head, sect, cyl, wpcom, lzone, ctl;
-};
-static DEFINE_SPINLOCK(ps2esdi_lock);
-static struct request_queue *ps2esdi_queue;
-static struct request *current_req;
-
-#if 0
-#if 0                           /* try both - I don't know which one is better... UB */
-static struct ps2esdi_i_struct ps2esdi_info[MAX_HD] =
-{
-        {4, 48, 1553, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0}};
-#else
-static struct ps2esdi_i_struct ps2esdi_info[MAX_HD] =
-{
-        {64, 32, 161, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0}};
-#endif
-#endif
-static struct ps2esdi_i_struct ps2esdi_info[MAX_HD] =
-{
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0}};
-
-static struct block_device_operations ps2esdi_fops =
-{
-        .owner          = THIS_MODULE,
-        .getgeo         = ps2esdi_getgeo,
-};
-
-static struct gendisk *ps2esdi_gendisk[2];
-
-/* initialization routine called by ll_rw_blk.c   */
-static int __init ps2esdi_init(void)
-{
-
-        int error = 0;
-
-        /* register the device - pass the name and major number */
-        if (register_blkdev(PS2ESDI_MAJOR, "ed"))
-                return -EBUSY;
-
-        /* set up some global information - indicating device specific info */
-        ps2esdi_queue = blk_init_queue(do_ps2esdi_request, &ps2esdi_lock);
-        if (!ps2esdi_queue) {
-                unregister_blkdev(PS2ESDI_MAJOR, "ed");
-                return -ENOMEM;
-        }
-
-        /* some minor housekeeping - setup the global gendisk structure */
-        error = ps2esdi_geninit();
-        if (error) {
-                printk(KERN_WARNING "PS2ESDI: error initialising"
-                        " device, releasing resources\n");
-                unregister_blkdev(PS2ESDI_MAJOR, "ed");
-                blk_cleanup_queue(ps2esdi_queue);
-                return error;
-        }
-        return 0;
-}                               /* ps2esdi_init */
-
-#ifndef MODULE
-
-module_init(ps2esdi_init);
-
-#else
-
-static int cyl[MAX_HD] = {-1,-1};
-static int head[MAX_HD] = {-1, -1};
-static int sect[MAX_HD] = {-1, -1};
-
-module_param(tp720esdi, bool, 0);
-module_param_array(cyl, int, NULL, 0);
-module_param_array(head, int, NULL, 0);
-module_param_array(sect, int, NULL, 0);
-MODULE_LICENSE("GPL");
-
-int init_module(void) {
-        int drive;
-
-        for(drive = 0; drive < MAX_HD; drive++) {
-                struct ps2esdi_i_struct *info = &ps2esdi_info[drive];
-
-                if (cyl[drive] != -1) {
-                        info->cyl = info->lzone = cyl[drive];
-                        info->wpcom = 0;
-                }
-                if (head[drive] != -1) {
-                        info->head = head[drive];
-                        info->ctl = (head[drive] > 8 ? 8 : 0);
-                }
-                if (sect[drive] != -1) info->sect = sect[drive];
-        }
-        return ps2esdi_init();
-}
-
-void
-cleanup_module(void) {
-        int i;
-        if(ps2esdi_slot) {
-                mca_mark_as_unused(ps2esdi_slot);
-                mca_set_adapter_procfn(ps2esdi_slot, NULL, NULL);
-        }
-        release_region(io_base, 4);
-        free_dma(dma_arb_level);
-        free_irq(PS2ESDI_IRQ, &ps2esdi_gendisk);
-        unregister_blkdev(PS2ESDI_MAJOR, "ed");
-        blk_cleanup_queue(ps2esdi_queue);
-        for (i = 0; i < ps2esdi_drives; i++) {
-                del_gendisk(ps2esdi_gendisk[i]);
-                put_disk(ps2esdi_gendisk[i]);
-        }
-}
-#endif /* MODULE */
-
-/* handles boot time command line parameters */
-void __init tp720_setup(char *str, int *ints)
-{
-        /* no params, just sets the tp720esdi flag if it exists */
-
-        printk("%s: TP 720 ESDI flag set\n", DEVICE_NAME);
-        tp720esdi = 1;
-}
-
-void __init ed_setup(char *str, int *ints)
-{
-        int hdind = 0;
-
-        /* handles 3 parameters only - corresponding to
-           1. Number of cylinders
-           2. Number of heads
-           3. Sectors/track
-         */
-
-        if (ints[0] != 3)
-                return;
-
-        /* print out the information - seen at boot time */
-        printk("%s: ints[0]=%d ints[1]=%d ints[2]=%d ints[3]=%d\n",
-               DEVICE_NAME, ints[0], ints[1], ints[2], ints[3]);
-
-        /* set the index into device specific information table */
-        if (ps2esdi_info[0].head != 0)
-                hdind = 1;
-
-        /* set up all the device information */
-        ps2esdi_info[hdind].head = ints[2];
-        ps2esdi_info[hdind].sect = ints[3];
-        ps2esdi_info[hdind].cyl = ints[1];
-        ps2esdi_info[hdind].wpcom = 0;
-        ps2esdi_info[hdind].lzone = ints[1];
-        ps2esdi_info[hdind].ctl = (ints[2] > 8 ? 8 : 0);
-#if 0                           /* this may be needed for PS2/Mod.80, but it hurts ThinkPad! */
-        ps2esdi_drives = hdind + 1;     /* increment index for the next time */
-#endif
-}                               /* ed_setup */
-
-static int ps2esdi_getinfo(char *buf, int slot, void *d)
-{
-        int len = 0;
-
-        len += sprintf(buf + len, "DMA Arbitration Level: %d\n",
-                       dma_arb_level);
-        len += sprintf(buf + len, "IO Port: %x\n", io_base);
-        len += sprintf(buf + len, "IRQ: 14\n");
-        len += sprintf(buf + len, "Drives: %d\n", ps2esdi_drives);
-
-        return len;
-}
-
-/* ps2 esdi specific initialization - called thru the gendisk chain */
-static int __init ps2esdi_geninit(void)
-{
-        /*
-           The first part contains the initialization code
-           for the ESDI disk subsystem.  All we really do
-           is search for the POS registers of the controller
-           to do some simple setup operations.  First, we
-           must ensure that the controller is installed,
-           enabled, and configured as PRIMARY.  Then we must
-           determine the DMA arbitration level being used by
-           the controller so we can handle data transfer
-           operations properly.  If all of this works, then
-           we will set the INIT_FLAG to a non-zero value.
-         */
-
-        int slot = 0, i, reset_start, reset_end;
-        u_char status;
-        unsigned short adapterID;
-        int error = 0;
-
-        if ((slot = mca_find_adapter(INTG_ESDI_ID, 0)) != MCA_NOTFOUND) {
-                adapterID = INTG_ESDI_ID;
-                printk("%s: integrated ESDI adapter found in slot %d\n",
-                       DEVICE_NAME, slot+1);
-#ifndef MODULE
-                mca_set_adapter_name(slot, "PS/2 Integrated ESDI");
-#endif
-        } else if ((slot = mca_find_adapter(NRML_ESDI_ID, 0)) != -1) {
-                adapterID = NRML_ESDI_ID;
-                printk("%s: normal ESDI adapter found in slot %d\n",
-                       DEVICE_NAME, slot+1);
-                mca_set_adapter_name(slot, "PS/2 ESDI");
-        } else {
-                return -ENODEV;
-        }
-
-        ps2esdi_slot = slot;
-        mca_mark_as_used(slot);
-        mca_set_adapter_procfn(slot, (MCA_ProcFn) ps2esdi_getinfo, NULL);
-
-        /* Found the slot - read the POS register 2 to get the necessary
-           configuration and status information.  POS register 2 has the
-           following information :
-           Bit           Function
-           7             reserved = 0
-           6             arbitration method
-           0 - fairness enabled
-           1 - fairness disabled, linear priority assignment
-           5-2           arbitration level
-           1             alternate address
-           1              alternate address
-           0 - use addresses 0x3510 - 0x3517
-           0             adapter enable
-         */
-
-        status = mca_read_stored_pos(slot, 2);
-        /* is it enabled ? */
-        if (!(status & STATUS_ENABLED)) {
-                printk("%s: ESDI adapter disabled\n", DEVICE_NAME);
-                error = -ENODEV;
-                goto err_out1;
-        }
-        /* try to grab IRQ, and try to grab a slow IRQ if it fails, so we can
-           share with the SCSI driver */
-        if (request_irq(PS2ESDI_IRQ, ps2esdi_interrupt_handler,
-                  IRQF_DISABLED | IRQF_SHARED, "PS/2 ESDI", &ps2esdi_gendisk)
-            && request_irq(PS2ESDI_IRQ, ps2esdi_interrupt_handler,
-                           IRQF_SHARED, "PS/2 ESDI", &ps2esdi_gendisk)
-            ) {
-                printk("%s: Unable to get IRQ %d\n", DEVICE_NAME, PS2ESDI_IRQ);
-                error = -EBUSY;
-                goto err_out1;
-        }
-        if (status & STATUS_ALTERNATE)
-                io_base = ALT_IO_BASE;
-        else
-                io_base = PRIMARY_IO_BASE;
-
-        if (!request_region(io_base, 4, "ed")) {
-                printk(KERN_WARNING"Unable to request region 0x%x\n", io_base);
-                error = -EBUSY;
-                goto err_out2;
-        }
-        /* get the dma arbitration level */
-        dma_arb_level = (status >> 2) & 0xf;
-
-        /* BA */
-        printk("%s: DMA arbitration level : %d\n",
-               DEVICE_NAME, dma_arb_level);
-
-        LITE_ON;
-        current_int_handler = ps2esdi_initial_reset_int_handler;
-        reset_ctrl();
-        reset_status = 0;
-        reset_start = jiffies;
-        while (!reset_status) {
-                init_timer(&esdi_timer);
-                esdi_timer.expires = jiffies + HZ;
-                esdi_timer.data = 0;
-                add_timer(&esdi_timer);
-                sleep_on(&ps2esdi_int);
-        }
-        reset_end = jiffies;
-        LITE_OFF;
-        printk("%s: reset interrupt after %d jiffies,  %u.%02u secs\n",
-               DEVICE_NAME, reset_end - reset_start, (reset_end - reset_start) / HZ,
-               (reset_end - reset_start) % HZ);
-
-
-        /* Integrated ESDI Disk and Controller has only one drive! */
-        if (adapterID == INTG_ESDI_ID) {/* if not "normal" PS2 ESDI adapter */
-                ps2esdi_drives = 1;     /* then we have only one physical disk! */              intg_esdi = 1;
-        }
-
-
-
-        /* finally this part sets up some global data structures etc. */
-
-        ps2esdi_get_device_cfg();
-
-        /* some annoyance in the above routine returns TWO drives?
-         Is something else happining in the background?
-         Regaurdless we fix the # of drives again. AJK */
-        /* Integrated ESDI Disk and Controller has only one drive! */
-        if (adapterID == INTG_ESDI_ID)  /* if not "normal" PS2 ESDI adapter */
-                ps2esdi_drives = 1;     /* Not three or two, ONE DAMNIT! */
-
-        current_int_handler = ps2esdi_normal_interrupt_handler;
-
-        if (request_dma(dma_arb_level, "ed") !=0) {
-                printk(KERN_WARNING "PS2ESDI: Can't request dma-channel %d\n"
-                        ,(int) dma_arb_level);
-                error = -EBUSY;
-                goto err_out3;
-        }
-        blk_queue_max_sectors(ps2esdi_queue, 128);
-
-        error = -ENOMEM;
-        for (i = 0; i < ps2esdi_drives; i++) {
-                struct gendisk *disk = alloc_disk(64);
-                if (!disk)
-                        goto err_out4;
-                disk->major = PS2ESDI_MAJOR;
-                disk->first_minor = i<<6;
-                sprintf(disk->disk_name, "ed%c", 'a'+i);
-                disk->fops = &ps2esdi_fops;
-                ps2esdi_gendisk[i] = disk;
-        }
-
-        for (i = 0; i < ps2esdi_drives; i++) {
-                struct gendisk *disk = ps2esdi_gendisk[i];
-                set_capacity(disk, ps2esdi_info[i].head * ps2esdi_info[i].sect *
-                                ps2esdi_info[i].cyl);
-                disk->queue = ps2esdi_queue;
-                disk->private_data = &ps2esdi_info[i];
-                add_disk(disk);
-        }
-        return 0;
-err_out4:
-        while (i--)
-                put_disk(ps2esdi_gendisk[i]);
-err_out3:
-        release_region(io_base, 4);
-err_out2:
-        free_irq(PS2ESDI_IRQ, &ps2esdi_gendisk);
-err_out1:
-        if(ps2esdi_slot) {
-                mca_mark_as_unused(ps2esdi_slot);
-                mca_set_adapter_procfn(ps2esdi_slot, NULL, NULL);
-        }
-        return error;
-}
-
-static void __init ps2esdi_get_device_cfg(void)
-{
-        u_short cmd_blk[TYPE_0_CMD_BLK_LENGTH];
-
-        /*BA */ printk("%s: Drive 0\n", DEVICE_NAME);
-        current_int_handler = ps2esdi_geometry_int_handler;
-        cmd_blk[0] = CMD_GET_DEV_CONFIG | 0x600;
-        cmd_blk[1] = 0;
-        no_int_yet = TRUE;
-        ps2esdi_out_cmd_blk(cmd_blk);
-        if (no_int_yet)
-                sleep_on(&ps2esdi_int);
-
-        if (ps2esdi_drives > 1) {
-                printk("%s: Drive 1\n", DEVICE_NAME);   /*BA */
-                cmd_blk[0] = CMD_GET_DEV_CONFIG | (1 << 5) | 0x600;
-                cmd_blk[1] = 0;
-                no_int_yet = TRUE;
-                ps2esdi_out_cmd_blk(cmd_blk);
-                if (no_int_yet)
-                        sleep_on(&ps2esdi_int);
-        }                       /* if second physical drive is present */
-        return;
-}
-
-/* strategy routine that handles most of the IO requests */
-static void do_ps2esdi_request(struct request_queue * q)
-{
-        struct request *req;
-        /* since, this routine is called with interrupts cleared - they 
-           must be before it finishes  */
-
-        req = elv_next_request(q);
-        if (!req)
-                return;
-
-#if 0
-        printk("%s:got request. device : %s command : %d  sector : %ld count : %ld, buffer: %p\n",
-               DEVICE_NAME,
-               req->rq_disk->disk_name,
-               req->cmd, req->sector,
-               req->current_nr_sectors, req->buffer);
-#endif
-
-        /* check for above 16Mb dmas */
-        if (isa_virt_to_bus(req->buffer + req->current_nr_sectors * 512) > 16 * MB) {
-                printk("%s: DMA above 16MB not supported\n", DEVICE_NAME);
-                end_request(req, FAIL);
-                return;
-        }
-
-        if (req->sector+req->current_nr_sectors > get_capacity(req->rq_disk)) {
-                printk("Grrr. error. ps2esdi_drives: %d, %llu %llu\n",
-                    ps2esdi_drives, req->sector,
-                    (unsigned long long)get_capacity(req->rq_disk));
-                end_request(req, FAIL);
-                return;
-        }
-
-        switch (rq_data_dir(req)) {
-        case READ:
-                ps2esdi_readwrite(READ, req);
-                break;
-        case WRITE:
-                ps2esdi_readwrite(WRITE, req);
-                break;
-        default:
-                printk("%s: Unknown command\n", req->rq_disk->disk_name);
-                end_request(req, FAIL);
-                break;
-        }               /* handle different commands */
-}                               /* main strategy routine */
-
-/* resets the ESDI adapter */
-static void reset_ctrl(void)
-{
-
-        u_long expire;
-        u_short status;
-
-        /* enable interrupts on the controller */
-        status = inb(ESDI_INTRPT);
-        outb((status & 0xe0) | ATT_EOI, ESDI_ATTN);     /* to be sure we don't have
-                                                           any interrupt pending... */
-        outb_p(CTRL_ENABLE_INTR, ESDI_CONTROL);
-
-        /* read the ESDI status port - if the controller is not busy,
-           simply do a soft reset (fast) - otherwise we'll have to do a
-           hard (slow) reset.  */
-        if (!(inb_p(ESDI_STATUS) & STATUS_BUSY)) {
-                /*BA */ printk("%s: soft reset...\n", DEVICE_NAME);
-                outb_p(CTRL_SOFT_RESET, ESDI_ATTN);
-        }
-        /* soft reset */ 
-        else {
-                /*BA */
-                printk("%s: hard reset...\n", DEVICE_NAME);
-                outb_p(CTRL_HARD_RESET, ESDI_CONTROL);
-                expire = jiffies + 2*HZ;
-                while (time_before(jiffies, expire));
-                outb_p(1, ESDI_CONTROL);
-        }                       /* hard reset */
-
-
-}                               /* reset the controller */
-
-/* called by the strategy routine to handle read and write requests */
-static void ps2esdi_readwrite(int cmd, struct request *req)
-{
-        struct ps2esdi_i_struct *p = req->rq_disk->private_data;
-        unsigned block = req->sector;
-        unsigned count = req->current_nr_sectors;
-        int drive = p - ps2esdi_info;
-        u_short track, head, cylinder, sector;
-        u_short cmd_blk[TYPE_1_CMD_BLK_LENGTH];
-
-        /* do some relevant arithmatic */
-        track = block / p->sect;
-        head = track % p->head;
-        cylinder = track / p->head;
-        sector = block % p->sect;
-
-#if 0
-        printk("%s: cyl=%d head=%d sect=%d\n", DEVICE_NAME, cylinder, head, sector);
-#endif
-        /* call the routine that actually fills out a command block */
-        ps2esdi_fill_cmd_block
-            (cmd_blk,
-             (cmd == READ) ? CMD_READ : CMD_WRITE,
-             cylinder, head, sector, count, drive);
-
-        /* send the command block to the controller */
-        current_req = req;
-        spin_unlock_irq(&ps2esdi_lock);
-        if (ps2esdi_out_cmd_blk(cmd_blk)) {
-                spin_lock_irq(&ps2esdi_lock);
-                printk("%s: Controller failed\n", DEVICE_NAME);
-                if ((++req->errors) >= MAX_RETRIES)
-                        end_request(req, FAIL);
-        }
-        /* check for failure to put out the command block */ 
-        else {
-                spin_lock_irq(&ps2esdi_lock);
-#if 0
-                printk("%s: waiting for xfer\n", DEVICE_NAME);
-#endif
-                /* turn disk lights on */
-                LITE_ON;
-        }
-
-}                               /* ps2esdi_readwrite */
-
-/* fill out the command block */
-static void ps2esdi_fill_cmd_block(u_short * cmd_blk, u_short cmd,
- u_short cyl, u_short head, u_short sector, u_short length, u_char drive)
-{
-
-        cmd_blk[0] = (drive << 5) | cmd;
-        cmd_blk[1] = length;
-        cmd_blk[2] = ((cyl & 0x1f) << 11) | (head << 5) | sector;
-        cmd_blk[3] = (cyl & 0x3E0) >> 5;
-
-}                               /* fill out the command block */
-
-/* write a command block to the controller */
-static int ps2esdi_out_cmd_blk(u_short * cmd_blk)
-{
-
-        int i;
-        unsigned long jif;
-        u_char status;
-
-        /* enable interrupts */
-        outb(CTRL_ENABLE_INTR, ESDI_CONTROL);
-
-        /* do not write to the controller, if it is busy */
-        for (jif = jiffies + ESDI_STAT_TIMEOUT;
-                time_after(jif, jiffies) &&
-                        (inb(ESDI_STATUS) & STATUS_BUSY); )
-                ;
-
-#if 0
-        printk("%s: i(1)=%ld\n", DEVICE_NAME, jif);
-#endif
-
-        /* if device is still busy - then just time out */
-        if (inb(ESDI_STATUS) & STATUS_BUSY) {
-                printk("%s: ps2esdi_out_cmd timed out (1)\n", DEVICE_NAME);
-                return ERROR;
-        }                       /* timeout ??? */
-        /* Set up the attention register in the controller */
-        outb(((*cmd_blk) & 0xE0) | 1, ESDI_ATTN);
-
-#if 0
-        printk("%s: sending %d words to controller\n", DEVICE_NAME, (((*cmd_blk) >> 14) + 1) << 1);
-#endif
-
-        /* one by one send each word out */
-        for (i = (((*cmd_blk) >> 14) + 1) << 1; i; i--) {
-                status = inb(ESDI_STATUS);
-                for (jif = jiffies + ESDI_STAT_TIMEOUT;
-                     time_after(jif, jiffies) && (status & STATUS_BUSY) &&
-                   (status & STATUS_CMD_INF); status = inb(ESDI_STATUS));
-                if ((status & (STATUS_BUSY | STATUS_CMD_INF)) == STATUS_BUSY) {
-#if 0
-                        printk("%s: sending %04X\n", DEVICE_NAME, *cmd_blk);
-#endif
-                        outw(*cmd_blk++, ESDI_CMD_INT);
-                } else {
-                        printk("%s: ps2esdi_out_cmd timed out while sending command (status=%02X)\n",
-                               DEVICE_NAME, status);
-                        return ERROR;
-                }
-        }                       /* send all words out */
-        return OK;
-}                               /* send out the commands */
-
-
-/* prepare for dma - do all the necessary setup */
-static void ps2esdi_prep_dma(char *buffer, u_short length, u_char dma_xmode)
-{
-        unsigned long flags = claim_dma_lock();
-
-        mca_disable_dma(dma_arb_level);
-
-        mca_set_dma_addr(dma_arb_level, isa_virt_to_bus(buffer));
-
-        mca_set_dma_count(dma_arb_level, length * 512 / 2);
-
-        mca_set_dma_mode(dma_arb_level, dma_xmode);
-
-        mca_enable_dma(dma_arb_level);
-
-        release_dma_lock(flags);
-
-}                               /* prepare for dma */
-
-
-
-static irqreturn_t ps2esdi_interrupt_handler(int irq, void *dev_id)
-{
-        u_int int_ret_code;
-
-        if (inb(ESDI_STATUS) & STATUS_INTR) {
-                int_ret_code = inb(ESDI_INTRPT);
-                if (current_int_handler) {
-                        /* Disable adapter interrupts till processing is finished */
-                        outb(CTRL_DISABLE_INTR, ESDI_CONTROL);
-                        current_int_handler(int_ret_code);
-                } else
-                        printk("%s: help ! No interrupt handler.\n", DEVICE_NAME);
-        } else {
-                return IRQ_NONE;
-        }
-        return IRQ_HANDLED;
-}
-
-static void ps2esdi_initial_reset_int_handler(u_int int_ret_code)
-{
-
-        switch (int_ret_code & 0xf) {
-        case INT_RESET:
-                /*BA */
-                printk("%s: initial reset completed.\n", DEVICE_NAME);
-                outb((int_ret_code & 0xe0) | ATT_EOI, ESDI_ATTN);
-                wake_up(&ps2esdi_int);
-                break;
-        case INT_ATTN_ERROR:
-                printk("%s: Attention error. interrupt status : %02X\n", DEVICE_NAME,
-                       int_ret_code);
-                printk("%s: status: %02x\n", DEVICE_NAME, inb(ESDI_STATUS));
-                break;
-        default:
-                printk("%s: initial reset handler received interrupt: %02X\n",
-                       DEVICE_NAME, int_ret_code);
-                outb((int_ret_code & 0xe0) | ATT_EOI, ESDI_ATTN);
-                break;
-        }
-        outb(CTRL_ENABLE_INTR, ESDI_CONTROL);
-}
-
-
-static void ps2esdi_geometry_int_handler(u_int int_ret_code)
-{
-        u_int status, drive_num;
-        unsigned long rba;
-        int i;
-
-        drive_num = int_ret_code >> 5;
-        switch (int_ret_code & 0xf) {
-        case INT_CMD_COMPLETE:
-                for (i = ESDI_TIMEOUT; i && !(inb(ESDI_STATUS) & STATUS_STAT_AVAIL); i--);
-                if (!(inb(ESDI_STATUS) & STATUS_STAT_AVAIL)) {
-                        printk("%s: timeout reading status word\n", DEVICE_NAME);
-                        outb((int_ret_code & 0xe0) | ATT_EOI, ESDI_ATTN);
-                        break;
-                }
-                status = inw(ESDI_STT_INT);
-                if ((status & 0x1F) == CMD_GET_DEV_CONFIG) {
-#define REPLY_WORDS 5           /* we already read word 0 */
-                        u_short reply[REPLY_WORDS];
-
-                        if (ps2esdi_read_status_words((status >> 8) - 1, REPLY_WORDS, reply)) {
-                                /*BA */
-                                printk("%s: Device Configuration Status for drive %u\n",
-                                       DEVICE_NAME, drive_num);
-
-                                printk("%s: Spares/cyls: %u", DEVICE_NAME, reply[0] >> 8);
-
-                                printk
-                                    ("Config bits: %s%s%s%s%s\n",
-                                     (reply[0] & CONFIG_IS) ? "Invalid Secondary, " : "",
-                                     ((reply[0] & CONFIG_ZD) && !(reply[0] & CONFIG_IS))
-                                 ? "Zero Defect, " : "Defects Present, ",
-                                     (reply[0] & CONFIG_SF) ? "Skewed Format, " : "",
-                                     (reply[0] & CONFIG_FR) ? "Removable, " : "Non-Removable, ",
-                                     (reply[0] & CONFIG_RT) ? "No Retries" : "Retries");
-
-                                rba = reply[1] | ((unsigned long) reply[2] << 16);
-                                printk("%s: Number of RBA's: %lu\n", DEVICE_NAME, rba);
-
-                                printk("%s: Physical number of cylinders: %u, Sectors/Track: %u, Heads: %u\n",
-                                       DEVICE_NAME, reply[3], reply[4] >> 8, reply[4] & 0xff);
-
-                                if (!ps2esdi_info[drive_num].head) {
-                                        ps2esdi_info[drive_num].head = 64;
-                                        ps2esdi_info[drive_num].sect = 32;
-                                        ps2esdi_info[drive_num].cyl = rba / (64 * 32);
-                                        ps2esdi_info[drive_num].wpcom = 0;
-                                        ps2esdi_info[drive_num].lzone = ps2esdi_info[drive_num].cyl;
-                                        ps2esdi_info[drive_num].ctl = 8;
-                                        if (tp720esdi) {        /* store the retrieved parameters */
-                                                ps2esdi_info[0].head = reply[4] & 0Xff;
-                                                ps2esdi_info[0].sect = reply[4] >> 8;
-                                                ps2esdi_info[0].cyl = reply[3];
-                                                ps2esdi_info[0].wpcom = 0;
-                                                ps2esdi_info[0].lzone = reply[3];
-                                        } else {
-                                                if (!intg_esdi)
-                                                        ps2esdi_drives++;
-                                        }
-                                }
-#ifdef OBSOLETE
-                                if (!ps2esdi_info[drive_num].head) {
-                                        ps2esdi_info[drive_num].head = reply[4] & 0Xff;
-                                        ps2esdi_info[drive_num].sect = reply[4] >> 8;
-                                        ps2esdi_info[drive_num].cyl = reply[3];
-                                        ps2esdi_info[drive_num].wpcom = 0;
-                                        ps2esdi_info[drive_num].lzone = reply[3];
-                                        if (tp720esdi) {        /* store the retrieved parameters */
-                                                ps2esdi_info[0].head = reply[4] & 0Xff;
-                                                ps2esdi_info[0].sect = reply[4] >> 8;
-                                                ps2esdi_info[0].cyl = reply[3];
-                                                ps2esdi_info[0].wpcom = 0;
-                                                ps2esdi_info[0].lzone = reply[3];
-                                        } else {
-                                                ps2esdi_drives++;
-                                        }
-                                }
-#endif
-
-                        } else
-                                printk("%s: failed while getting device config\n", DEVICE_NAME);
-#undef REPLY_WORDS
-                } else
-                        printk("%s: command %02X unknown by geometry handler\n",
-                               DEVICE_NAME, status & 0x1f);
-
-                outb((int_ret_code & 0xe0) | ATT_EOI, ESDI_ATTN);
-                break;
-
-        case INT_ATTN_ERROR:
-                printk("%s: Attention error. interrupt status : %02X\n", DEVICE_NAME,
-                       int_ret_code);
-                printk("%s: Device not available\n", DEVICE_NAME);
-                break;
-        case INT_CMD_ECC:
-        case INT_CMD_RETRY:
-        case INT_CMD_ECC_RETRY:
-        case INT_CMD_WARNING:
-        case INT_CMD_ABORT:
-        case INT_CMD_FAILED:
-        case INT_DMA_ERR:
-        case INT_CMD_BLK_ERR:
-                /*BA */ printk("%s: Whaa. Error occurred...\n", DEVICE_NAME);
-                dump_cmd_complete_status(int_ret_code);
-                outb((int_ret_code & 0xe0) | ATT_EOI, ESDI_ATTN);
-                break;
-        default:
-                printk("%s: Unknown interrupt reason: %02X\n",
-                       DEVICE_NAME, int_ret_code & 0xf);
-                outb((int_ret_code & 0xe0) | ATT_EOI, ESDI_ATTN);
-                break;
-        }
-
-        wake_up(&ps2esdi_int);
-        no_int_yet = FALSE;
-        outb(CTRL_ENABLE_INTR, ESDI_CONTROL);
-
-}
-
-static void ps2esdi_normal_interrupt_handler(u_int int_ret_code)
-{
-        unsigned long flags;
-        u_int status;
-        u_int ending;
-        int i;
-
-        switch (int_ret_code & 0x0f) {
-        case INT_TRANSFER_REQ:
-                ps2esdi_prep_dma(current_req->buffer,
-                                 current_req->current_nr_sectors,
-                    (rq_data_dir(current_req) == READ)
-                    ? MCA_DMA_MODE_16 | MCA_DMA_MODE_WRITE | MCA_DMA_MODE_XFER
-                    : MCA_DMA_MODE_16 | MCA_DMA_MODE_READ);
-                outb(CTRL_ENABLE_DMA | CTRL_ENABLE_INTR, ESDI_CONTROL);
-                ending = -1;
-                break;
-
-        case INT_ATTN_ERROR:
-                printk("%s: Attention error. interrupt status : %02X\n", DEVICE_NAME,
-                       int_ret_code);
-                outb(CTRL_ENABLE_INTR, ESDI_CONTROL);
-                ending = FAIL;
-                break;
-
-        case INT_CMD_COMPLETE:
-                for (i = ESDI_TIMEOUT; i && !(inb(ESDI_STATUS) & STATUS_STAT_AVAIL); i--);
-                if (!(inb(ESDI_STATUS) & STATUS_STAT_AVAIL)) {
-                        printk("%s: timeout reading status word\n", DEVICE_NAME);
-                        outb((int_ret_code & 0xe0) | ATT_EOI, ESDI_ATTN);
-                        outb(CTRL_ENABLE_INTR, ESDI_CONTROL);
-                        if ((++current_req->errors) >= MAX_RETRIES)
-                                ending = FAIL;
-                        else
-                                ending = -1;
-                        break;
-                }
-                status = inw(ESDI_STT_INT);
-                switch (status & 0x1F) {
-                case (CMD_READ & 0xff):
-                case (CMD_WRITE & 0xff):
-                        LITE_OFF;
-                        outb((int_ret_code & 0xe0) | ATT_EOI, ESDI_ATTN);
-                        outb(CTRL_ENABLE_INTR, ESDI_CONTROL);
-                        ending = SUCCES;
-                        break;
-                default:
-                        printk("%s: interrupt for unknown command %02X\n",
-                               DEVICE_NAME, status & 0x1f);
-                        outb((int_ret_code & 0xe0) | ATT_EOI, ESDI_ATTN);
-                        outb(CTRL_ENABLE_INTR, ESDI_CONTROL);
-                        ending = -1;
-                        break;
-                }
-                break;
-        case INT_CMD_ECC:
-        case INT_CMD_RETRY:
-        case INT_CMD_ECC_RETRY:
-                LITE_OFF;
-                dump_cmd_complete_status(int_ret_code);
-                outb((int_ret_code & 0xe0) | ATT_EOI, ESDI_ATTN);
-                outb(CTRL_ENABLE_INTR, ESDI_CONTROL);
-                ending = SUCCES;
-                break;
-        case INT_CMD_WARNING:
-        case INT_CMD_ABORT:
-        case INT_CMD_FAILED:
-        case INT_DMA_ERR:
-                LITE_OFF;
-                dump_cmd_complete_status(int_ret_code);
-                outb((int_ret_code & 0xe0) | ATT_EOI, ESDI_ATTN);
-                outb(CTRL_ENABLE_INTR, ESDI_CONTROL);
-                if ((++current_req->errors) >= MAX_RETRIES)
-                        ending = FAIL;
-                else
-                        ending = -1;
-                break;
-
-        case INT_CMD_BLK_ERR:
-                dump_cmd_complete_status(int_ret_code);
-                outb((int_ret_code & 0xe0) | ATT_EOI, ESDI_ATTN);
-                outb(CTRL_ENABLE_INTR, ESDI_CONTROL);
-                ending = FAIL;
-                break;
-
-        case INT_CMD_FORMAT:
-                printk("%s: huh ? Who issued this format command ?\n"
-                       ,DEVICE_NAME);
-                outb((int_ret_code & 0xe0) | ATT_EOI, ESDI_ATTN);
-                outb(CTRL_ENABLE_INTR, ESDI_CONTROL);
-                ending = -1;
-                break;
-
-        case INT_RESET:
-                /* BA printk("%s: reset completed.\n", DEVICE_NAME) */ ;
-                outb((int_ret_code & 0xe0) | ATT_EOI, ESDI_ATTN);
-                outb(CTRL_ENABLE_INTR, ESDI_CONTROL);
-                ending = -1;
-                break;
-
-        default:
-                printk("%s: Unknown interrupt reason: %02X\n",
-                       DEVICE_NAME, int_ret_code & 0xf);
-                outb((int_ret_code & 0xe0) | ATT_EOI, ESDI_ATTN);
-                outb(CTRL_ENABLE_INTR, ESDI_CONTROL);
-                ending = -1;
-                break;
-        }
-        if(ending != -1) {
-                spin_lock_irqsave(&ps2esdi_lock, flags);
-                end_request(current_req, ending);
-                current_req = NULL;
-                do_ps2esdi_request(ps2esdi_queue);
-                spin_unlock_irqrestore(&ps2esdi_lock, flags);
-        }
-}                               /* handle interrupts */
-
-
-
-static int ps2esdi_read_status_words(int num_words,
-                                     int max_words,
-                                     u_short * buffer)
-{
-        int i;
-
-        for (; max_words && num_words; max_words--, num_words--, buffer++) {
-                for (i = ESDI_TIMEOUT; i && !(inb(ESDI_STATUS) & STATUS_STAT_AVAIL); i--);
-                if (!(inb(ESDI_STATUS) & STATUS_STAT_AVAIL)) {
-                        printk("%s: timeout reading status word\n", DEVICE_NAME);
-                        return FAIL;
-                }
-                *buffer = inw(ESDI_STT_INT);
-        }
-        return SUCCES;
-}
-
-
-
-
-static void dump_cmd_complete_status(u_int int_ret_code)
-{
-#define WAIT_FOR_STATUS \
-  for(i=ESDI_TIMEOUT;i && !(inb(ESDI_STATUS) & STATUS_STAT_AVAIL);i--); \
-    if(!(inb(ESDI_STATUS) & STATUS_STAT_AVAIL)) { \
-    printk("%s: timeout reading status word\n",DEVICE_NAME); \
-    return; \
-    }
-
-        int i, word_count;
-        u_short stat_word;
-        u_long rba;
-
-        printk("%s: Device: %u, interrupt ID: %02X\n",
-               DEVICE_NAME, int_ret_code >> 5,
-               int_ret_code & 0xf);
-
-        WAIT_FOR_STATUS;
-        stat_word = inw(ESDI_STT_INT);
-        word_count = (stat_word >> 8) - 1;
-        printk("%s: %u status words, command: %02X\n", DEVICE_NAME, word_count,
-               stat_word & 0xff);
-
-        if (word_count--) {
-                WAIT_FOR_STATUS;
-                stat_word = inw(ESDI_STT_INT);
-                printk("%s: command status code: %02X, command error code: %02X\n",
-                       DEVICE_NAME, stat_word >> 8, stat_word & 0xff);
-        }
-        if (word_count--) {
-                WAIT_FOR_STATUS;
-                stat_word = inw(ESDI_STT_INT);
-                printk("%s: device error code: %s%s%s%s%s,%02X\n", DEVICE_NAME,
-                       (stat_word & 0x1000) ? "Ready, " : "Not Ready, ",
-                  (stat_word & 0x0800) ? "Selected, " : "Not Selected, ",
-                       (stat_word & 0x0400) ? "Write Fault, " : "",
-                       (stat_word & 0x0200) ? "Track 0, " : "",
-                (stat_word & 0x0100) ? "Seek or command complete, " : "",
-                       stat_word >> 8);
-        }
-        if (word_count--) {
-                WAIT_FOR_STATUS;
-                stat_word = inw(ESDI_STT_INT);
-                printk("%s: Blocks to do: %u", DEVICE_NAME, stat_word);
-        }
-        if (word_count -= 2) {
-                WAIT_FOR_STATUS;
-                rba = inw(ESDI_STT_INT);
-                WAIT_FOR_STATUS;
-                rba |= inw(ESDI_STT_INT) << 16;
-                printk(", Last Cyl: %u Head: %u Sector: %u\n",
-                       (u_short) ((rba & 0x1ff80000) >> 11),
-                 (u_short) ((rba & 0x7E0) >> 5), (u_short) (rba & 0x1f));
-        } else
-                printk("\n");
-
-        if (word_count--) {
-                WAIT_FOR_STATUS;
-                stat_word = inw(ESDI_STT_INT);
-                printk("%s: Blocks required ECC: %u", DEVICE_NAME, stat_word);
-        }
-        printk("\n");
-
-#undef WAIT_FOR_STATUS
-
-}
-
-static int ps2esdi_getgeo(struct block_device *bdev, struct hd_geometry *geo)
-{
-        struct ps2esdi_i_struct *p = bdev->bd_disk->private_data;
-
-        geo->heads = p->head;
-        geo->sectors = p->sect;
-        geo->cylinders = p->cyl;
-        return 0;
-}
-
-static void ps2esdi_reset_timer(unsigned long unused)
-{
-
-        int status;
-
-        status = inb(ESDI_INTRPT);
-        if ((status & 0xf) == INT_RESET) {
-                outb((status & 0xe0) | ATT_EOI, ESDI_ATTN);
-                outb(CTRL_ENABLE_INTR, ESDI_CONTROL);
-                reset_status = 1;
-        }
-        wake_up(&ps2esdi_int);
-}
diff --git a/drivers/block/viodasd.c b/drivers/block/viodasd.c
index 9e61fca46117..41ca721d2523 100644
--- a/drivers/block/viodasd.c
+++ b/drivers/block/viodasd.c
@@ -528,8 +528,7 @@ static int block_event_to_scatterlist(const struct vioblocklpevent *bevent,
                 numsg = VIOMAXBLOCKDMA;
 
         *total_len = 0;
-        memset(sg, 0, sizeof(sg[0]) * VIOMAXBLOCKDMA);
-
+        sg_init_table(sg, VIOMAXBLOCKDMA);
         for (i = 0; (i < numsg) && (rw_data->dma_info[i].len > 0); ++i) {
                 sg_dma_address(&sg[i]) = rw_data->dma_info[i].token;
                 sg_dma_len(&sg[i]) = rw_data->dma_info[i].len;
diff --git a/drivers/block/virtio_blk.c b/drivers/block/virtio_blk.c
index 3b1a68d6eddb..0cfbe8c594a5 100644
--- a/drivers/block/virtio_blk.c
+++ b/drivers/block/virtio_blk.c
@@ -238,6 +238,7 @@ static int virtblk_probe(struct virtio_device *vdev)
         vblk->disk->first_minor = index_to_minor(index);
         vblk->disk->private_data = vblk;
         vblk->disk->fops = &virtblk_fops;
+        vblk->disk->driverfs_dev = &vdev->dev;
         index++;
 
         /* If barriers are supported, tell block layer that queue is ordered */
diff --git a/drivers/bluetooth/hci_usb.c b/drivers/bluetooth/hci_usb.c
index f16c94cbf488..8b884f87d8b7 100644
--- a/drivers/bluetooth/hci_usb.c
+++ b/drivers/bluetooth/hci_usb.c
@@ -149,6 +149,9 @@ static struct usb_device_id blacklist_ids[] = {
         { USB_DEVICE(0x0400, 0x0807), .driver_info = HCI_BROKEN_ISOC },
         { USB_DEVICE(0x0400, 0x080a), .driver_info = HCI_BROKEN_ISOC },
 
+        /* CONWISE Technology based adapters with buggy SCO support */
+        { USB_DEVICE(0x0e5e, 0x6622), .driver_info = HCI_BROKEN_ISOC },
+
         /* Belkin F8T012 and F8T013 devices */
         { USB_DEVICE(0x050d, 0x0012), .driver_info = HCI_RESET | HCI_WRONG_SCO_MTU },
         { USB_DEVICE(0x050d, 0x0013), .driver_info = HCI_RESET | HCI_WRONG_SCO_MTU },
diff --git a/drivers/char/drm/ati_pcigart.c b/drivers/char/drm/ati_pcigart.c
index d352dbb4ccf7..141f4dfa0a11 100644
--- a/drivers/char/drm/ati_pcigart.c
+++ b/drivers/char/drm/ati_pcigart.c
@@ -35,42 +35,23 @@
 
 # define ATI_PCIGART_PAGE_SIZE          4096    /**< PCI GART page size */
 
-static void *drm_ati_alloc_pcigart_table(int order)
+static int drm_ati_alloc_pcigart_table(struct drm_device *dev,
+                                       struct drm_ati_pcigart_info *gart_info)
 {
-        unsigned long address;
-        struct page *page;
-        int i;
-
-        DRM_DEBUG("%d order\n", order);
-
-        address = __get_free_pages(GFP_KERNEL | __GFP_COMP,
-                                   order);
-        if (address == 0UL) {
-                return NULL;
-        }
-
-        page = virt_to_page(address);
-
-        for (i = 0; i < order; i++, page++)
-                SetPageReserved(page);
+        gart_info->table_handle = drm_pci_alloc(dev, gart_info->table_size,
+                                                PAGE_SIZE,
+                                                gart_info->table_mask);
+        if (gart_info->table_handle == NULL)
+                return -ENOMEM;
 
-        DRM_DEBUG("returning 0x%08lx\n", address);
-        return (void *)address;
+        return 0;
 }
 
-static void drm_ati_free_pcigart_table(void *address, int order)
+static void drm_ati_free_pcigart_table(struct drm_device *dev,
+                                       struct drm_ati_pcigart_info *gart_info)
 {
-        struct page *page;
-        int i;
-        int num_pages = 1 << order;
-        DRM_DEBUG("\n");
-
-        page = virt_to_page((unsigned long)address);
-
-        for (i = 0; i < num_pages; i++, page++)
-                ClearPageReserved(page);
-
-        free_pages((unsigned long)address, order);
+        drm_pci_free(dev, gart_info->table_handle);
+        gart_info->table_handle = NULL;
 }
 
 int drm_ati_pcigart_cleanup(struct drm_device *dev, struct drm_ati_pcigart_info *gart_info)
@@ -78,8 +59,7 @@ int drm_ati_pcigart_cleanup(struct drm_device *dev, struct drm_ati_pcigart_info
         struct drm_sg_mem *entry = dev->sg;
         unsigned long pages;
         int i;
-        int order;
-        int num_pages, max_pages;
+        int max_pages;
 
         /* we need to support large memory configurations */
         if (!entry) {
@@ -87,15 +67,7 @@ int drm_ati_pcigart_cleanup(struct drm_device *dev, struct drm_ati_pcigart_info
                 return 0;
         }
 
-        order = drm_order((gart_info->table_size + (PAGE_SIZE-1)) / PAGE_SIZE);
-        num_pages = 1 << order;
-
         if (gart_info->bus_addr) {
-                if (gart_info->gart_table_location == DRM_ATI_GART_MAIN) {
-                        pci_unmap_single(dev->pdev, gart_info->bus_addr,
-                                         num_pages * PAGE_SIZE,
-                                         PCI_DMA_TODEVICE);
-                }
 
                 max_pages = (gart_info->table_size / sizeof(u32));
                 pages = (entry->pages <= max_pages)
@@ -112,10 +84,9 @@ int drm_ati_pcigart_cleanup(struct drm_device *dev, struct drm_ati_pcigart_info
                         gart_info->bus_addr = 0;
         }
 
-        if (gart_info->gart_table_location == DRM_ATI_GART_MAIN
-            && gart_info->addr) {
-                drm_ati_free_pcigart_table(gart_info->addr, order);
-                gart_info->addr = NULL;
+        if (gart_info->gart_table_location == DRM_ATI_GART_MAIN &&
+            gart_info->table_handle) {
+                drm_ati_free_pcigart_table(dev, gart_info);
         }
 
         return 1;
@@ -127,11 +98,10 @@ int drm_ati_pcigart_init(struct drm_device *dev, struct drm_ati_pcigart_info *ga
         struct drm_sg_mem *entry = dev->sg;
         void *address = NULL;
         unsigned long pages;
-        u32 *pci_gart, page_base, bus_address = 0;
+        u32 *pci_gart, page_base;
+        dma_addr_t bus_address = 0;
         int i, j, ret = 0;
-        int order;
         int max_pages;
-        int num_pages;
 
         if (!entry) {
                 DRM_ERROR("no scatter/gather memory!\n");
@@ -141,36 +111,20 @@ int drm_ati_pcigart_init(struct drm_device *dev, struct drm_ati_pcigart_info *ga
         if (gart_info->gart_table_location == DRM_ATI_GART_MAIN) {
                 DRM_DEBUG("PCI: no table in VRAM: using normal RAM\n");
 
-                order = drm_order((gart_info->table_size +
-                                   (PAGE_SIZE-1)) / PAGE_SIZE);
-                num_pages = 1 << order;
-                address = drm_ati_alloc_pcigart_table(order);
-                if (!address) {
+                ret = drm_ati_alloc_pcigart_table(dev, gart_info);
+                if (ret) {
                         DRM_ERROR("cannot allocate PCI GART page!\n");
                         goto done;
                 }
 
-                if (!dev->pdev) {
-                        DRM_ERROR("PCI device unknown!\n");
-                        goto done;
-                }
-
-                bus_address = pci_map_single(dev->pdev, address,
-                                             num_pages * PAGE_SIZE,
-                                             PCI_DMA_TODEVICE);
-                if (bus_address == 0) {
-                        DRM_ERROR("unable to map PCIGART pages!\n");
-                        order = drm_order((gart_info->table_size +
-                                           (PAGE_SIZE-1)) / PAGE_SIZE);
-                        drm_ati_free_pcigart_table(address, order);
-                        address = NULL;
-                        goto done;
-                }
+                address = gart_info->table_handle->vaddr;
+                bus_address = gart_info->table_handle->busaddr;
         } else {
                 address = gart_info->addr;
                 bus_address = gart_info->bus_addr;
-                DRM_DEBUG("PCI: Gart Table: VRAM %08X mapped at %08lX\n",
-                          bus_address, (unsigned long)address);
+                DRM_DEBUG("PCI: Gart Table: VRAM %08LX mapped at %08lX\n",
+                          (unsigned long long)bus_address,
+                          (unsigned long)address);
         }
 
         pci_gart = (u32 *) address;
@@ -214,6 +168,12 @@ int drm_ati_pcigart_init(struct drm_device *dev, struct drm_ati_pcigart_info *ga
                 }
         }
 
+        if (gart_info->gart_table_location == DRM_ATI_GART_MAIN)
+                dma_sync_single_for_device(&dev->pdev->dev,
+                                           bus_address,
+                                           max_pages * sizeof(u32),
+                                           PCI_DMA_TODEVICE);
+
         ret = 1;
 
 #if defined(__i386__) || defined(__x86_64__)
diff --git a/drivers/char/drm/drmP.h b/drivers/char/drm/drmP.h
index a6789f25009b..8ea9dd1717a9 100644
--- a/drivers/char/drm/drmP.h
+++ b/drivers/char/drm/drmP.h
@@ -54,6 +54,7 @@
 #include <linux/pci.h>
 #include <linux/jiffies.h>
 #include <linux/smp_lock.h>     /* For (un)lock_kernel */
+#include <linux/dma-mapping.h>
 #include <linux/mm.h>
 #include <linux/cdev.h>
 #include <linux/mutex.h>
@@ -551,6 +552,8 @@ struct drm_ati_pcigart_info {
         int gart_reg_if;
         void *addr;
         dma_addr_t bus_addr;
+        dma_addr_t table_mask;
+        struct drm_dma_handle *table_handle;
         drm_local_map_t mapping;
         int table_size;
 };
diff --git a/drivers/char/drm/drm_fops.c b/drivers/char/drm/drm_fops.c
index 3992f73299cc..f09d4b5002b0 100644
--- a/drivers/char/drm/drm_fops.c
+++ b/drivers/char/drm/drm_fops.c
@@ -326,6 +326,7 @@ int drm_release(struct inode *inode, struct file *filp)
         struct drm_file *file_priv = filp->private_data;
         struct drm_device *dev = file_priv->head->dev;
         int retcode = 0;
+        unsigned long irqflags;
 
         lock_kernel();
 
@@ -357,9 +358,11 @@ int drm_release(struct inode *inode, struct file *filp)
                          */
 
                         do{
-                                spin_lock(&dev->lock.spinlock);
+                                spin_lock_irqsave(&dev->lock.spinlock,
+                                                  irqflags);
                                 locked = dev->lock.idle_has_lock;
-                                spin_unlock(&dev->lock.spinlock);
+                                spin_unlock_irqrestore(&dev->lock.spinlock,
+                                                       irqflags);
                                 if (locked)
                                         break;
                                 schedule();
diff --git a/drivers/char/drm/drm_lock.c b/drivers/char/drm/drm_lock.c
index bea2a7d5b2b2..12dcdd1832f0 100644
--- a/drivers/char/drm/drm_lock.c
+++ b/drivers/char/drm/drm_lock.c
@@ -53,6 +53,7 @@ int drm_lock(struct drm_device *dev, void *data, struct drm_file *file_priv)
         DECLARE_WAITQUEUE(entry, current);
         struct drm_lock *lock = data;
         int ret = 0;
+        unsigned long irqflags;
 
         ++file_priv->lock_count;
 
@@ -71,9 +72,9 @@ int drm_lock(struct drm_device *dev, void *data, struct drm_file *file_priv)
                         return -EINVAL;
 
         add_wait_queue(&dev->lock.lock_queue, &entry);
-        spin_lock(&dev->lock.spinlock);
+        spin_lock_irqsave(&dev->lock.spinlock, irqflags);
         dev->lock.user_waiters++;
-        spin_unlock(&dev->lock.spinlock);
+        spin_unlock_irqrestore(&dev->lock.spinlock, irqflags);
         for (;;) {
                 __set_current_state(TASK_INTERRUPTIBLE);
                 if (!dev->lock.hw_lock) {
@@ -95,9 +96,9 @@ int drm_lock(struct drm_device *dev, void *data, struct drm_file *file_priv)
                         break;
                 }
         }
-        spin_lock(&dev->lock.spinlock);
+        spin_lock_irqsave(&dev->lock.spinlock, irqflags);
         dev->lock.user_waiters--;
-        spin_unlock(&dev->lock.spinlock);
+        spin_unlock_irqrestore(&dev->lock.spinlock, irqflags);
         __set_current_state(TASK_RUNNING);
         remove_wait_queue(&dev->lock.lock_queue, &entry);
 
@@ -198,8 +199,9 @@ int drm_lock_take(struct drm_lock_data *lock_data,
 {
         unsigned int old, new, prev;
         volatile unsigned int *lock = &lock_data->hw_lock->lock;
+        unsigned long irqflags;
 
-        spin_lock(&lock_data->spinlock);
+        spin_lock_irqsave(&lock_data->spinlock, irqflags);
         do {
                 old = *lock;
                 if (old & _DRM_LOCK_HELD)
@@ -211,7 +213,7 @@ int drm_lock_take(struct drm_lock_data *lock_data,
                 }
                 prev = cmpxchg(lock, old, new);
         } while (prev != old);
-        spin_unlock(&lock_data->spinlock);
+        spin_unlock_irqrestore(&lock_data->spinlock, irqflags);
 
         if (_DRM_LOCKING_CONTEXT(old) == context) {
                 if (old & _DRM_LOCK_HELD) {
@@ -272,15 +274,16 @@ int drm_lock_free(struct drm_lock_data *lock_data, unsigned int context)
 {
         unsigned int old, new, prev;
         volatile unsigned int *lock = &lock_data->hw_lock->lock;
+        unsigned long irqflags;
 
-        spin_lock(&lock_data->spinlock);
+        spin_lock_irqsave(&lock_data->spinlock, irqflags);
         if (lock_data->kernel_waiters != 0) {
                 drm_lock_transfer(lock_data, 0);
                 lock_data->idle_has_lock = 1;
-                spin_unlock(&lock_data->spinlock);
+                spin_unlock_irqrestore(&lock_data->spinlock, irqflags);
                 return 1;
         }
-        spin_unlock(&lock_data->spinlock);
+        spin_unlock_irqrestore(&lock_data->spinlock, irqflags);
 
         do {
                 old = *lock;
@@ -344,19 +347,20 @@ static int drm_notifier(void *priv)
 void drm_idlelock_take(struct drm_lock_data *lock_data)
 {
         int ret = 0;
+        unsigned long irqflags;
 
-        spin_lock(&lock_data->spinlock);
+        spin_lock_irqsave(&lock_data->spinlock, irqflags);
         lock_data->kernel_waiters++;
         if (!lock_data->idle_has_lock) {
 
-                spin_unlock(&lock_data->spinlock);
+                spin_unlock_irqrestore(&lock_data->spinlock, irqflags);
                 ret = drm_lock_take(lock_data, DRM_KERNEL_CONTEXT);
-                spin_lock(&lock_data->spinlock);
+                spin_lock_irqsave(&lock_data->spinlock, irqflags);
 
                 if (ret == 1)
                         lock_data->idle_has_lock = 1;
         }
-        spin_unlock(&lock_data->spinlock);
+        spin_unlock_irqrestore(&lock_data->spinlock, irqflags);
 }
 EXPORT_SYMBOL(drm_idlelock_take);
 
@@ -364,8 +368,9 @@ void drm_idlelock_release(struct drm_lock_data *lock_data)
 {
         unsigned int old, prev;
         volatile unsigned int *lock = &lock_data->hw_lock->lock;
+        unsigned long irqflags;
 
-        spin_lock(&lock_data->spinlock);
+        spin_lock_irqsave(&lock_data->spinlock, irqflags);
         if (--lock_data->kernel_waiters == 0) {
                 if (lock_data->idle_has_lock) {
                         do {
@@ -376,7 +381,7 @@ void drm_idlelock_release(struct drm_lock_data *lock_data)
                         lock_data->idle_has_lock = 0;
                 }
         }
-        spin_unlock(&lock_data->spinlock);
+        spin_unlock_irqrestore(&lock_data->spinlock, irqflags);
 }
 EXPORT_SYMBOL(drm_idlelock_release);
 
diff --git a/drivers/char/drm/drm_pciids.h b/drivers/char/drm/drm_pciids.h
index 715b361f0c2b..a6a499f97e22 100644
--- a/drivers/char/drm/drm_pciids.h
+++ b/drivers/char/drm/drm_pciids.h
@@ -205,9 +205,9 @@
         {0x1002, 0x71D6, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV530|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP}, \
         {0x1002, 0x71DA, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV530|RADEON_NEW_MEMMAP}, \
         {0x1002, 0x71DE, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV530|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP}, \
-        {0x1002, 0x7200, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV530|RADEON_NEW_MEMMAP}, \
-        {0x1002, 0x7210, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV530|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP}, \
-        {0x1002, 0x7211, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV530|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP}, \
+        {0x1002, 0x7200, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV515|RADEON_NEW_MEMMAP}, \
+        {0x1002, 0x7210, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV515|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP}, \
+        {0x1002, 0x7211, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV515|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP}, \
         {0x1002, 0x7240, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_R580|RADEON_NEW_MEMMAP}, \
         {0x1002, 0x7243, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_R580|RADEON_NEW_MEMMAP}, \
         {0x1002, 0x7244, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_R580|RADEON_NEW_MEMMAP}, \
@@ -238,6 +238,7 @@
         {0x1002, 0x7834, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RS300|RADEON_IS_IGP|RADEON_NEW_MEMMAP}, \
         {0x1002, 0x7835, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RS300|RADEON_IS_IGP|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP}, \
         {0x1002, 0x791e, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RS690|RADEON_IS_IGP|RADEON_NEW_MEMMAP|RADEON_IS_IGPGART}, \
+        {0x1002, 0x791f, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RS690|RADEON_IS_IGP|RADEON_NEW_MEMMAP|RADEON_IS_IGPGART}, \
         {0, 0, 0}
 
 #define r128_PCI_IDS \
diff --git a/drivers/char/drm/drm_scatter.c b/drivers/char/drm/drm_scatter.c
index 26d8f675ed5d..b2b0f3d41714 100644
--- a/drivers/char/drm/drm_scatter.c
+++ b/drivers/char/drm/drm_scatter.c
@@ -36,6 +36,15 @@
 
 #define DEBUG_SCATTER 0
 
+static inline void *drm_vmalloc_dma(unsigned long size)
+{
+#if defined(__powerpc__) && defined(CONFIG_NOT_COHERENT_CACHE)
+        return __vmalloc(size, GFP_KERNEL, PAGE_KERNEL | _PAGE_NO_CACHE);
+#else
+        return vmalloc_32(size);
+#endif
+}
+
 void drm_sg_cleanup(struct drm_sg_mem * entry)
 {
         struct page *page;
@@ -104,7 +113,7 @@ int drm_sg_alloc(struct drm_device *dev, struct drm_scatter_gather * request)
         }
         memset((void *)entry->busaddr, 0, pages * sizeof(*entry->busaddr));
 
-        entry->virtual = vmalloc_32(pages << PAGE_SHIFT);
+        entry->virtual = drm_vmalloc_dma(pages << PAGE_SHIFT);
         if (!entry->virtual) {
                 drm_free(entry->busaddr,
                          entry->pages * sizeof(*entry->busaddr), DRM_MEM_PAGES);
diff --git a/drivers/char/drm/drm_vm.c b/drivers/char/drm/drm_vm.c
index 3d65c4dcd0c6..945df72a51a9 100644
--- a/drivers/char/drm/drm_vm.c
+++ b/drivers/char/drm/drm_vm.c
@@ -54,13 +54,24 @@ static pgprot_t drm_io_prot(uint32_t map_type, struct vm_area_struct *vma)
         pgprot_val(tmp) |= _PAGE_NO_CACHE;
         if (map_type == _DRM_REGISTERS)
                 pgprot_val(tmp) |= _PAGE_GUARDED;
-#endif
-#if defined(__ia64__)
+#elif defined(__ia64__)
         if (efi_range_is_wc(vma->vm_start, vma->vm_end -
                                     vma->vm_start))
                 tmp = pgprot_writecombine(tmp);
         else
                 tmp = pgprot_noncached(tmp);
+#elif defined(__sparc__)
+        tmp = pgprot_noncached(tmp);
+#endif
+        return tmp;
+}
+
+static pgprot_t drm_dma_prot(uint32_t map_type, struct vm_area_struct *vma)
+{
+        pgprot_t tmp = vm_get_page_prot(vma->vm_flags);
+
+#if defined(__powerpc__) && defined(CONFIG_NOT_COHERENT_CACHE)
+        tmp |= _PAGE_NO_CACHE;
 #endif
         return tmp;
 }
@@ -603,9 +614,6 @@ static int drm_mmap_locked(struct file *filp, struct vm_area_struct *vma)
                 offset = dev->driver->get_reg_ofs(dev);
                 vma->vm_flags |= VM_IO; /* not in core dump */
                 vma->vm_page_prot = drm_io_prot(map->type, vma);
-#ifdef __sparc__
-                vma->vm_page_prot = pgprot_noncached(vma->vm_page_prot);
-#endif
                 if (io_remap_pfn_range(vma, vma->vm_start,
                                        (map->offset + offset) >> PAGE_SHIFT,
                                        vma->vm_end - vma->vm_start,
@@ -624,6 +632,7 @@ static int drm_mmap_locked(struct file *filp, struct vm_area_struct *vma)
                     page_to_pfn(virt_to_page(map->handle)),
                     vma->vm_end - vma->vm_start, vma->vm_page_prot))
                         return -EAGAIN;
+                vma->vm_page_prot = drm_dma_prot(map->type, vma);
         /* fall through to _DRM_SHM */
         case _DRM_SHM:
                 vma->vm_ops = &drm_vm_shm_ops;
@@ -631,6 +640,7 @@ static int drm_mmap_locked(struct file *filp, struct vm_area_struct *vma)
                 /* Don't let this area swap.  Change when
                    DRM_KERNEL advisory is supported. */
                 vma->vm_flags |= VM_RESERVED;
+                vma->vm_page_prot = drm_dma_prot(map->type, vma);
                 break;
         case _DRM_SCATTER_GATHER:
                 vma->vm_ops = &drm_vm_sg_ops;
diff --git a/drivers/char/drm/i915_dma.c b/drivers/char/drm/i915_dma.c
index e9d6663bec73..a043bb12301a 100644
--- a/drivers/char/drm/i915_dma.c
+++ b/drivers/char/drm/i915_dma.c
@@ -804,6 +804,9 @@ void i915_driver_lastclose(struct drm_device * dev)
 {
         drm_i915_private_t *dev_priv = dev->dev_private;
 
+        if (!dev_priv)
+                return;
+
         if (dev_priv->agp_heap)
                 i915_mem_takedown(&(dev_priv->agp_heap));
 
diff --git a/drivers/char/drm/r128_cce.c b/drivers/char/drm/r128_cce.c
index 892e0a589846..f36adbd3aaf5 100644
--- a/drivers/char/drm/r128_cce.c
+++ b/drivers/char/drm/r128_cce.c
@@ -558,6 +558,7 @@ static int r128_do_init_cce(struct drm_device * dev, drm_r128_init_t * init)
 #if __OS_HAS_AGP
         if (dev_priv->is_pci) {
 #endif
+                dev_priv->gart_info.table_mask = DMA_BIT_MASK(32);
                 dev_priv->gart_info.gart_table_location = DRM_ATI_GART_MAIN;
                 dev_priv->gart_info.table_size = R128_PCIGART_TABLE_SIZE;
                 dev_priv->gart_info.addr = NULL;
diff --git a/drivers/char/drm/r300_cmdbuf.c b/drivers/char/drm/r300_cmdbuf.c
index 0f4afc44245c..f535812e4057 100644
--- a/drivers/char/drm/r300_cmdbuf.c
+++ b/drivers/char/drm/r300_cmdbuf.c
@@ -729,6 +729,47 @@ static void r300_discard_buffer(struct drm_device * dev, struct drm_buf * buf)
         buf->used = 0;
 }
 
+static void r300_cmd_wait(drm_radeon_private_t * dev_priv,
+                          drm_r300_cmd_header_t header)
+{
+        u32 wait_until;
+        RING_LOCALS;
+
+        if (!header.wait.flags)
+                return;
+
+        wait_until = 0;
+
+        switch(header.wait.flags) {
+        case R300_WAIT_2D:
+                wait_until = RADEON_WAIT_2D_IDLE;
+                break;
+        case R300_WAIT_3D:
+                wait_until = RADEON_WAIT_3D_IDLE;
+                break;
+        case R300_NEW_WAIT_2D_3D:
+                wait_until = RADEON_WAIT_2D_IDLE|RADEON_WAIT_3D_IDLE;
+                break;
+        case R300_NEW_WAIT_2D_2D_CLEAN:
+                wait_until = RADEON_WAIT_2D_IDLE|RADEON_WAIT_2D_IDLECLEAN;
+                break;
+        case R300_NEW_WAIT_3D_3D_CLEAN:
+                wait_until = RADEON_WAIT_3D_IDLE|RADEON_WAIT_3D_IDLECLEAN;
+                break;
+        case R300_NEW_WAIT_2D_2D_CLEAN_3D_3D_CLEAN:
+                wait_until = RADEON_WAIT_2D_IDLE|RADEON_WAIT_2D_IDLECLEAN;
+                wait_until |= RADEON_WAIT_3D_IDLE|RADEON_WAIT_3D_IDLECLEAN;
+                break;
+        default:
+                return;
+        }
+
+        BEGIN_RING(2);
+        OUT_RING(CP_PACKET0(RADEON_WAIT_UNTIL, 0));
+        OUT_RING(wait_until);
+        ADVANCE_RING();
+}
+
 static int r300_scratch(drm_radeon_private_t *dev_priv,
                         drm_radeon_kcmd_buffer_t *cmdbuf,
                         drm_r300_cmd_header_t header)
@@ -909,19 +950,8 @@ int r300_do_cp_cmdbuf(struct drm_device *dev,
                         break;
 
                 case R300_CMD_WAIT:
-                        /* simple enough, we can do it here */
                         DRM_DEBUG("R300_CMD_WAIT\n");
-                        if (header.wait.flags == 0)
-                                break;  /* nothing to do */
-
-                        {
-                                RING_LOCALS;
-
-                                BEGIN_RING(2);
-                                OUT_RING(CP_PACKET0(RADEON_WAIT_UNTIL, 0));
-                                OUT_RING((header.wait.flags & 0xf) << 14);
-                                ADVANCE_RING();
-                        }
+                        r300_cmd_wait(dev_priv, header);
                         break;
 
                 case R300_CMD_SCRATCH:
diff --git a/drivers/char/drm/radeon_cp.c b/drivers/char/drm/radeon_cp.c
index 833abc7e55fb..9072e4a1894e 100644
--- a/drivers/char/drm/radeon_cp.c
+++ b/drivers/char/drm/radeon_cp.c
@@ -1807,6 +1807,7 @@ static int radeon_do_init_cp(struct drm_device * dev, drm_radeon_init_t * init)
         } else
 #endif
         {
+                dev_priv->gart_info.table_mask = DMA_BIT_MASK(32);
                 /* if we have an offset set from userspace */
                 if (dev_priv->pcigart_offset_set) {
                         dev_priv->gart_info.bus_addr =
diff --git a/drivers/char/drm/radeon_drm.h b/drivers/char/drm/radeon_drm.h
index 71e5b21fad2c..aab82e121e07 100644
--- a/drivers/char/drm/radeon_drm.h
+++ b/drivers/char/drm/radeon_drm.h
@@ -225,8 +225,20 @@ typedef union {
 #define R300_CMD_WAIT                   7
 #       define R300_WAIT_2D             0x1
 #       define R300_WAIT_3D             0x2
+/* these two defines are DOING IT WRONG - however
+ * we have userspace which relies on using these.
+ * The wait interface is backwards compat new 
+ * code should use the NEW_WAIT defines below
+ * THESE ARE NOT BIT FIELDS
+ */
 #       define R300_WAIT_2D_CLEAN       0x3
 #       define R300_WAIT_3D_CLEAN       0x4
+
+#       define R300_NEW_WAIT_2D_3D      0x3
+#       define R300_NEW_WAIT_2D_2D_CLEAN        0x4
+#       define R300_NEW_WAIT_3D_3D_CLEAN        0x6
+#       define R300_NEW_WAIT_2D_2D_CLEAN_3D_3D_CLEAN    0x8
+
 #define R300_CMD_SCRATCH                8
 
 typedef union {
diff --git a/drivers/char/drm/radeon_mem.c b/drivers/char/drm/radeon_mem.c
index 78b34fa7c89a..4af5286a36fb 100644
--- a/drivers/char/drm/radeon_mem.c
+++ b/drivers/char/drm/radeon_mem.c
@@ -88,7 +88,7 @@ static struct mem_block *alloc_block(struct mem_block *heap, int size,
 
         list_for_each(p, heap) {
                 int start = (p->start + mask) & ~mask;
-                if (p->file_priv == 0 && start + size <= p->start + p->size)
+                if (p->file_priv == NULL && start + size <= p->start + p->size)
                         return split_block(p, start, size, file_priv);
         }
 
@@ -113,7 +113,7 @@ static void free_block(struct mem_block *p)
         /* Assumes a single contiguous range.  Needs a special file_priv in
          * 'heap' to stop it being subsumed.
          */
-        if (p->next->file_priv == 0) {
+        if (p->next->file_priv == NULL) {
                 struct mem_block *q = p->next;
                 p->size += q->size;
                 p->next = q->next;
@@ -121,7 +121,7 @@ static void free_block(struct mem_block *p)
                 drm_free(q, sizeof(*q), DRM_MEM_BUFS);
         }
 
-        if (p->prev->file_priv == 0) {
+        if (p->prev->file_priv == NULL) {
                 struct mem_block *q = p->prev;
                 q->size += p->size;
                 q->next = p->next;
@@ -174,7 +174,7 @@ void radeon_mem_release(struct drm_file *file_priv, struct mem_block *heap)
          * 'heap' to stop it being subsumed.
          */
         list_for_each(p, heap) {
-                while (p->file_priv == 0 && p->next->file_priv == 0) {
+                while (p->file_priv == NULL && p->next->file_priv == NULL) {
                         struct mem_block *q = p->next;
                         p->size += q->size;
                         p->next = q->next;
diff --git a/drivers/char/drm/via_dma.c b/drivers/char/drm/via_dma.c
index 94baec692b57..7a339dba6a69 100644
--- a/drivers/char/drm/via_dma.c
+++ b/drivers/char/drm/via_dma.c
@@ -126,6 +126,8 @@ via_cmdbuf_wait(drm_via_private_t * dev_priv, unsigned int size)
                              hw_addr, cur_addr, next_addr);
                         return -1;
                 }
+                if  ((cur_addr < hw_addr) && (next_addr >= hw_addr))
+                        msleep(1);
         } while ((cur_addr < hw_addr) && (next_addr >= hw_addr));
         return 0;
 }
@@ -416,27 +418,50 @@ static int via_hook_segment(drm_via_private_t * dev_priv,
         int paused, count;
         volatile uint32_t *paused_at = dev_priv->last_pause_ptr;
         uint32_t reader,ptr;
+        uint32_t diff;
 
         paused = 0;
         via_flush_write_combine();
         (void) *(volatile uint32_t *)(via_get_dma(dev_priv) -1);
+
         *paused_at = pause_addr_lo;
         via_flush_write_combine();
         (void) *paused_at;
+
         reader = *(dev_priv->hw_addr_ptr);
         ptr = ((volatile char *)paused_at - dev_priv->dma_ptr) +
                 dev_priv->dma_offset + (uint32_t) dev_priv->agpAddr + 4;
+
         dev_priv->last_pause_ptr = via_get_dma(dev_priv) - 1;
 
-        if ((ptr - reader) <= dev_priv->dma_diff ) {
-                count = 10000000;
-                while (!(paused = (VIA_READ(0x41c) & 0x80000000)) && count--);
+        /*
+         * If there is a possibility that the command reader will 
+         * miss the new pause address and pause on the old one,
+         * In that case we need to program the new start address
+         * using PCI.
+         */
+
+        diff = (uint32_t) (ptr - reader) - dev_priv->dma_diff;
+        count = 10000000;
+        while(diff == 0 && count--) {
+                paused = (VIA_READ(0x41c) & 0x80000000);
+                if (paused) 
+                        break;
+                reader = *(dev_priv->hw_addr_ptr);
+                diff = (uint32_t) (ptr - reader) - dev_priv->dma_diff;
         }
 
+        paused = VIA_READ(0x41c) & 0x80000000;
+
         if (paused && !no_pci_fire) {
                 reader = *(dev_priv->hw_addr_ptr);
-                if ((ptr - reader) == dev_priv->dma_diff) {
-
+                diff = (uint32_t) (ptr - reader) - dev_priv->dma_diff;
+                diff &= (dev_priv->dma_high - 1);
+                if (diff != 0 && diff < (dev_priv->dma_high >> 1)) {
+                        DRM_ERROR("Paused at incorrect address. "
+                                  "0x%08x, 0x%08x 0x%08x\n",
+                                  ptr, reader, dev_priv->dma_diff);
+                } else if (diff == 0) {
                         /*
                          * There is a concern that these writes may stall the PCI bus
                          * if the GPU is not idle. However, idling the GPU first
@@ -577,6 +602,7 @@ static void via_cmdbuf_jump(drm_via_private_t * dev_priv)
         uint32_t pause_addr_lo, pause_addr_hi;
         uint32_t jump_addr_lo, jump_addr_hi;
         volatile uint32_t *last_pause_ptr;
+        uint32_t dma_low_save1, dma_low_save2;
 
         agp_base = dev_priv->dma_offset + (uint32_t) dev_priv->agpAddr;
         via_align_cmd(dev_priv, HC_HAGPBpID_JUMP, 0, &jump_addr_hi,
@@ -603,8 +629,29 @@ static void via_cmdbuf_jump(drm_via_private_t * dev_priv)
                       &pause_addr_lo, 0);
 
         *last_pause_ptr = pause_addr_lo;
+        dma_low_save1 = dev_priv->dma_low;
 
-        via_hook_segment( dev_priv, jump_addr_hi, jump_addr_lo, 0);
+        /*
+         * Now, set a trap that will pause the regulator if it tries to rerun the old
+         * command buffer. (Which may happen if via_hook_segment detecs a command regulator pause
+         * and reissues the jump command over PCI, while the regulator has already taken the jump
+         * and actually paused at the current buffer end).
+         * There appears to be no other way to detect this condition, since the hw_addr_pointer
+         * does not seem to get updated immediately when a jump occurs.
+         */
+
+        last_pause_ptr =
+                via_align_cmd(dev_priv, HC_HAGPBpID_PAUSE, 0, &pause_addr_hi,
+                              &pause_addr_lo, 0) - 1;
+        via_align_cmd(dev_priv, HC_HAGPBpID_PAUSE, 0, &pause_addr_hi,
+                      &pause_addr_lo, 0);
+        *last_pause_ptr = pause_addr_lo;
+
+        dma_low_save2 = dev_priv->dma_low;
+        dev_priv->dma_low = dma_low_save1;
+        via_hook_segment(dev_priv, jump_addr_hi, jump_addr_lo, 0);
+        dev_priv->dma_low = dma_low_save2;
+        via_hook_segment(dev_priv, pause_addr_hi, pause_addr_lo, 0);
 }
 
 
diff --git a/drivers/char/drm/via_dmablit.c b/drivers/char/drm/via_dmablit.c
index 33c5197b73c4..409e00afdd07 100644
--- a/drivers/char/drm/via_dmablit.c
+++ b/drivers/char/drm/via_dmablit.c
@@ -603,7 +603,7 @@ via_build_sg_info(struct drm_device *dev, drm_via_sg_info_t *vsg, drm_via_dmabli
          * (Not a big limitation anyway.)
          */
 
-        if ((xfer->mem_stride - xfer->line_length) >= PAGE_SIZE) {
+        if ((xfer->mem_stride - xfer->line_length) > 2*PAGE_SIZE) {
                 DRM_ERROR("Too large system memory stride. Stride: %d, "
                           "Length: %d\n", xfer->mem_stride, xfer->line_length);
                 return -EINVAL;
diff --git a/drivers/char/hw_random/Kconfig b/drivers/char/hw_random/Kconfig
index 6bbd4fa50f3b..8d6c2089d2a8 100644
--- a/drivers/char/hw_random/Kconfig
+++ b/drivers/char/hw_random/Kconfig
@@ -9,7 +9,14 @@ config HW_RANDOM
           Hardware Random Number Generator Core infrastructure.
 
           To compile this driver as a module, choose M here: the
-          module will be called rng-core.
+          module will be called rng-core.  This provides a device
+          that's usually called /dev/hw_random, and which exposes one
+          of possibly several hardware random number generators.
+
+          These hardware random number generators do not feed directly
+          into the kernel's random number generator.  That is usually
+          handled by the "rngd" daemon.  Documentation/hw_random.txt
+          has more information.
 
           If unsure, say Y.
 
diff --git a/drivers/char/n_tty.c b/drivers/char/n_tty.c
index 46b2a1cc8b54..0c09409fa45d 100644
--- a/drivers/char/n_tty.c
+++ b/drivers/char/n_tty.c
@@ -1183,7 +1183,7 @@ static int copy_from_read_buf(struct tty_struct *tty,
         return retval;
 }
 
-extern ssize_t redirected_tty_write(struct file *, const char *,
+extern ssize_t redirected_tty_write(struct file *, const char __user *,
                                                         size_t, loff_t *);
 
 /**
diff --git a/drivers/char/nozomi.c b/drivers/char/nozomi.c
index 6d0dc5f9b6bb..6a6843a0a674 100644
--- a/drivers/char/nozomi.c
+++ b/drivers/char/nozomi.c
@@ -438,7 +438,7 @@ static void read_mem32(u32 *buf, const void __iomem *mem_addr_start,
                         u32 size_bytes)
 {
         u32 i = 0;
-        const u32 *ptr = (__force u32 *) mem_addr_start;
+        const u32 __iomem *ptr = mem_addr_start;
         u16 *buf16;
 
         if (unlikely(!ptr || !buf))
@@ -448,11 +448,11 @@ static void read_mem32(u32 *buf, const void __iomem *mem_addr_start,
         switch (size_bytes) {
         case 2: /* 2 bytes */
                 buf16 = (u16 *) buf;
-                *buf16 = __le16_to_cpu(readw((void __iomem *)ptr));
+                *buf16 = __le16_to_cpu(readw(ptr));
                 goto out;
                 break;
         case 4: /* 4 bytes */
-                *(buf) = __le32_to_cpu(readl((void __iomem *)ptr));
+                *(buf) = __le32_to_cpu(readl(ptr));
                 goto out;
                 break;
         }
@@ -461,11 +461,11 @@ static void read_mem32(u32 *buf, const void __iomem *mem_addr_start,
                 if (size_bytes - i == 2) {
                         /* Handle 2 bytes in the end */
                         buf16 = (u16 *) buf;
-                        *(buf16) = __le16_to_cpu(readw((void __iomem *)ptr));
+                        *(buf16) = __le16_to_cpu(readw(ptr));
                         i += 2;
                 } else {
                         /* Read 4 bytes */
-                        *(buf) = __le32_to_cpu(readl((void __iomem *)ptr));
+                        *(buf) = __le32_to_cpu(readl(ptr));
                         i += 4;
                 }
                 buf++;
@@ -484,7 +484,7 @@ static u32 write_mem32(void __iomem *mem_addr_start, const u32 *buf,
                         u32 size_bytes)
 {
         u32 i = 0;
-        u32 *ptr = (__force u32 *) mem_addr_start;
+        u32 __iomem *ptr = mem_addr_start;
         const u16 *buf16;
 
         if (unlikely(!ptr || !buf))
@@ -494,7 +494,7 @@ static u32 write_mem32(void __iomem *mem_addr_start, const u32 *buf,
         switch (size_bytes) {
         case 2: /* 2 bytes */
                 buf16 = (const u16 *)buf;
-                writew(__cpu_to_le16(*buf16), (void __iomem *)ptr);
+                writew(__cpu_to_le16(*buf16), ptr);
                 return 2;
                 break;
         case 1: /*
@@ -502,7 +502,7 @@ static u32 write_mem32(void __iomem *mem_addr_start, const u32 *buf,
                  * so falling through..
                  */
         case 4: /* 4 bytes */
-                writel(__cpu_to_le32(*buf), (void __iomem *)ptr);
+                writel(__cpu_to_le32(*buf), ptr);
                 return 4;
                 break;
         }
@@ -511,11 +511,11 @@ static u32 write_mem32(void __iomem *mem_addr_start, const u32 *buf,
                 if (size_bytes - i == 2) {
                         /* 2 bytes */
                         buf16 = (const u16 *)buf;
-                        writew(__cpu_to_le16(*buf16), (void __iomem *)ptr);
+                        writew(__cpu_to_le16(*buf16), ptr);
                         i += 2;
                 } else {
                         /* 4 bytes */
-                        writel(__cpu_to_le32(*buf), (void __iomem *)ptr);
+                        writel(__cpu_to_le32(*buf), ptr);
                         i += 4;
                 }
                 buf++;
diff --git a/drivers/char/riscom8.c b/drivers/char/riscom8.c
index 589ac6f65b9a..3f9d0a9ac36d 100644
--- a/drivers/char/riscom8.c
+++ b/drivers/char/riscom8.c
@@ -1709,7 +1709,7 @@ static int __init riscom8_init_module (void)
 
         if (iobase || iobase1 || iobase2 || iobase3) {
                 for(i = 0; i < RC_NBOARD; i++)
-                        rc_board[0].base = 0;
+                        rc_board[i].base = 0;
         }
 
         if (iobase)
diff --git a/drivers/char/rocket.c b/drivers/char/rocket.c
index 72f289279d8f..f585bc8579e9 100644
--- a/drivers/char/rocket.c
+++ b/drivers/char/rocket.c
@@ -83,6 +83,7 @@
 #include <linux/pci.h>
 #include <asm/uaccess.h>
 #include <asm/atomic.h>
+#include <asm/unaligned.h>
 #include <linux/bitops.h>
 #include <linux/spinlock.h>
 #include <linux/init.h>
@@ -1312,7 +1313,7 @@ static int rp_tiocmset(struct tty_struct *tty, struct file *file,
         if (clear & TIOCM_DTR)
                 info->channel.TxControl[3] &= ~SET_DTR;
 
-        sOutDW(info->channel.IndexAddr, *(DWord_t *) & (info->channel.TxControl[0]));
+        out32(info->channel.IndexAddr, info->channel.TxControl);
         return 0;
 }
 
@@ -1748,7 +1749,7 @@ static int rp_write(struct tty_struct *tty,
 
         /*  Write remaining data into the port's xmit_buf */
         while (1) {
-                if (info->tty == 0)     /*   Seemingly obligatory check... */
+                if (!info->tty) /*   Seemingly obligatory check... */
                         goto end;
 
                 c = min(count, min(XMIT_BUF_SIZE - info->xmit_cnt - 1, XMIT_BUF_SIZE - info->xmit_head));
@@ -2798,7 +2799,7 @@ static int sReadAiopNumChan(WordIO_t io)
         static Byte_t R[4] = { 0x00, 0x00, 0x34, 0x12 };
 
         /* write to chan 0 SRAM */
-        sOutDW((DWordIO_t) io + _INDX_ADDR, *((DWord_t *) & R[0]));
+        out32((DWordIO_t) io + _INDX_ADDR, R);
         sOutW(io + _INDX_ADDR, 0);      /* read from SRAM, chan 0 */
         x = sInW(io + _INDX_DATA);
         sOutW(io + _INDX_ADDR, 0x4000); /* read from SRAM, chan 4 */
@@ -2864,7 +2865,7 @@ static int sInitChan(CONTROLLER_T * CtlP, CHANNEL_T * ChP, int AiopNum,
                 R[1] = RData[i + 1] + 0x10 * ChanNum;
                 R[2] = RData[i + 2];
                 R[3] = RData[i + 3];
-                sOutDW(ChP->IndexAddr, *((DWord_t *) & R[0]));
+                out32(ChP->IndexAddr, R);
         }
 
         ChR = ChP->R;
@@ -2887,43 +2888,43 @@ static int sInitChan(CONTROLLER_T * CtlP, CHANNEL_T * ChP, int AiopNum,
         ChP->BaudDiv[1] = (Byte_t) ((ChOff + _BAUD) >> 8);
         ChP->BaudDiv[2] = (Byte_t) brd9600;
         ChP->BaudDiv[3] = (Byte_t) (brd9600 >> 8);
-        sOutDW(ChP->IndexAddr, *(DWord_t *) & ChP->BaudDiv[0]);
+        out32(ChP->IndexAddr, ChP->BaudDiv);
 
         ChP->TxControl[0] = (Byte_t) (ChOff + _TX_CTRL);
         ChP->TxControl[1] = (Byte_t) ((ChOff + _TX_CTRL) >> 8);
         ChP->TxControl[2] = 0;
         ChP->TxControl[3] = 0;
-        sOutDW(ChP->IndexAddr, *(DWord_t *) & ChP->TxControl[0]);
+        out32(ChP->IndexAddr, ChP->TxControl);
 
         ChP->RxControl[0] = (Byte_t) (ChOff + _RX_CTRL);
         ChP->RxControl[1] = (Byte_t) ((ChOff + _RX_CTRL) >> 8);
         ChP->RxControl[2] = 0;
         ChP->RxControl[3] = 0;
-        sOutDW(ChP->IndexAddr, *(DWord_t *) & ChP->RxControl[0]);
+        out32(ChP->IndexAddr, ChP->RxControl);
 
         ChP->TxEnables[0] = (Byte_t) (ChOff + _TX_ENBLS);
         ChP->TxEnables[1] = (Byte_t) ((ChOff + _TX_ENBLS) >> 8);
         ChP->TxEnables[2] = 0;
         ChP->TxEnables[3] = 0;
-        sOutDW(ChP->IndexAddr, *(DWord_t *) & ChP->TxEnables[0]);
+        out32(ChP->IndexAddr, ChP->TxEnables);
 
         ChP->TxCompare[0] = (Byte_t) (ChOff + _TXCMP1);
         ChP->TxCompare[1] = (Byte_t) ((ChOff + _TXCMP1) >> 8);
         ChP->TxCompare[2] = 0;
         ChP->TxCompare[3] = 0;
-        sOutDW(ChP->IndexAddr, *(DWord_t *) & ChP->TxCompare[0]);
+        out32(ChP->IndexAddr, ChP->TxCompare);
 
         ChP->TxReplace1[0] = (Byte_t) (ChOff + _TXREP1B1);
         ChP->TxReplace1[1] = (Byte_t) ((ChOff + _TXREP1B1) >> 8);
         ChP->TxReplace1[2] = 0;
         ChP->TxReplace1[3] = 0;
-        sOutDW(ChP->IndexAddr, *(DWord_t *) & ChP->TxReplace1[0]);
+        out32(ChP->IndexAddr, ChP->TxReplace1);
 
         ChP->TxReplace2[0] = (Byte_t) (ChOff + _TXREP2);
         ChP->TxReplace2[1] = (Byte_t) ((ChOff + _TXREP2) >> 8);
         ChP->TxReplace2[2] = 0;
         ChP->TxReplace2[3] = 0;
-        sOutDW(ChP->IndexAddr, *(DWord_t *) & ChP->TxReplace2[0]);
+        out32(ChP->IndexAddr, ChP->TxReplace2);
 
         ChP->TxFIFOPtrs = ChOff + _TXF_OUTP;
         ChP->TxFIFO = ChOff + _TX_FIFO;
@@ -2979,7 +2980,7 @@ static void sStopRxProcessor(CHANNEL_T * ChP)
         R[1] = ChP->R[1];
         R[2] = 0x0a;
         R[3] = ChP->R[3];
-        sOutDW(ChP->IndexAddr, *(DWord_t *) & R[0]);
+        out32(ChP->IndexAddr, R);
 }
 
 /***************************************************************************
@@ -3094,13 +3095,13 @@ static int sWriteTxPrioByte(CHANNEL_T * ChP, Byte_t Data)
                 *WordPtr = ChP->TxPrioBuf;      /* data byte address */
 
                 DWBuf[2] = Data;        /* data byte value */
-                sOutDW(IndexAddr, *((DWord_t *) (&DWBuf[0])));  /* write it out */
+                out32(IndexAddr, DWBuf);        /* write it out */
 
                 *WordPtr = ChP->TxPrioCnt;      /* Tx priority count address */
 
                 DWBuf[2] = PRI_PEND + 1;        /* indicate 1 byte pending */
                 DWBuf[3] = 0;   /* priority buffer pointer */
-                sOutDW(IndexAddr, *((DWord_t *) (&DWBuf[0])));  /* write it out */
+                out32(IndexAddr, DWBuf);        /* write it out */
         } else {                /* write it to Tx FIFO */
 
                 sWriteTxByte(sGetTxRxDataIO(ChP), Data);
@@ -3147,11 +3148,11 @@ static void sEnInterrupts(CHANNEL_T * ChP, Word_t Flags)
         ChP->RxControl[2] |=
             ((Byte_t) Flags & (RXINT_EN | SRCINT_EN | MCINT_EN));
 
-        sOutDW(ChP->IndexAddr, *(DWord_t *) & ChP->RxControl[0]);
+        out32(ChP->IndexAddr, ChP->RxControl);
 
         ChP->TxControl[2] |= ((Byte_t) Flags & TXINT_EN);
 
-        sOutDW(ChP->IndexAddr, *(DWord_t *) & ChP->TxControl[0]);
+        out32(ChP->IndexAddr, ChP->TxControl);
 
         if (Flags & CHANINT_EN) {
                 Mask = sInB(ChP->IntMask) | sBitMapSetTbl[ChP->ChanNum];
@@ -3190,9 +3191,9 @@ static void sDisInterrupts(CHANNEL_T * ChP, Word_t Flags)
 
         ChP->RxControl[2] &=
             ~((Byte_t) Flags & (RXINT_EN | SRCINT_EN | MCINT_EN));
-        sOutDW(ChP->IndexAddr, *(DWord_t *) & ChP->RxControl[0]);
+        out32(ChP->IndexAddr, ChP->RxControl);
         ChP->TxControl[2] &= ~((Byte_t) Flags & TXINT_EN);
-        sOutDW(ChP->IndexAddr, *(DWord_t *) & ChP->TxControl[0]);
+        out32(ChP->IndexAddr, ChP->TxControl);
 
         if (Flags & CHANINT_EN) {
                 Mask = sInB(ChP->IntMask) & sBitMapClrTbl[ChP->ChanNum];
diff --git a/drivers/char/rocket_int.h b/drivers/char/rocket_int.h
index f3a75791b811..b01d38125a8f 100644
--- a/drivers/char/rocket_int.h
+++ b/drivers/char/rocket_int.h
@@ -26,7 +26,6 @@ typedef unsigned int ByteIO_t;
 typedef unsigned int Word_t;
 typedef unsigned int WordIO_t;
 
-typedef unsigned long DWord_t;
 typedef unsigned int DWordIO_t;
 
 /*
@@ -38,7 +37,6 @@ typedef unsigned int DWordIO_t;
  * instruction.
  */
 
-#ifdef ROCKET_DEBUG_IO
 static inline void sOutB(unsigned short port, unsigned char value)
 {
 #ifdef ROCKET_DEBUG_IO
@@ -55,12 +53,13 @@ static inline void sOutW(unsigned short port, unsigned short value)
         outw_p(value, port);
 }
 
-static inline void sOutDW(unsigned short port, unsigned long value)
+static inline void out32(unsigned short port, Byte_t *p)
 {
+        u32 value = le32_to_cpu(get_unaligned((__le32 *)p));
 #ifdef ROCKET_DEBUG_IO
-        printk(KERN_DEBUG "sOutDW(%x, %lx)...\n", port, value);
+        printk(KERN_DEBUG "out32(%x, %lx)...\n", port, value);
 #endif
-        outl_p(cpu_to_le32(value), port);
+        outl_p(value, port);
 }
 
 static inline unsigned char sInB(unsigned short port)
@@ -73,14 +72,6 @@ static inline unsigned short sInW(unsigned short port)
         return inw_p(port);
 }
 
-#else                           /* !ROCKET_DEBUG_IO */
-#define sOutB(a, b) outb_p(b, a)
-#define sOutW(a, b) outw_p(b, a)
-#define sOutDW(port, value) outl_p(cpu_to_le32(value), port)
-#define sInB(a) (inb_p(a))
-#define sInW(a) (inw_p(a))
-#endif                          /* ROCKET_DEBUG_IO */
-
 /* This is used to move arrays of bytes so byte swapping isn't appropriate. */
 #define sOutStrW(port, addr, count) if (count) outsw(port, addr, count)
 #define sInStrW(port, addr, count) if (count) insw(port, addr, count)
@@ -390,7 +381,7 @@ Call:     sClrBreak(ChP)
 #define sClrBreak(ChP) \
 do { \
    (ChP)->TxControl[3] &= ~SETBREAK; \
-   sOutDW((ChP)->IndexAddr,*(DWord_t *)&(ChP)->TxControl[0]); \
+   out32((ChP)->IndexAddr,(ChP)->TxControl); \
 } while (0)
 
 /***************************************************************************
@@ -402,7 +393,7 @@ Call:     sClrDTR(ChP)
 #define sClrDTR(ChP) \
 do { \
    (ChP)->TxControl[3] &= ~SET_DTR; \
-   sOutDW((ChP)->IndexAddr,*(DWord_t *)&(ChP)->TxControl[0]); \
+   out32((ChP)->IndexAddr,(ChP)->TxControl); \
 } while (0)
 
 /***************************************************************************
@@ -415,7 +406,7 @@ Call:     sClrRTS(ChP)
 do { \
    if ((ChP)->rtsToggle) break; \
    (ChP)->TxControl[3] &= ~SET_RTS; \
-   sOutDW((ChP)->IndexAddr,*(DWord_t *)&(ChP)->TxControl[0]); \
+   out32((ChP)->IndexAddr,(ChP)->TxControl); \
 } while (0)
 
 /***************************************************************************
@@ -489,7 +480,7 @@ Call:     sDisCTSFlowCtl(ChP)
 #define sDisCTSFlowCtl(ChP) \
 do { \
    (ChP)->TxControl[2] &= ~CTSFC_EN; \
-   sOutDW((ChP)->IndexAddr,*(DWord_t *)&(ChP)->TxControl[0]); \
+   out32((ChP)->IndexAddr,(ChP)->TxControl); \
 } while (0)
 
 /***************************************************************************
@@ -501,7 +492,7 @@ Call:     sDisIXANY(ChP)
 #define sDisIXANY(ChP) \
 do { \
    (ChP)->R[0x0e] = 0x86; \
-   sOutDW((ChP)->IndexAddr,*(DWord_t *)&(ChP)->R[0x0c]); \
+   out32((ChP)->IndexAddr,&(ChP)->R[0x0c]); \
 } while (0)
 
 /***************************************************************************
@@ -515,7 +506,7 @@ Comments: Function sSetParity() can be used in place of functions sEnParity(),
 #define sDisParity(ChP) \
 do { \
    (ChP)->TxControl[2] &= ~PARITY_EN; \
-   sOutDW((ChP)->IndexAddr,*(DWord_t *)&(ChP)->TxControl[0]); \
+   out32((ChP)->IndexAddr,(ChP)->TxControl); \
 } while (0)
 
 /***************************************************************************
@@ -527,7 +518,7 @@ Call:     sDisRTSToggle(ChP)
 #define sDisRTSToggle(ChP) \
 do { \
    (ChP)->TxControl[2] &= ~RTSTOG_EN; \
-   sOutDW((ChP)->IndexAddr,*(DWord_t *)&(ChP)->TxControl[0]); \
+   out32((ChP)->IndexAddr,(ChP)->TxControl); \
    (ChP)->rtsToggle = 0; \
 } while (0)
 
@@ -540,7 +531,7 @@ Call:     sDisRxFIFO(ChP)
 #define sDisRxFIFO(ChP) \
 do { \
    (ChP)->R[0x32] = 0x0a; \
-   sOutDW((ChP)->IndexAddr,*(DWord_t *)&(ChP)->R[0x30]); \
+   out32((ChP)->IndexAddr,&(ChP)->R[0x30]); \
 } while (0)
 
 /***************************************************************************
@@ -567,7 +558,7 @@ Call:     sDisTransmit(ChP)
 #define sDisTransmit(ChP) \
 do { \
    (ChP)->TxControl[3] &= ~TX_ENABLE; \
-   sOutDW((ChP)->IndexAddr,*(DWord_t *)&(ChP)->TxControl[0]); \
+   out32((ChP)->IndexAddr,(ChP)->TxControl); \
 } while (0)
 
 /***************************************************************************
@@ -579,7 +570,7 @@ Call:     sDisTxSoftFlowCtl(ChP)
 #define sDisTxSoftFlowCtl(ChP) \
 do { \
    (ChP)->R[0x06] = 0x8a; \
-   sOutDW((ChP)->IndexAddr,*(DWord_t *)&(ChP)->R[0x04]); \
+   out32((ChP)->IndexAddr,&(ChP)->R[0x04]); \
 } while (0)
 
 /***************************************************************************
@@ -604,7 +595,7 @@ Call:     sEnCTSFlowCtl(ChP)
 #define sEnCTSFlowCtl(ChP) \
 do { \
    (ChP)->TxControl[2] |= CTSFC_EN; \
-   sOutDW((ChP)->IndexAddr,*(DWord_t *)&(ChP)->TxControl[0]); \
+   out32((ChP)->IndexAddr,(ChP)->TxControl); \
 } while (0)
 
 /***************************************************************************
@@ -616,7 +607,7 @@ Call:     sEnIXANY(ChP)
 #define sEnIXANY(ChP) \
 do { \
    (ChP)->R[0x0e] = 0x21; \
-   sOutDW((ChP)->IndexAddr,*(DWord_t *)&(ChP)->R[0x0c]); \
+   out32((ChP)->IndexAddr,&(ChP)->R[0x0c]); \
 } while (0)
 
 /***************************************************************************
@@ -633,7 +624,7 @@ Warnings: Before enabling parity odd or even parity should be chosen using
 #define sEnParity(ChP) \
 do { \
    (ChP)->TxControl[2] |= PARITY_EN; \
-   sOutDW((ChP)->IndexAddr,*(DWord_t *)&(ChP)->TxControl[0]); \
+   out32((ChP)->IndexAddr,(ChP)->TxControl); \
 } while (0)
 
 /***************************************************************************
@@ -647,10 +638,10 @@ Comments: This function will disable RTS flow control and clear the RTS
 #define sEnRTSToggle(ChP) \
 do { \
    (ChP)->RxControl[2] &= ~RTSFC_EN; \
-   sOutDW((ChP)->IndexAddr,*(DWord_t *)&(ChP)->RxControl[0]); \
+   out32((ChP)->IndexAddr,(ChP)->RxControl); \
    (ChP)->TxControl[2] |= RTSTOG_EN; \
    (ChP)->TxControl[3] &= ~SET_RTS; \
-   sOutDW((ChP)->IndexAddr,*(DWord_t *)&(ChP)->TxControl[0]); \
+   out32((ChP)->IndexAddr,(ChP)->TxControl); \
    (ChP)->rtsToggle = 1; \
 } while (0)
 
@@ -663,7 +654,7 @@ Call:     sEnRxFIFO(ChP)
 #define sEnRxFIFO(ChP) \
 do { \
    (ChP)->R[0x32] = 0x08; \
-   sOutDW((ChP)->IndexAddr,*(DWord_t *)&(ChP)->R[0x30]); \
+   out32((ChP)->IndexAddr,&(ChP)->R[0x30]); \
 } while (0)
 
 /***************************************************************************
@@ -684,7 +675,7 @@ Warnings: This function must be called after valid microcode has been
 #define sEnRxProcessor(ChP) \
 do { \
    (ChP)->RxControl[2] |= RXPROC_EN; \
-   sOutDW((ChP)->IndexAddr,*(DWord_t *)&(ChP)->RxControl[0]); \
+   out32((ChP)->IndexAddr,(ChP)->RxControl); \
 } while (0)
 
 /***************************************************************************
@@ -708,7 +699,7 @@ Call:     sEnTransmit(ChP)
 #define sEnTransmit(ChP) \
 do { \
    (ChP)->TxControl[3] |= TX_ENABLE; \
-   sOutDW((ChP)->IndexAddr,*(DWord_t *)&(ChP)->TxControl[0]); \
+   out32((ChP)->IndexAddr,(ChP)->TxControl); \
 } while (0)
 
 /***************************************************************************
@@ -720,7 +711,7 @@ Call:     sEnTxSoftFlowCtl(ChP)
 #define sEnTxSoftFlowCtl(ChP) \
 do { \
    (ChP)->R[0x06] = 0xc5; \
-   sOutDW((ChP)->IndexAddr,*(DWord_t *)&(ChP)->R[0x04]); \
+   out32((ChP)->IndexAddr,&(ChP)->R[0x04]); \
 } while (0)
 
 /***************************************************************************
@@ -927,7 +918,7 @@ Call:     sSendBreak(ChP)
 #define sSendBreak(ChP) \
 do { \
    (ChP)->TxControl[3] |= SETBREAK; \
-   sOutDW((ChP)->IndexAddr,*(DWord_t *)&(ChP)->TxControl[0]); \
+   out32((ChP)->IndexAddr,(ChP)->TxControl); \
 } while (0)
 
 /***************************************************************************
@@ -941,7 +932,7 @@ Call:     sSetBaud(ChP,Divisor)
 do { \
    (ChP)->BaudDiv[2] = (Byte_t)(DIVISOR); \
    (ChP)->BaudDiv[3] = (Byte_t)((DIVISOR) >> 8); \
-   sOutDW((ChP)->IndexAddr,*(DWord_t *)&(ChP)->BaudDiv[0]); \
+   out32((ChP)->IndexAddr,(ChP)->BaudDiv); \
 } while (0)
 
 /***************************************************************************
@@ -953,7 +944,7 @@ Call:     sSetData7(ChP)
 #define sSetData7(ChP) \
 do { \
    (ChP)->TxControl[2] &= ~DATA8BIT; \
-   sOutDW((ChP)->IndexAddr,*(DWord_t *)&(ChP)->TxControl[0]); \
+   out32((ChP)->IndexAddr,(ChP)->TxControl); \
 } while (0)
 
 /***************************************************************************
@@ -965,7 +956,7 @@ Call:     sSetData8(ChP)
 #define sSetData8(ChP) \
 do { \
    (ChP)->TxControl[2] |= DATA8BIT; \
-   sOutDW((ChP)->IndexAddr,*(DWord_t *)&(ChP)->TxControl[0]); \
+   out32((ChP)->IndexAddr,(ChP)->TxControl); \
 } while (0)
 
 /***************************************************************************
@@ -977,7 +968,7 @@ Call:     sSetDTR(ChP)
 #define sSetDTR(ChP) \
 do { \
    (ChP)->TxControl[3] |= SET_DTR; \
-   sOutDW((ChP)->IndexAddr,*(DWord_t *)&(ChP)->TxControl[0]); \
+   out32((ChP)->IndexAddr,(ChP)->TxControl); \
 } while (0)
 
 /***************************************************************************
@@ -994,7 +985,7 @@ Warnings: This function has no effect unless parity is enabled with function
 #define sSetEvenParity(ChP) \
 do { \
    (ChP)->TxControl[2] |= EVEN_PAR; \
-   sOutDW((ChP)->IndexAddr,*(DWord_t *)&(ChP)->TxControl[0]); \
+   out32((ChP)->IndexAddr,(ChP)->TxControl); \
 } while (0)
 
 /***************************************************************************
@@ -1011,7 +1002,7 @@ Warnings: This function has no effect unless parity is enabled with function
 #define sSetOddParity(ChP) \
 do { \
    (ChP)->TxControl[2] &= ~EVEN_PAR; \
-   sOutDW((ChP)->IndexAddr,*(DWord_t *)&(ChP)->TxControl[0]); \
+   out32((ChP)->IndexAddr,(ChP)->TxControl); \
 } while (0)
 
 /***************************************************************************
@@ -1024,7 +1015,7 @@ Call:     sSetRTS(ChP)
 do { \
    if ((ChP)->rtsToggle) break; \
    (ChP)->TxControl[3] |= SET_RTS; \
-   sOutDW((ChP)->IndexAddr,*(DWord_t *)&(ChP)->TxControl[0]); \
+   out32((ChP)->IndexAddr,(ChP)->TxControl); \
 } while (0)
 
 /***************************************************************************
@@ -1050,7 +1041,7 @@ Comments: An interrupt will be generated when the trigger level is reached
 do { \
    (ChP)->RxControl[2] &= ~TRIG_MASK; \
    (ChP)->RxControl[2] |= LEVEL; \
-   sOutDW((ChP)->IndexAddr,*(DWord_t *)&(ChP)->RxControl[0]); \
+   out32((ChP)->IndexAddr,(ChP)->RxControl); \
 } while (0)
 
 /***************************************************************************
@@ -1062,7 +1053,7 @@ Call:     sSetStop1(ChP)
 #define sSetStop1(ChP) \
 do { \
    (ChP)->TxControl[2] &= ~STOP2; \
-   sOutDW((ChP)->IndexAddr,*(DWord_t *)&(ChP)->TxControl[0]); \
+   out32((ChP)->IndexAddr,(ChP)->TxControl); \
 } while (0)
 
 /***************************************************************************
@@ -1074,7 +1065,7 @@ Call:     sSetStop2(ChP)
 #define sSetStop2(ChP) \
 do { \
    (ChP)->TxControl[2] |= STOP2; \
-   sOutDW((ChP)->IndexAddr,*(DWord_t *)&(ChP)->TxControl[0]); \
+   out32((ChP)->IndexAddr,(ChP)->TxControl); \
 } while (0)
 
 /***************************************************************************
@@ -1087,7 +1078,7 @@ Call:     sSetTxXOFFChar(ChP,Ch)
 #define sSetTxXOFFChar(ChP,CH) \
 do { \
    (ChP)->R[0x07] = (CH); \
-   sOutDW((ChP)->IndexAddr,*(DWord_t *)&(ChP)->R[0x04]); \
+   out32((ChP)->IndexAddr,&(ChP)->R[0x04]); \
 } while (0)
 
 /***************************************************************************
@@ -1100,7 +1091,7 @@ Call:     sSetTxXONChar(ChP,Ch)
 #define sSetTxXONChar(ChP,CH) \
 do { \
    (ChP)->R[0x0b] = (CH); \
-   sOutDW((ChP)->IndexAddr,*(DWord_t *)&(ChP)->R[0x08]); \
+   out32((ChP)->IndexAddr,&(ChP)->R[0x08]); \
 } while (0)
 
 /***************************************************************************
@@ -1113,7 +1104,7 @@ Comments: This function is used to start a Rx processor after it was
           will restart both the Rx processor and software input flow control.
 
 */
-#define sStartRxProcessor(ChP) sOutDW((ChP)->IndexAddr,*(DWord_t *)&(ChP)->R[0])
+#define sStartRxProcessor(ChP) out32((ChP)->IndexAddr,&(ChP)->R[0])
 
 /***************************************************************************
 Function: sWriteTxByte
diff --git a/drivers/connector/cn_queue.c b/drivers/connector/cn_queue.c
index 5732ca3259f9..b6fe7e7a2c2f 100644
--- a/drivers/connector/cn_queue.c
+++ b/drivers/connector/cn_queue.c
@@ -146,7 +146,7 @@ struct cn_queue_dev *cn_queue_alloc_dev(char *name, struct sock *nls)
 
         dev->nls = nls;
 
-        dev->cn_queue = create_workqueue(dev->name);
+        dev->cn_queue = create_singlethread_workqueue(dev->name);
         if (!dev->cn_queue) {
                 kfree(dev);
                 return NULL;
diff --git a/drivers/cpuidle/cpuidle.c b/drivers/cpuidle/cpuidle.c
index d73663a52324..fc555a90bb21 100644
--- a/drivers/cpuidle/cpuidle.c
+++ b/drivers/cpuidle/cpuidle.c
@@ -67,7 +67,7 @@ static void cpuidle_idle_call(void)
         /* enter the state and update stats */
         dev->last_residency = target_state->enter(dev, target_state);
         dev->last_state = target_state;
-        target_state->time += dev->last_residency;
+        target_state->time += (unsigned long long)dev->last_residency;
         target_state->usage++;
 
         /* give the governor an opportunity to reflect on the outcome */
@@ -224,7 +224,7 @@ static void poll_idle_init(struct cpuidle_device *dev)
         state->exit_latency = 0;
         state->target_residency = 0;
         state->power_usage = -1;
-        state->flags = CPUIDLE_FLAG_POLL | CPUIDLE_FLAG_TIME_VALID;
+        state->flags = CPUIDLE_FLAG_POLL;
         state->enter = poll_idle;
 }
 #else
diff --git a/drivers/cpuidle/sysfs.c b/drivers/cpuidle/sysfs.c
index 69102ca05685..e949618b9be0 100644
--- a/drivers/cpuidle/sysfs.c
+++ b/drivers/cpuidle/sysfs.c
@@ -218,6 +218,12 @@ static ssize_t show_state_##_name(struct cpuidle_state *state, char *buf) \
         return sprintf(buf, "%u\n", state->_name);\
 }
 
+#define define_show_state_ull_function(_name) \
+static ssize_t show_state_##_name(struct cpuidle_state *state, char *buf) \
+{ \
+        return sprintf(buf, "%llu\n", state->_name);\
+}
+
 #define define_show_state_str_function(_name) \
 static ssize_t show_state_##_name(struct cpuidle_state *state, char *buf) \
 { \
@@ -228,8 +234,8 @@ static ssize_t show_state_##_name(struct cpuidle_state *state, char *buf) \
 
 define_show_state_function(exit_latency)
 define_show_state_function(power_usage)
-define_show_state_function(usage)
-define_show_state_function(time)
+define_show_state_ull_function(usage)
+define_show_state_ull_function(time)
 define_show_state_str_function(name)
 define_show_state_str_function(desc)
 
diff --git a/drivers/crypto/hifn_795x.c b/drivers/crypto/hifn_795x.c
index 3110bf7014f7..81f3f950cd7d 100644
--- a/drivers/crypto/hifn_795x.c
+++ b/drivers/crypto/hifn_795x.c
@@ -392,8 +392,8 @@ static atomic_t hifn_dev_number;
 
 struct hifn_desc
 {
-        volatile u32            l;
-        volatile u32            p;
+        volatile __le32         l;
+        volatile __le32         p;
 };
 
 struct hifn_dma {
@@ -481,10 +481,10 @@ struct hifn_device
 
 struct hifn_base_command
 {
-        volatile u16            masks;
-        volatile u16            session_num;
-        volatile u16            total_source_count;
-        volatile u16            total_dest_count;
+        volatile __le16         masks;
+        volatile __le16         session_num;
+        volatile __le16         total_source_count;
+        volatile __le16         total_dest_count;
 };
 
 #define HIFN_BASE_CMD_COMP              0x0100  /* enable compression engine */
@@ -504,10 +504,10 @@ struct hifn_base_command
  */
 struct hifn_crypt_command
 {
-        volatile u16            masks;
-        volatile u16            header_skip;
-        volatile u16            source_count;
-        volatile u16            reserved;
+        volatile __le16                 masks;
+        volatile __le16                 header_skip;
+        volatile __le16                 source_count;
+        volatile __le16                 reserved;
 };
 
 #define HIFN_CRYPT_CMD_ALG_MASK         0x0003          /* algorithm: */
@@ -670,7 +670,7 @@ static inline u32 hifn_read_0(struct hifn_device *dev, u32 reg)
 {
         u32 ret;
 
-        ret = readl((char *)(dev->bar[0]) + reg);
+        ret = readl(dev->bar[0] + reg);
 
         return ret;
 }
@@ -679,19 +679,19 @@ static inline u32 hifn_read_1(struct hifn_device *dev, u32 reg)
 {
         u32 ret;
 
-        ret = readl((char *)(dev->bar[1]) + reg);
+        ret = readl(dev->bar[1] + reg);
 
         return ret;
 }
 
 static inline void hifn_write_0(struct hifn_device *dev, u32 reg, u32 val)
 {
-        writel(val, (char *)(dev->bar[0]) + reg);
+        writel(val, dev->bar[0] + reg);
 }
 
 static inline void hifn_write_1(struct hifn_device *dev, u32 reg, u32 val)
 {
-        writel(val, (char *)(dev->bar[1]) + reg);
+        writel(val, dev->bar[1] + reg);
 }
 
 static void hifn_wait_puc(struct hifn_device *dev)
diff --git a/drivers/dma/dmaengine.c b/drivers/dma/dmaengine.c
index 29965231b912..8db0e7f9d3f4 100644
--- a/drivers/dma/dmaengine.c
+++ b/drivers/dma/dmaengine.c
@@ -357,7 +357,7 @@ int dma_async_device_register(struct dma_device *device)
                 !device->device_prep_dma_zero_sum);
         BUG_ON(dma_has_cap(DMA_MEMSET, device->cap_mask) &&
                 !device->device_prep_dma_memset);
-        BUG_ON(dma_has_cap(DMA_ZERO_SUM, device->cap_mask) &&
+        BUG_ON(dma_has_cap(DMA_INTERRUPT, device->cap_mask) &&
                 !device->device_prep_dma_interrupt);
 
         BUG_ON(!device->device_alloc_chan_resources);
diff --git a/drivers/dma/fsldma.c b/drivers/dma/fsldma.c
index cc9a68158d99..72692309398a 100644
--- a/drivers/dma/fsldma.c
+++ b/drivers/dma/fsldma.c
@@ -57,12 +57,12 @@ static void dma_init(struct fsl_dma_chan *fsl_chan)
 
 }
 
-static void set_sr(struct fsl_dma_chan *fsl_chan, dma_addr_t val)
+static void set_sr(struct fsl_dma_chan *fsl_chan, u32 val)
 {
         DMA_OUT(fsl_chan, &fsl_chan->reg_base->sr, val, 32);
 }
 
-static dma_addr_t get_sr(struct fsl_dma_chan *fsl_chan)
+static u32 get_sr(struct fsl_dma_chan *fsl_chan)
 {
         return DMA_IN(fsl_chan, &fsl_chan->reg_base->sr, 32);
 }
@@ -123,6 +123,11 @@ static dma_addr_t get_ndar(struct fsl_dma_chan *fsl_chan)
         return DMA_IN(fsl_chan, &fsl_chan->reg_base->ndar, 64);
 }
 
+static u32 get_bcr(struct fsl_dma_chan *fsl_chan)
+{
+        return DMA_IN(fsl_chan, &fsl_chan->reg_base->bcr, 32);
+}
+
 static int dma_is_idle(struct fsl_dma_chan *fsl_chan)
 {
         u32 sr = get_sr(fsl_chan);
@@ -406,6 +411,35 @@ static void fsl_dma_free_chan_resources(struct dma_chan *chan)
         dma_pool_destroy(fsl_chan->desc_pool);
 }
 
+static struct dma_async_tx_descriptor *
+fsl_dma_prep_interrupt(struct dma_chan *chan)
+{
+        struct fsl_dma_chan *fsl_chan;
+        struct fsl_desc_sw *new;
+
+        if (!chan)
+                return NULL;
+
+        fsl_chan = to_fsl_chan(chan);
+
+        new = fsl_dma_alloc_descriptor(fsl_chan);
+        if (!new) {
+                dev_err(fsl_chan->dev, "No free memory for link descriptor\n");
+                return NULL;
+        }
+
+        new->async_tx.cookie = -EBUSY;
+        new->async_tx.ack = 0;
+
+        /* Insert the link descriptor to the LD ring */
+        list_add_tail(&new->node, &new->async_tx.tx_list);
+
+        /* Set End-of-link to the last link descriptor of new list*/
+        set_ld_eol(fsl_chan, new);
+
+        return &new->async_tx;
+}
+
 static struct dma_async_tx_descriptor *fsl_dma_prep_memcpy(
         struct dma_chan *chan, dma_addr_t dma_dest, dma_addr_t dma_src,
         size_t len, unsigned long flags)
@@ -436,7 +470,7 @@ static struct dma_async_tx_descriptor *fsl_dma_prep_memcpy(
                 dev_dbg(fsl_chan->dev, "new link desc alloc %p\n", new);
 #endif
 
-                copy = min(len, FSL_DMA_BCR_MAX_CNT);
+                copy = min(len, (size_t)FSL_DMA_BCR_MAX_CNT);
 
                 set_desc_cnt(fsl_chan, &new->hw, copy);
                 set_desc_src(fsl_chan, &new->hw, dma_src);
@@ -513,7 +547,6 @@ static void fsl_chan_ld_cleanup(struct fsl_dma_chan *fsl_chan)
 
         spin_lock_irqsave(&fsl_chan->desc_lock, flags);
 
-        fsl_dma_update_completed_cookie(fsl_chan);
         dev_dbg(fsl_chan->dev, "chan completed_cookie = %d\n",
                         fsl_chan->completed_cookie);
         list_for_each_entry_safe(desc, _desc, &fsl_chan->ld_queue, node) {
@@ -581,8 +614,8 @@ static void fsl_chan_xfer_ld_queue(struct fsl_dma_chan *fsl_chan)
         if (ld_node != &fsl_chan->ld_queue) {
                 /* Get the ld start address from ld_queue */
                 next_dest_addr = to_fsl_desc(ld_node)->async_tx.phys;
-                dev_dbg(fsl_chan->dev, "xfer LDs staring from 0x%016llx\n",
-                                (u64)next_dest_addr);
+                dev_dbg(fsl_chan->dev, "xfer LDs staring from %p\n",
+                                (void *)next_dest_addr);
                 set_cdar(fsl_chan, next_dest_addr);
                 dma_start(fsl_chan);
         } else {
@@ -662,7 +695,7 @@ static enum dma_status fsl_dma_is_complete(struct dma_chan *chan,
 static irqreturn_t fsl_dma_chan_do_interrupt(int irq, void *data)
 {
         struct fsl_dma_chan *fsl_chan = (struct fsl_dma_chan *)data;
-        dma_addr_t stat;
+        u32 stat;
 
         stat = get_sr(fsl_chan);
         dev_dbg(fsl_chan->dev, "event: channel %d, stat = 0x%x\n",
@@ -676,15 +709,32 @@ static irqreturn_t fsl_dma_chan_do_interrupt(int irq, void *data)
         if (stat & FSL_DMA_SR_TE)
                 dev_err(fsl_chan->dev, "Transfer Error!\n");
 
+        /* Programming Error
+         * The DMA_INTERRUPT async_tx is a NULL transfer, which will
+         * triger a PE interrupt.
+         */
+        if (stat & FSL_DMA_SR_PE) {
+                dev_dbg(fsl_chan->dev, "event: Programming Error INT\n");
+                if (get_bcr(fsl_chan) == 0) {
+                        /* BCR register is 0, this is a DMA_INTERRUPT async_tx.
+                         * Now, update the completed cookie, and continue the
+                         * next uncompleted transfer.
+                         */
+                        fsl_dma_update_completed_cookie(fsl_chan);
+                        fsl_chan_xfer_ld_queue(fsl_chan);
+                }
+                stat &= ~FSL_DMA_SR_PE;
+        }
+
         /* If the link descriptor segment transfer finishes,
          * we will recycle the used descriptor.
          */
         if (stat & FSL_DMA_SR_EOSI) {
                 dev_dbg(fsl_chan->dev, "event: End-of-segments INT\n");
-                dev_dbg(fsl_chan->dev, "event: clndar 0x%016llx, "
-                                "nlndar 0x%016llx\n", (u64)get_cdar(fsl_chan),
-                                (u64)get_ndar(fsl_chan));
+                dev_dbg(fsl_chan->dev, "event: clndar %p, nlndar %p\n",
+                        (void *)get_cdar(fsl_chan), (void *)get_ndar(fsl_chan));
                 stat &= ~FSL_DMA_SR_EOSI;
+                fsl_dma_update_completed_cookie(fsl_chan);
         }
 
         /* If it current transfer is the end-of-transfer,
@@ -726,12 +776,15 @@ static void dma_do_tasklet(unsigned long data)
         fsl_chan_ld_cleanup(fsl_chan);
 }
 
+#ifdef FSL_DMA_CALLBACKTEST
 static void fsl_dma_callback_test(struct fsl_dma_chan *fsl_chan)
 {
         if (fsl_chan)
                 dev_info(fsl_chan->dev, "selftest: callback is ok!\n");
 }
+#endif
 
+#ifdef CONFIG_FSL_DMA_SELFTEST
 static int fsl_dma_self_test(struct fsl_dma_chan *fsl_chan)
 {
         struct dma_chan *chan;
@@ -813,6 +866,11 @@ static int fsl_dma_self_test(struct fsl_dma_chan *fsl_chan)
         tx3 = fsl_dma_prep_memcpy(chan, dma_dest, dma_src, test_size / 4, 0);
         async_tx_ack(tx3);
 
+        /* Interrupt tx test */
+        tx1 = fsl_dma_prep_interrupt(chan);
+        async_tx_ack(tx1);
+        cookie = fsl_dma_tx_submit(tx1);
+
         /* Test exchanging the prepared tx sort */
         cookie = fsl_dma_tx_submit(tx3);
         cookie = fsl_dma_tx_submit(tx2);
@@ -837,9 +895,9 @@ static int fsl_dma_self_test(struct fsl_dma_chan *fsl_chan)
         if (err) {
                 for (i = 0; (*(src + i) == *(dest + i)) && (i < test_size);
                                 i++);
-                dev_err(fsl_chan->dev, "selftest: Test failed, data %d/%d is "
+                dev_err(fsl_chan->dev, "selftest: Test failed, data %d/%ld is "
                                 "error! src 0x%x, dest 0x%x\n",
-                                i, test_size, *(src + i), *(dest + i));
+                                i, (long)test_size, *(src + i), *(dest + i));
         }
 
 free_resources:
@@ -848,6 +906,7 @@ out:
         kfree(src);
         return err;
 }
+#endif
 
 static int __devinit of_fsl_dma_chan_probe(struct of_device *dev,
                         const struct of_device_id *match)
@@ -1008,8 +1067,8 @@ static int __devinit of_fsl_dma_probe(struct of_device *dev,
         }
 
         dev_info(&dev->dev, "Probe the Freescale DMA driver for %s "
-                        "controller at 0x%08x...\n",
-                        match->compatible, fdev->reg.start);
+                        "controller at %p...\n",
+                        match->compatible, (void *)fdev->reg.start);
         fdev->reg_base = ioremap(fdev->reg.start, fdev->reg.end
                                                 - fdev->reg.start + 1);
 
@@ -1017,6 +1076,7 @@ static int __devinit of_fsl_dma_probe(struct of_device *dev,
         dma_cap_set(DMA_INTERRUPT, fdev->common.cap_mask);
         fdev->common.device_alloc_chan_resources = fsl_dma_alloc_chan_resources;
         fdev->common.device_free_chan_resources = fsl_dma_free_chan_resources;
+        fdev->common.device_prep_dma_interrupt = fsl_dma_prep_interrupt;
         fdev->common.device_prep_dma_memcpy = fsl_dma_prep_memcpy;
         fdev->common.device_is_tx_complete = fsl_dma_is_complete;
         fdev->common.device_issue_pending = fsl_dma_memcpy_issue_pending;
diff --git a/drivers/dma/fsldma.h b/drivers/dma/fsldma.h
index ba78c42121ba..6faf07ba0d0e 100644
--- a/drivers/dma/fsldma.h
+++ b/drivers/dma/fsldma.h
@@ -40,6 +40,7 @@
 #define FSL_DMA_MR_EOTIE        0x00000080
 
 #define FSL_DMA_SR_CH           0x00000020
+#define FSL_DMA_SR_PE           0x00000010
 #define FSL_DMA_SR_CB           0x00000004
 #define FSL_DMA_SR_TE           0x00000080
 #define FSL_DMA_SR_EOSI         0x00000002
@@ -74,12 +75,15 @@
 #define FSL_DMA_DGSR_EOSI       0x02
 #define FSL_DMA_DGSR_EOLSI      0x01
 
+typedef u64 __bitwise v64;
+typedef u32 __bitwise v32;
+
 struct fsl_dma_ld_hw {
-        u64 __bitwise   src_addr;
-        u64 __bitwise   dst_addr;
-        u64 __bitwise   next_ln_addr;
-        u32 __bitwise   count;
-        u32 __bitwise   reserve;
+        v64 src_addr;
+        v64 dst_addr;
+        v64 next_ln_addr;
+        v32 count;
+        v32 reserve;
 } __attribute__((aligned(32)));
 
 struct fsl_desc_sw {
@@ -91,13 +95,13 @@ struct fsl_desc_sw {
 } __attribute__((aligned(32)));
 
 struct fsl_dma_chan_regs {
-        u32 __bitwise   mr;     /* 0x00 - Mode Register */
-        u32 __bitwise   sr;     /* 0x04 - Status Register */
-        u64 __bitwise   cdar;   /* 0x08 - Current descriptor address register */
-        u64 __bitwise   sar;    /* 0x10 - Source Address Register */
-        u64 __bitwise   dar;    /* 0x18 - Destination Address Register */
-        u32 __bitwise   bcr;    /* 0x20 - Byte Count Register */
-        u64 __bitwise   ndar;   /* 0x24 - Next Descriptor Address Register */
+        u32 mr; /* 0x00 - Mode Register */
+        u32 sr; /* 0x04 - Status Register */
+        u64 cdar;       /* 0x08 - Current descriptor address register */
+        u64 sar;        /* 0x10 - Source Address Register */
+        u64 dar;        /* 0x18 - Destination Address Register */
+        u32 bcr;        /* 0x20 - Byte Count Register */
+        u64 ndar;       /* 0x24 - Next Descriptor Address Register */
 };
 
 struct fsl_dma_chan;
@@ -150,25 +154,27 @@ struct fsl_dma_chan {
 #ifndef __powerpc64__
 static u64 in_be64(const u64 __iomem *addr)
 {
-        return ((u64)in_be32((u32 *)addr) << 32) | (in_be32((u32 *)addr + 1));
+        return ((u64)in_be32((u32 __iomem *)addr) << 32) |
+                (in_be32((u32 __iomem *)addr + 1));
 }
 
 static void out_be64(u64 __iomem *addr, u64 val)
 {
-        out_be32((u32 *)addr, val >> 32);
-        out_be32((u32 *)addr + 1, (u32)val);
+        out_be32((u32 __iomem *)addr, val >> 32);
+        out_be32((u32 __iomem *)addr + 1, (u32)val);
 }
 
 /* There is no asm instructions for 64 bits reverse loads and stores */
 static u64 in_le64(const u64 __iomem *addr)
 {
-        return ((u64)in_le32((u32 *)addr + 1) << 32) | (in_le32((u32 *)addr));
+        return ((u64)in_le32((u32 __iomem *)addr + 1) << 32) |
+                (in_le32((u32 __iomem *)addr));
 }
 
 static void out_le64(u64 __iomem *addr, u64 val)
 {
-        out_le32((u32 *)addr + 1, val >> 32);
-        out_le32((u32 *)addr, (u32)val);
+        out_le32((u32 __iomem *)addr + 1, val >> 32);
+        out_le32((u32 __iomem *)addr, (u32)val);
 }
 #endif
 
@@ -181,9 +187,11 @@ static void out_le64(u64 __iomem *addr, u64 val)
 
 #define DMA_TO_CPU(fsl_chan, d, width)                                  \
                 (((fsl_chan)->feature & FSL_DMA_BIG_ENDIAN) ?           \
-                        be##width##_to_cpu(d) : le##width##_to_cpu(d))
+                        be##width##_to_cpu((__force __be##width)(v##width)d) : \
+                        le##width##_to_cpu((__force __le##width)(v##width)d))
 #define CPU_TO_DMA(fsl_chan, c, width)                                  \
                 (((fsl_chan)->feature & FSL_DMA_BIG_ENDIAN) ?           \
-                        cpu_to_be##width(c) : cpu_to_le##width(c))
+                        (__force v##width)cpu_to_be##width(c) :         \
+                        (__force v##width)cpu_to_le##width(c))
 
 #endif  /* __DMA_FSLDMA_H */
diff --git a/drivers/dma/ioat_dca.c b/drivers/dma/ioat_dca.c
index 0fa8a98051a8..9e922760b7ff 100644
--- a/drivers/dma/ioat_dca.c
+++ b/drivers/dma/ioat_dca.c
@@ -98,7 +98,7 @@ struct ioat_dca_slot {
 
 struct ioat_dca_priv {
         void __iomem            *iobase;
-        void                    *dca_base;
+        void __iomem            *dca_base;
         int                      max_requesters;
         int                      requester_count;
         u8                       tag_map[IOAT_TAG_MAP_LEN];
@@ -338,7 +338,7 @@ static struct dca_ops ioat2_dca_ops = {
         .get_tag                = ioat2_dca_get_tag,
 };
 
-static int ioat2_dca_count_dca_slots(void *iobase, u16 dca_offset)
+static int ioat2_dca_count_dca_slots(void __iomem *iobase, u16 dca_offset)
 {
         int slots = 0;
         u32 req;
diff --git a/drivers/dma/iop-adma.c b/drivers/dma/iop-adma.c
index 3986d54492bd..f82b0906d466 100644
--- a/drivers/dma/iop-adma.c
+++ b/drivers/dma/iop-adma.c
@@ -140,7 +140,7 @@ static void __iop_adma_slot_cleanup(struct iop_adma_chan *iop_chan)
         int busy = iop_chan_is_busy(iop_chan);
         int seen_current = 0, slot_cnt = 0, slots_per_op = 0;
 
-        dev_dbg(iop_chan->device->common.dev, "%s\n", __FUNCTION__);
+        dev_dbg(iop_chan->device->common.dev, "%s\n", __func__);
         /* free completed slots from the chain starting with
          * the oldest descriptor
          */
@@ -438,7 +438,7 @@ iop_adma_tx_submit(struct dma_async_tx_descriptor *tx)
         spin_unlock_bh(&iop_chan->lock);
 
         dev_dbg(iop_chan->device->common.dev, "%s cookie: %d slot: %d\n",
-                __FUNCTION__, sw_desc->async_tx.cookie, sw_desc->idx);
+                __func__, sw_desc->async_tx.cookie, sw_desc->idx);
 
         return cookie;
 }
@@ -520,7 +520,7 @@ iop_adma_prep_dma_interrupt(struct dma_chan *chan)
         struct iop_adma_desc_slot *sw_desc, *grp_start;
         int slot_cnt, slots_per_op;
 
-        dev_dbg(iop_chan->device->common.dev, "%s\n", __FUNCTION__);
+        dev_dbg(iop_chan->device->common.dev, "%s\n", __func__);
 
         spin_lock_bh(&iop_chan->lock);
         slot_cnt = iop_chan_interrupt_slot_count(&slots_per_op, iop_chan);
@@ -548,7 +548,7 @@ iop_adma_prep_dma_memcpy(struct dma_chan *chan, dma_addr_t dma_dest,
         BUG_ON(unlikely(len > IOP_ADMA_MAX_BYTE_COUNT));
 
         dev_dbg(iop_chan->device->common.dev, "%s len: %u\n",
-                __FUNCTION__, len);
+                __func__, len);
 
         spin_lock_bh(&iop_chan->lock);
         slot_cnt = iop_chan_memcpy_slot_count(len, &slots_per_op);
@@ -580,7 +580,7 @@ iop_adma_prep_dma_memset(struct dma_chan *chan, dma_addr_t dma_dest,
         BUG_ON(unlikely(len > IOP_ADMA_MAX_BYTE_COUNT));
 
         dev_dbg(iop_chan->device->common.dev, "%s len: %u\n",
-                __FUNCTION__, len);
+                __func__, len);
 
         spin_lock_bh(&iop_chan->lock);
         slot_cnt = iop_chan_memset_slot_count(len, &slots_per_op);
@@ -614,7 +614,7 @@ iop_adma_prep_dma_xor(struct dma_chan *chan, dma_addr_t dma_dest,
 
         dev_dbg(iop_chan->device->common.dev,
                 "%s src_cnt: %d len: %u flags: %lx\n",
-                __FUNCTION__, src_cnt, len, flags);
+                __func__, src_cnt, len, flags);
 
         spin_lock_bh(&iop_chan->lock);
         slot_cnt = iop_chan_xor_slot_count(len, src_cnt, &slots_per_op);
@@ -648,7 +648,7 @@ iop_adma_prep_dma_zero_sum(struct dma_chan *chan, dma_addr_t *dma_src,
                 return NULL;
 
         dev_dbg(iop_chan->device->common.dev, "%s src_cnt: %d len: %u\n",
-                __FUNCTION__, src_cnt, len);
+                __func__, src_cnt, len);
 
         spin_lock_bh(&iop_chan->lock);
         slot_cnt = iop_chan_zero_sum_slot_count(len, src_cnt, &slots_per_op);
@@ -659,7 +659,7 @@ iop_adma_prep_dma_zero_sum(struct dma_chan *chan, dma_addr_t *dma_src,
                 iop_desc_set_zero_sum_byte_count(grp_start, len);
                 grp_start->xor_check_result = result;
                 pr_debug("\t%s: grp_start->xor_check_result: %p\n",
-                        __FUNCTION__, grp_start->xor_check_result);
+                        __func__, grp_start->xor_check_result);
                 sw_desc->unmap_src_cnt = src_cnt;
                 sw_desc->unmap_len = len;
                 while (src_cnt--)
@@ -700,7 +700,7 @@ static void iop_adma_free_chan_resources(struct dma_chan *chan)
         iop_chan->last_used = NULL;
 
         dev_dbg(iop_chan->device->common.dev, "%s slots_allocated %d\n",
-                __FUNCTION__, iop_chan->slots_allocated);
+                __func__, iop_chan->slots_allocated);
         spin_unlock_bh(&iop_chan->lock);
 
         /* one is ok since we left it on there on purpose */
@@ -753,7 +753,7 @@ static irqreturn_t iop_adma_eot_handler(int irq, void *data)
 {
         struct iop_adma_chan *chan = data;
 
-        dev_dbg(chan->device->common.dev, "%s\n", __FUNCTION__);
+        dev_dbg(chan->device->common.dev, "%s\n", __func__);
 
         tasklet_schedule(&chan->irq_tasklet);
 
@@ -766,7 +766,7 @@ static irqreturn_t iop_adma_eoc_handler(int irq, void *data)
 {
         struct iop_adma_chan *chan = data;
 
-        dev_dbg(chan->device->common.dev, "%s\n", __FUNCTION__);
+        dev_dbg(chan->device->common.dev, "%s\n", __func__);
 
         tasklet_schedule(&chan->irq_tasklet);
 
@@ -823,7 +823,7 @@ static int __devinit iop_adma_memcpy_self_test(struct iop_adma_device *device)
         int err = 0;
         struct iop_adma_chan *iop_chan;
 
-        dev_dbg(device->common.dev, "%s\n", __FUNCTION__);
+        dev_dbg(device->common.dev, "%s\n", __func__);
 
         src = kzalloc(sizeof(u8) * IOP_ADMA_TEST_SIZE, GFP_KERNEL);
         if (!src)
@@ -906,7 +906,7 @@ iop_adma_xor_zero_sum_self_test(struct iop_adma_device *device)
         int err = 0;
         struct iop_adma_chan *iop_chan;
 
-        dev_dbg(device->common.dev, "%s\n", __FUNCTION__);
+        dev_dbg(device->common.dev, "%s\n", __func__);
 
         for (src_idx = 0; src_idx < IOP_ADMA_NUM_SRC_TEST; src_idx++) {
                 xor_srcs[src_idx] = alloc_page(GFP_KERNEL);
@@ -1159,7 +1159,7 @@ static int __devinit iop_adma_probe(struct platform_device *pdev)
         }
 
         dev_dbg(&pdev->dev, "%s: allocted descriptor pool virt %p phys %p\n",
-                __FUNCTION__, adev->dma_desc_pool_virt,
+                __func__, adev->dma_desc_pool_virt,
                 (void *) adev->dma_desc_pool);
 
         adev->id = plat_data->hw_id;
@@ -1289,7 +1289,7 @@ static void iop_chan_start_null_memcpy(struct iop_adma_chan *iop_chan)
         dma_cookie_t cookie;
         int slot_cnt, slots_per_op;
 
-        dev_dbg(iop_chan->device->common.dev, "%s\n", __FUNCTION__);
+        dev_dbg(iop_chan->device->common.dev, "%s\n", __func__);
 
         spin_lock_bh(&iop_chan->lock);
         slot_cnt = iop_chan_memcpy_slot_count(0, &slots_per_op);
@@ -1346,7 +1346,7 @@ static void iop_chan_start_null_xor(struct iop_adma_chan *iop_chan)
         dma_cookie_t cookie;
         int slot_cnt, slots_per_op;
 
-        dev_dbg(iop_chan->device->common.dev, "%s\n", __FUNCTION__);
+        dev_dbg(iop_chan->device->common.dev, "%s\n", __func__);
 
         spin_lock_bh(&iop_chan->lock);
         slot_cnt = iop_chan_xor_slot_count(0, 2, &slots_per_op);
diff --git a/drivers/firewire/Kconfig b/drivers/firewire/Kconfig
index fe9e768cfbc4..25bdc2dd9ce1 100644
--- a/drivers/firewire/Kconfig
+++ b/drivers/firewire/Kconfig
@@ -1,5 +1,3 @@
-# -*- shell-script -*-
-
 comment "An alternative FireWire stack is available with EXPERIMENTAL=y"
         depends on EXPERIMENTAL=n
 
@@ -21,27 +19,7 @@ config FIREWIRE
           NOTE:
 
           You should only build ONE of the stacks, unless you REALLY know what
-          you are doing.  If you install both, you should configure them only as
-          modules rather than link them statically, and you should blacklist one
-          of the concurrent low-level drivers in /etc/modprobe.conf.  Add either
-
-              blacklist firewire-ohci
-          or
-              blacklist ohci1394
-
-          there depending on which driver you DON'T want to have auto-loaded.
-          You can optionally do the same with the other IEEE 1394/ FireWire
-          drivers.
-
-          If you have an old modprobe which doesn't implement the blacklist
-          directive, use either
-
-               install firewire-ohci /bin/true
-          or
-               install ohci1394 /bin/true
-
-          and so on, depending on which modules you DON't want to have
-          auto-loaded.
+          you are doing.
 
 config FIREWIRE_OHCI
         tristate "Support for OHCI FireWire host controllers"
@@ -57,8 +35,24 @@ config FIREWIRE_OHCI
 
           NOTE:
 
-          If you also build ohci1394 of the classic stack, blacklist either
-          ohci1394 or firewire-ohci to let hotplug load only the desired driver.
+          You should only build ohci1394 or firewire-ohci, but not both.
+          If you nevertheless want to install both, you should configure them
+          only as modules and blacklist the driver(s) which you don't want to
+          have auto-loaded.  Add either
+
+              blacklist firewire-ohci
+          or
+              blacklist ohci1394
+              blacklist video1394
+              blacklist dv1394
+
+          to /etc/modprobe.conf or /etc/modprobe.d/* and update modprobe.conf
+          depending on your distribution.  The latter two modules should be
+          blacklisted together with ohci1394 because they depend on ohci1394.
+
+          If you have an old modprobe which doesn't implement the blacklist
+          directive, use "install modulename /bin/true" for the modules to be
+          blacklisted.
 
 config FIREWIRE_SBP2
         tristate "Support for storage devices (SBP-2 protocol driver)"
@@ -75,9 +69,3 @@ config FIREWIRE_SBP2
 
           You should also enable support for disks, CD-ROMs, etc. in the SCSI
           configuration section.
-
-          NOTE:
-
-          If you also build sbp2 of the classic stack, blacklist either sbp2
-          or firewire-sbp2 to let hotplug load only the desired driver.
-
diff --git a/drivers/firewire/fw-ohci.c b/drivers/firewire/fw-ohci.c
index 7ebad3c14cb8..996d61f0d460 100644
--- a/drivers/firewire/fw-ohci.c
+++ b/drivers/firewire/fw-ohci.c
@@ -33,6 +33,10 @@
 #include <asm/page.h>
 #include <asm/system.h>
 
+#ifdef CONFIG_PPC_PMAC
+#include <asm/pmac_feature.h>
+#endif
+
 #include "fw-ohci.h"
 #include "fw-transaction.h"
 
@@ -175,6 +179,7 @@ struct fw_ohci {
         int generation;
         int request_generation;
         u32 bus_seconds;
+        bool old_uninorth;
 
         /*
          * Spinlock for accessing fw_ohci data.  Never call out of
@@ -276,19 +281,13 @@ static int ar_context_add_page(struct ar_context *ctx)
 {
         struct device *dev = ctx->ohci->card.device;
         struct ar_buffer *ab;
-        dma_addr_t ab_bus;
+        dma_addr_t uninitialized_var(ab_bus);
         size_t offset;
 
-        ab = (struct ar_buffer *) __get_free_page(GFP_ATOMIC);
+        ab = dma_alloc_coherent(dev, PAGE_SIZE, &ab_bus, GFP_ATOMIC);
         if (ab == NULL)
                 return -ENOMEM;
 
-        ab_bus = dma_map_single(dev, ab, PAGE_SIZE, DMA_BIDIRECTIONAL);
-        if (dma_mapping_error(ab_bus)) {
-                free_page((unsigned long) ab);
-                return -ENOMEM;
-        }
-
         memset(&ab->descriptor, 0, sizeof(ab->descriptor));
         ab->descriptor.control        = cpu_to_le16(DESCRIPTOR_INPUT_MORE |
                                                     DESCRIPTOR_STATUS |
@@ -299,8 +298,6 @@ static int ar_context_add_page(struct ar_context *ctx)
         ab->descriptor.res_count      = cpu_to_le16(PAGE_SIZE - offset);
         ab->descriptor.branch_address = 0;
 
-        dma_sync_single_for_device(dev, ab_bus, PAGE_SIZE, DMA_BIDIRECTIONAL);
-
         ctx->last_buffer->descriptor.branch_address = cpu_to_le32(ab_bus | 1);
         ctx->last_buffer->next = ab;
         ctx->last_buffer = ab;
@@ -311,15 +308,22 @@ static int ar_context_add_page(struct ar_context *ctx)
         return 0;
 }
 
+#if defined(CONFIG_PPC_PMAC) && defined(CONFIG_PPC32)
+#define cond_le32_to_cpu(v) \
+        (ohci->old_uninorth ? (__force __u32)(v) : le32_to_cpu(v))
+#else
+#define cond_le32_to_cpu(v) le32_to_cpu(v)
+#endif
+
 static __le32 *handle_ar_packet(struct ar_context *ctx, __le32 *buffer)
 {
         struct fw_ohci *ohci = ctx->ohci;
         struct fw_packet p;
         u32 status, length, tcode;
 
-        p.header[0] = le32_to_cpu(buffer[0]);
-        p.header[1] = le32_to_cpu(buffer[1]);
-        p.header[2] = le32_to_cpu(buffer[2]);
+        p.header[0] = cond_le32_to_cpu(buffer[0]);
+        p.header[1] = cond_le32_to_cpu(buffer[1]);
+        p.header[2] = cond_le32_to_cpu(buffer[2]);
 
         tcode = (p.header[0] >> 4) & 0x0f;
         switch (tcode) {
@@ -331,7 +335,7 @@ static __le32 *handle_ar_packet(struct ar_context *ctx, __le32 *buffer)
                 break;
 
         case TCODE_READ_BLOCK_REQUEST :
-                p.header[3] = le32_to_cpu(buffer[3]);
+                p.header[3] = cond_le32_to_cpu(buffer[3]);
                 p.header_length = 16;
                 p.payload_length = 0;
                 break;
@@ -340,7 +344,7 @@ static __le32 *handle_ar_packet(struct ar_context *ctx, __le32 *buffer)
         case TCODE_READ_BLOCK_RESPONSE:
         case TCODE_LOCK_REQUEST:
         case TCODE_LOCK_RESPONSE:
-                p.header[3] = le32_to_cpu(buffer[3]);
+                p.header[3] = cond_le32_to_cpu(buffer[3]);
                 p.header_length = 16;
                 p.payload_length = p.header[3] >> 16;
                 break;
@@ -357,7 +361,7 @@ static __le32 *handle_ar_packet(struct ar_context *ctx, __le32 *buffer)
 
         /* FIXME: What to do about evt_* errors? */
         length = (p.header_length + p.payload_length + 3) / 4;
-        status = le32_to_cpu(buffer[length]);
+        status = cond_le32_to_cpu(buffer[length]);
 
         p.ack        = ((status >> 16) & 0x1f) - 16;
         p.speed      = (status >> 21) & 0x7;
@@ -375,7 +379,7 @@ static __le32 *handle_ar_packet(struct ar_context *ctx, __le32 *buffer)
          */
 
         if (p.ack + 16 == 0x09)
-                ohci->request_generation = (buffer[2] >> 16) & 0xff;
+                ohci->request_generation = (p.header[2] >> 16) & 0xff;
         else if (ctx == &ohci->ar_request_ctx)
                 fw_core_handle_request(&ohci->card, &p);
         else
@@ -397,6 +401,7 @@ static void ar_context_tasklet(unsigned long data)
 
         if (d->res_count == 0) {
                 size_t size, rest, offset;
+                dma_addr_t buffer_bus;
 
                 /*
                  * This descriptor is finished and we may have a
@@ -405,9 +410,7 @@ static void ar_context_tasklet(unsigned long data)
                  */
 
                 offset = offsetof(struct ar_buffer, data);
-                dma_unmap_single(ohci->card.device,
-                        le32_to_cpu(ab->descriptor.data_address) - offset,
-                        PAGE_SIZE, DMA_BIDIRECTIONAL);
+                buffer_bus = le32_to_cpu(ab->descriptor.data_address) - offset;
 
                 buffer = ab;
                 ab = ab->next;
@@ -423,7 +426,8 @@ static void ar_context_tasklet(unsigned long data)
                 while (buffer < end)
                         buffer = handle_ar_packet(ctx, buffer);
 
-                free_page((unsigned long)buffer);
+                dma_free_coherent(ohci->card.device, PAGE_SIZE,
+                                  buffer, buffer_bus);
                 ar_context_add_page(ctx);
         } else {
                 buffer = ctx->pointer;
@@ -532,7 +536,7 @@ static int
 context_add_buffer(struct context *ctx)
 {
         struct descriptor_buffer *desc;
-        dma_addr_t bus_addr;
+        dma_addr_t uninitialized_var(bus_addr);
         int offset;
 
         /*
@@ -1022,13 +1026,14 @@ static void bus_reset_tasklet(unsigned long data)
          */
 
         self_id_count = (reg_read(ohci, OHCI1394_SelfIDCount) >> 3) & 0x3ff;
-        generation = (le32_to_cpu(ohci->self_id_cpu[0]) >> 16) & 0xff;
+        generation = (cond_le32_to_cpu(ohci->self_id_cpu[0]) >> 16) & 0xff;
         rmb();
 
         for (i = 1, j = 0; j < self_id_count; i += 2, j++) {
                 if (ohci->self_id_cpu[i] != ~ohci->self_id_cpu[i + 1])
                         fw_error("inconsistent self IDs\n");
-                ohci->self_id_buffer[j] = le32_to_cpu(ohci->self_id_cpu[i]);
+                ohci->self_id_buffer[j] =
+                                cond_le32_to_cpu(ohci->self_id_cpu[i]);
         }
         rmb();
 
@@ -1316,7 +1321,7 @@ ohci_set_config_rom(struct fw_card *card, u32 *config_rom, size_t length)
         unsigned long flags;
         int retval = -EBUSY;
         __be32 *next_config_rom;
-        dma_addr_t next_config_rom_bus;
+        dma_addr_t uninitialized_var(next_config_rom_bus);
 
         ohci = fw_ohci(card);
 
@@ -1487,7 +1492,7 @@ static int handle_ir_dualbuffer_packet(struct context *context,
         void *p, *end;
         int i;
 
-        if (db->first_res_count > 0 && db->second_res_count > 0) {
+        if (db->first_res_count != 0 && db->second_res_count != 0) {
                 if (ctx->excess_bytes <= le16_to_cpu(db->second_req_count)) {
                         /* This descriptor isn't done yet, stop iteration. */
                         return 0;
@@ -1513,7 +1518,7 @@ static int handle_ir_dualbuffer_packet(struct context *context,
                 memcpy(ctx->header + i + 4, p + 8, ctx->base.header_size - 4);
                 i += ctx->base.header_size;
                 ctx->excess_bytes +=
-                        (le32_to_cpu(*(u32 *)(p + 4)) >> 16) & 0xffff;
+                        (le32_to_cpu(*(__le32 *)(p + 4)) >> 16) & 0xffff;
                 p += ctx->base.header_size + 4;
         }
         ctx->header_length = i;
@@ -2048,6 +2053,18 @@ pci_probe(struct pci_dev *dev, const struct pci_device_id *ent)
         int err;
         size_t size;
 
+#ifdef CONFIG_PPC_PMAC
+        /* Necessary on some machines if fw-ohci was loaded/ unloaded before */
+        if (machine_is(powermac)) {
+                struct device_node *ofn = pci_device_to_OF_node(dev);
+
+                if (ofn) {
+                        pmac_call_feature(PMAC_FTR_1394_CABLE_POWER, ofn, 0, 1);
+                        pmac_call_feature(PMAC_FTR_1394_ENABLE, ofn, 0, 1);
+                }
+        }
+#endif /* CONFIG_PPC_PMAC */
+
         ohci = kzalloc(sizeof(*ohci), GFP_KERNEL);
         if (ohci == NULL) {
                 fw_error("Could not malloc fw_ohci data.\n");
@@ -2066,6 +2083,10 @@ pci_probe(struct pci_dev *dev, const struct pci_device_id *ent)
         pci_write_config_dword(dev, OHCI1394_PCI_HCI_Control, 0);
         pci_set_drvdata(dev, ohci);
 
+#if defined(CONFIG_PPC_PMAC) && defined(CONFIG_PPC32)
+        ohci->old_uninorth = dev->vendor == PCI_VENDOR_ID_APPLE &&
+                             dev->device == PCI_DEVICE_ID_APPLE_UNI_N_FW;
+#endif
         spin_lock_init(&ohci->lock);
 
         tasklet_init(&ohci->bus_reset_tasklet,
@@ -2182,6 +2203,19 @@ static void pci_remove(struct pci_dev *dev)
         pci_disable_device(dev);
         fw_card_put(&ohci->card);
 
+#ifdef CONFIG_PPC_PMAC
+        /* On UniNorth, power down the cable and turn off the chip clock
+         * to save power on laptops */
+        if (machine_is(powermac)) {
+                struct device_node *ofn = pci_device_to_OF_node(dev);
+
+                if (ofn) {
+                        pmac_call_feature(PMAC_FTR_1394_ENABLE, ofn, 0, 0);
+                        pmac_call_feature(PMAC_FTR_1394_CABLE_POWER, ofn, 0, 0);
+                }
+        }
+#endif /* CONFIG_PPC_PMAC */
+
         fw_notify("Removed fw-ohci device.\n");
 }
 
@@ -2202,6 +2236,16 @@ static int pci_suspend(struct pci_dev *pdev, pm_message_t state)
         if (err)
                 fw_error("pci_set_power_state failed with %d\n", err);
 
+/* PowerMac suspend code comes last */
+#ifdef CONFIG_PPC_PMAC
+        if (machine_is(powermac)) {
+                struct device_node *ofn = pci_device_to_OF_node(pdev);
+
+                if (ofn)
+                        pmac_call_feature(PMAC_FTR_1394_ENABLE, ofn, 0, 0);
+        }
+#endif /* CONFIG_PPC_PMAC */
+
         return 0;
 }
 
@@ -2210,6 +2254,16 @@ static int pci_resume(struct pci_dev *pdev)
         struct fw_ohci *ohci = pci_get_drvdata(pdev);
         int err;
 
+/* PowerMac resume code comes first */
+#ifdef CONFIG_PPC_PMAC
+        if (machine_is(powermac)) {
+                struct device_node *ofn = pci_device_to_OF_node(pdev);
+
+                if (ofn)
+                        pmac_call_feature(PMAC_FTR_1394_ENABLE, ofn, 0, 1);
+        }
+#endif /* CONFIG_PPC_PMAC */
+
         pci_set_power_state(pdev, PCI_D0);
         pci_restore_state(pdev);
         err = pci_enable_device(pdev);
diff --git a/drivers/firewire/fw-sbp2.c b/drivers/firewire/fw-sbp2.c
index 03069a454c07..62b4e47d0cc0 100644
--- a/drivers/firewire/fw-sbp2.c
+++ b/drivers/firewire/fw-sbp2.c
@@ -173,6 +173,7 @@ struct sbp2_target {
 #define SBP2_ORB_TIMEOUT                2000U   /* Timeout in ms */
 #define SBP2_ORB_NULL                   0x80000000
 #define SBP2_MAX_SG_ELEMENT_LENGTH      0xf000
+#define SBP2_RETRY_LIMIT                0xf     /* 15 retries */
 
 #define SBP2_DIRECTION_TO_MEDIA         0x0
 #define SBP2_DIRECTION_FROM_MEDIA       0x1
@@ -330,6 +331,11 @@ static const struct {
                 .model                  = ~0,
                 .workarounds            = SBP2_WORKAROUND_128K_MAX_TRANS,
         },
+        /* Datafab MD2-FW2 with Symbios/LSILogic SYM13FW500 bridge */ {
+                .firmware_revision      = 0x002600,
+                .model                  = ~0,
+                .workarounds            = SBP2_WORKAROUND_128K_MAX_TRANS,
+        },
 
         /*
          * There are iPods (2nd gen, 3rd gen) with model_id == 0, but
@@ -812,6 +818,30 @@ static void sbp2_target_put(struct sbp2_target *tgt)
         kref_put(&tgt->kref, sbp2_release_target);
 }
 
+static void
+complete_set_busy_timeout(struct fw_card *card, int rcode,
+                          void *payload, size_t length, void *done)
+{
+        complete(done);
+}
+
+static void sbp2_set_busy_timeout(struct sbp2_logical_unit *lu)
+{
+        struct fw_device *device = fw_device(lu->tgt->unit->device.parent);
+        DECLARE_COMPLETION_ONSTACK(done);
+        struct fw_transaction t;
+        static __be32 busy_timeout;
+
+        /* FIXME: we should try to set dual-phase cycle_limit too */
+        busy_timeout = cpu_to_be32(SBP2_RETRY_LIMIT);
+
+        fw_send_request(device->card, &t, TCODE_WRITE_QUADLET_REQUEST,
+                        lu->tgt->node_id, lu->generation, device->max_speed,
+                        CSR_REGISTER_BASE + CSR_BUSY_TIMEOUT, &busy_timeout,
+                        sizeof(busy_timeout), complete_set_busy_timeout, &done);
+        wait_for_completion(&done);
+}
+
 static void sbp2_reconnect(struct work_struct *work);
 
 static void sbp2_login(struct work_struct *work)
@@ -864,10 +894,8 @@ static void sbp2_login(struct work_struct *work)
         fw_notify("%s: logged in to LUN %04x (%d retries)\n",
                   tgt->bus_id, lu->lun, lu->retries);
 
-#if 0
-        /* FIXME: The linux1394 sbp2 does this last step. */
-        sbp2_set_busy_timeout(scsi_id);
-#endif
+        /* set appropriate retry limit(s) in BUSY_TIMEOUT register */
+        sbp2_set_busy_timeout(lu);
 
         PREPARE_DELAYED_WORK(&lu->work, sbp2_reconnect);
         sbp2_agent_reset(lu);
diff --git a/drivers/firewire/fw-topology.c b/drivers/firewire/fw-topology.c
index e47bb040197a..d2c7a3d7e1cb 100644
--- a/drivers/firewire/fw-topology.c
+++ b/drivers/firewire/fw-topology.c
@@ -21,6 +21,7 @@
 #include <linux/module.h>
 #include <linux/wait.h>
 #include <linux/errno.h>
+#include <asm/bug.h>
 #include <asm/system.h>
 #include "fw-transaction.h"
 #include "fw-topology.h"
@@ -424,8 +425,8 @@ update_tree(struct fw_card *card, struct fw_node *root)
         node1 = fw_node(list1.next);
 
         while (&node0->link != &list0) {
+                WARN_ON(node0->port_count != node1->port_count);
 
-                /* assert(node0->port_count == node1->port_count); */
                 if (node0->link_on && !node1->link_on)
                         event = FW_NODE_LINK_OFF;
                 else if (!node0->link_on && node1->link_on)
diff --git a/drivers/firewire/fw-transaction.c b/drivers/firewire/fw-transaction.c
index 7fcc59dedf08..e6f1bda38940 100644
--- a/drivers/firewire/fw-transaction.c
+++ b/drivers/firewire/fw-transaction.c
@@ -736,6 +736,12 @@ fw_core_handle_response(struct fw_card *card, struct fw_packet *p)
                 break;
         }
 
+        /*
+         * The response handler may be executed while the request handler
+         * is still pending.  Cancel the request handler.
+         */
+        card->driver->cancel_packet(card, &t->packet);
+
         t->callback(card, rcode, data, data_length, t->callback_data);
 }
 EXPORT_SYMBOL(fw_core_handle_response);
@@ -751,7 +757,7 @@ handle_topology_map(struct fw_card *card, struct fw_request *request,
                     void *payload, size_t length, void *callback_data)
 {
         int i, start, end;
-        u32 *map;
+        __be32 *map;
 
         if (!TCODE_IS_READ_REQUEST(tcode)) {
                 fw_send_response(card, request, RCODE_TYPE_ERROR);
diff --git a/drivers/firewire/fw-transaction.h b/drivers/firewire/fw-transaction.h
index 09cb72870454..a43bb22912f9 100644
--- a/drivers/firewire/fw-transaction.h
+++ b/drivers/firewire/fw-transaction.h
@@ -86,12 +86,12 @@
 static inline void
 fw_memcpy_from_be32(void *_dst, void *_src, size_t size)
 {
-        u32 *dst = _dst;
-        u32 *src = _src;
+        u32    *dst = _dst;
+        __be32 *src = _src;
         int i;
 
         for (i = 0; i < size / 4; i++)
-                dst[i] = cpu_to_be32(src[i]);
+                dst[i] = be32_to_cpu(src[i]);
 }
 
 static inline void
diff --git a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c
index d73a768e176e..f0b00ec1e47e 100644
--- a/drivers/hid/hid-core.c
+++ b/drivers/hid/hid-core.c
@@ -968,7 +968,7 @@ int hid_input_report(struct hid_device *hid, int type, u8 *data, int size, int i
                 size--;
         }
 
-        /* dump the report descriptor */
+        /* dump the report */
         dbg_hid("report %d (size %u) = ", n, size);
         for (i = 0; i < size; i++)
                 dbg_hid_line(" %02x", data[i]);
diff --git a/drivers/hid/hid-input.c b/drivers/hid/hid-input.c
index 5a38fb27d69f..c3eb3f13e2ca 100644
--- a/drivers/hid/hid-input.c
+++ b/drivers/hid/hid-input.c
@@ -98,18 +98,16 @@ struct hidinput_key_translation {
 
 static struct hidinput_key_translation apple_fn_keys[] = {
         { KEY_BACKSPACE, KEY_DELETE },
-        { KEY_F1,       KEY_BRIGHTNESSDOWN,     APPLE_FLAG_FKEY },
-        { KEY_F2,       KEY_BRIGHTNESSUP,       APPLE_FLAG_FKEY },
-        { KEY_F3,       KEY_CYCLEWINDOWS,       APPLE_FLAG_FKEY }, /* Exposé */
-        { KEY_F4,       KEY_FN_F4,              APPLE_FLAG_FKEY }, /* Dashboard */
-        { KEY_F5,       KEY_FN_F5 },
-        { KEY_F6,       KEY_FN_F6 },
-        { KEY_F7,       KEY_BACK,               APPLE_FLAG_FKEY },
-        { KEY_F8,       KEY_PLAYPAUSE,          APPLE_FLAG_FKEY },
-        { KEY_F9,       KEY_FORWARD,            APPLE_FLAG_FKEY },
-        { KEY_F10,      KEY_MUTE,               APPLE_FLAG_FKEY },
-        { KEY_F11,      KEY_VOLUMEDOWN,         APPLE_FLAG_FKEY },
-        { KEY_F12,      KEY_VOLUMEUP,           APPLE_FLAG_FKEY },
+        { KEY_F1,       KEY_BRIGHTNESSDOWN, APPLE_FLAG_FKEY },
+        { KEY_F2,       KEY_BRIGHTNESSUP,   APPLE_FLAG_FKEY },
+        { KEY_F3,       KEY_FN_F5,          APPLE_FLAG_FKEY }, /* Exposé */
+        { KEY_F4,       KEY_FN_F4,          APPLE_FLAG_FKEY }, /* Dashboard */
+        { KEY_F7,       KEY_PREVIOUSSONG,   APPLE_FLAG_FKEY },
+        { KEY_F8,       KEY_PLAYPAUSE,      APPLE_FLAG_FKEY },
+        { KEY_F9,       KEY_NEXTSONG,       APPLE_FLAG_FKEY },
+        { KEY_F10,      KEY_MUTE,           APPLE_FLAG_FKEY },
+        { KEY_F11,      KEY_VOLUMEDOWN,     APPLE_FLAG_FKEY },
+        { KEY_F12,      KEY_VOLUMEUP,       APPLE_FLAG_FKEY },
         { KEY_UP,       KEY_PAGEUP },
         { KEY_DOWN,     KEY_PAGEDOWN },
         { KEY_LEFT,     KEY_HOME },
diff --git a/drivers/hid/usbhid/hid-core.c b/drivers/hid/usbhid/hid-core.c
index b38e559b7a46..d95979f0e028 100644
--- a/drivers/hid/usbhid/hid-core.c
+++ b/drivers/hid/usbhid/hid-core.c
@@ -278,7 +278,7 @@ static int hid_submit_ctrl(struct hid_device *hid)
                 usbhid->urbctrl->pipe = usb_rcvctrlpipe(hid_to_usb_dev(hid), 0);
                 maxpacket = usb_maxpacket(hid_to_usb_dev(hid), usbhid->urbctrl->pipe, 0);
                 if (maxpacket > 0) {
-                        padlen = (len + maxpacket - 1) / maxpacket;
+                        padlen = DIV_ROUND_UP(len, maxpacket);
                         padlen *= maxpacket;
                         if (padlen > usbhid->bufsize)
                                 padlen = usbhid->bufsize;
diff --git a/drivers/hid/usbhid/hid-quirks.c b/drivers/hid/usbhid/hid-quirks.c
index e6d05f6b1c1c..e29a057cbea2 100644
--- a/drivers/hid/usbhid/hid-quirks.c
+++ b/drivers/hid/usbhid/hid-quirks.c
@@ -345,6 +345,9 @@
 #define USB_VENDOR_ID_NATIONAL_SEMICONDUCTOR 0x0400
 #define USB_DEVICE_ID_N_S_HARMONY       0xc359
 
+#define USB_VENDOR_ID_NATSU             0x08b7
+#define USB_DEVICE_ID_NATSU_GAMEPAD     0x0001
+
 #define USB_VENDOR_ID_NEC               0x073e
 #define USB_DEVICE_ID_NEC_USB_GAME_PAD  0x0301
 
@@ -426,6 +429,7 @@ static const struct hid_blacklist {
         { USB_VENDOR_ID_HAPP, USB_DEVICE_ID_UGCI_DRIVING, HID_QUIRK_BADPAD | HID_QUIRK_MULTI_INPUT },
         { USB_VENDOR_ID_HAPP, USB_DEVICE_ID_UGCI_FLYING, HID_QUIRK_BADPAD | HID_QUIRK_MULTI_INPUT },
         { USB_VENDOR_ID_HAPP, USB_DEVICE_ID_UGCI_FIGHTING, HID_QUIRK_BADPAD | HID_QUIRK_MULTI_INPUT },
+        { USB_VENDOR_ID_NATSU, USB_DEVICE_ID_NATSU_GAMEPAD, HID_QUIRK_BADPAD },
         { USB_VENDOR_ID_NEC, USB_DEVICE_ID_NEC_USB_GAME_PAD, HID_QUIRK_BADPAD },
         { USB_VENDOR_ID_SAITEK, USB_DEVICE_ID_SAITEK_RUMBLEPAD, HID_QUIRK_BADPAD },
         { USB_VENDOR_ID_TOPMAX, USB_DEVICE_ID_TOPMAX_COBRAPAD, HID_QUIRK_BADPAD },
@@ -624,7 +628,7 @@ static const struct hid_blacklist {
         { USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_ISO, HID_QUIRK_APPLE_HAS_FN | HID_QUIRK_APPLE_ISO_KEYBOARD },
         { USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_JIS, HID_QUIRK_APPLE_HAS_FN },
         { USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER4_HF_ANSI, HID_QUIRK_APPLE_HAS_FN | HID_QUIRK_IGNORE_MOUSE },
-        { USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER4_HF_ISO, HID_QUIRK_APPLE_HAS_FN | HID_QUIRK_IGNORE_MOUSE | HID_QUIRK_APPLE_ISO_KEYBOARD },
+        { USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER4_HF_ISO, HID_QUIRK_APPLE_HAS_FN | HID_QUIRK_IGNORE_MOUSE },
         { USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER4_HF_JIS, HID_QUIRK_APPLE_HAS_FN | HID_QUIRK_IGNORE_MOUSE },
         { USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_WIRELESS_ANSI, HID_QUIRK_APPLE_HAS_FN },
         { USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_WIRELESS_ISO, HID_QUIRK_APPLE_HAS_FN | HID_QUIRK_APPLE_ISO_KEYBOARD },
diff --git a/drivers/hwmon/Kconfig b/drivers/hwmon/Kconfig
index 368879ff5d8c..4dc76bc45c9d 100644
--- a/drivers/hwmon/Kconfig
+++ b/drivers/hwmon/Kconfig
@@ -337,8 +337,9 @@ config SENSORS_IBMPEX
         help
           If you say yes here you get support for the temperature and
           power sensors in various IBM System X servers that support
-          PowerExecutive.  So far this includes the x3550, x3650, x3655,
-          x3755, and certain HS20 blades.
+          PowerExecutive.  So far this includes the x3350, x3550, x3650,
+          x3655, and x3755; the x3800, x3850, and x3950 models that have
+          PCI Express; and some of the HS2x, LS2x, and QS2x blades.
 
           This driver can also be built as a module.  If so, the module
           will be called ibmpex.
diff --git a/drivers/hwmon/ibmpex.c b/drivers/hwmon/ibmpex.c
index 9c9cdb0685e4..4e9b19c6732f 100644
--- a/drivers/hwmon/ibmpex.c
+++ b/drivers/hwmon/ibmpex.c
@@ -327,10 +327,14 @@ static int is_temp_sensor(const char *sensor_id, int len)
         return 0;
 }
 
-static int power_sensor_multiplier(const char *sensor_id, int len)
+static int power_sensor_multiplier(struct ibmpex_bmc_data *data,
+                                   const char *sensor_id, int len)
 {
         int i;
 
+        if (data->sensor_major == 2)
+                return 1000000;
+
         for (i = PEX_SENSOR_TYPE_LEN; i < len - 1; i++)
                 if (!memcmp(&sensor_id[i], watt_sensor_sig, PEX_MULT_LEN))
                         return 1000000;
@@ -398,14 +402,15 @@ static int ibmpex_find_sensors(struct ibmpex_bmc_data *data)
                         num_power++;
                         sensor_counter = num_power;
                         data->sensors[i].multiplier =
-                                power_sensor_multiplier(data->rx_msg_data,
-                                                     data->rx_msg_len);
+                                power_sensor_multiplier(data,
+                                                        data->rx_msg_data,
+                                                        data->rx_msg_len);
                 } else if (is_temp_sensor(data->rx_msg_data,
                                           data->rx_msg_len)) {
                         sensor_type = TEMP_SENSOR;
                         num_temp++;
                         sensor_counter = num_temp;
-                        data->sensors[i].multiplier = 1;
+                        data->sensors[i].multiplier = 1000;
                 } else
                         continue;
 
diff --git a/drivers/i2c/busses/Kconfig b/drivers/i2c/busses/Kconfig
index 476b0bb72d6c..5fa9c3c67e0c 100644
--- a/drivers/i2c/busses/Kconfig
+++ b/drivers/i2c/busses/Kconfig
@@ -100,7 +100,7 @@ config I2C_AU1550
 
 config I2C_BLACKFIN_TWI
         tristate "Blackfin TWI I2C support"
-        depends on BF534 || BF536 || BF537 || BF54x
+        depends on BF534 || BF536 || BF537
         help
           This is the TWI I2C device driver for Blackfin 534/536/537/54x.
           This driver can also be built as a module.  If so, the module
diff --git a/drivers/i2c/busses/i2c-amd756.c b/drivers/i2c/busses/i2c-amd756.c
index 573abe440842..2fa43183d375 100644
--- a/drivers/i2c/busses/i2c-amd756.c
+++ b/drivers/i2c/busses/i2c-amd756.c
@@ -335,7 +335,7 @@ static int __devinit amd756_probe(struct pci_dev *pdev,
         u8 temp;
         
         /* driver_data might come from user-space, so check it */
-        if (id->driver_data > ARRAY_SIZE(chipname))
+        if (id->driver_data >= ARRAY_SIZE(chipname))
                 return -EINVAL;
 
         if (amd756_ioport) {
diff --git a/drivers/i2c/busses/i2c-omap.c b/drivers/i2c/busses/i2c-omap.c
index da6639707ea3..7ba31770d773 100644
--- a/drivers/i2c/busses/i2c-omap.c
+++ b/drivers/i2c/busses/i2c-omap.c
@@ -128,6 +128,8 @@ struct omap_i2c_dev {
         size_t                  buf_len;
         struct i2c_adapter      adapter;
         unsigned                rev1:1;
+        unsigned                idle:1;
+        u16                     iestate;        /* Saved interrupt register */
 };
 
 static inline void omap_i2c_write_reg(struct omap_i2c_dev *i2c_dev,
@@ -174,18 +176,30 @@ static void omap_i2c_put_clocks(struct omap_i2c_dev *dev)
         }
 }
 
-static void omap_i2c_enable_clocks(struct omap_i2c_dev *dev)
+static void omap_i2c_unidle(struct omap_i2c_dev *dev)
 {
         if (dev->iclk != NULL)
                 clk_enable(dev->iclk);
         clk_enable(dev->fclk);
+        if (dev->iestate)
+                omap_i2c_write_reg(dev, OMAP_I2C_IE_REG, dev->iestate);
+        dev->idle = 0;
 }
 
-static void omap_i2c_disable_clocks(struct omap_i2c_dev *dev)
+static void omap_i2c_idle(struct omap_i2c_dev *dev)
 {
+        u16 iv;
+
+        dev->idle = 1;
+        dev->iestate = omap_i2c_read_reg(dev, OMAP_I2C_IE_REG);
+        omap_i2c_write_reg(dev, OMAP_I2C_IE_REG, 0);
+        if (dev->rev1)
+                iv = omap_i2c_read_reg(dev, OMAP_I2C_IV_REG);   /* Read clears */
+        else
+                omap_i2c_write_reg(dev, OMAP_I2C_STAT_REG, dev->iestate);
+        clk_disable(dev->fclk);
         if (dev->iclk != NULL)
                 clk_disable(dev->iclk);
-        clk_disable(dev->fclk);
 }
 
 static int omap_i2c_init(struct omap_i2c_dev *dev)
@@ -360,7 +374,7 @@ omap_i2c_xfer(struct i2c_adapter *adap, struct i2c_msg msgs[], int num)
         int i;
         int r;
 
-        omap_i2c_enable_clocks(dev);
+        omap_i2c_unidle(dev);
 
         if ((r = omap_i2c_wait_for_bb(dev)) < 0)
                 goto out;
@@ -374,7 +388,7 @@ omap_i2c_xfer(struct i2c_adapter *adap, struct i2c_msg msgs[], int num)
         if (r == 0)
                 r = num;
 out:
-        omap_i2c_disable_clocks(dev);
+        omap_i2c_idle(dev);
         return r;
 }
 
@@ -403,6 +417,9 @@ omap_i2c_rev1_isr(int this_irq, void *dev_id)
         struct omap_i2c_dev *dev = dev_id;
         u16 iv, w;
 
+        if (dev->idle)
+                return IRQ_NONE;
+
         iv = omap_i2c_read_reg(dev, OMAP_I2C_IV_REG);
         switch (iv) {
         case 0x00:      /* None */
@@ -457,6 +474,9 @@ omap_i2c_isr(int this_irq, void *dev_id)
         u16 stat, w;
         int count = 0;
 
+        if (dev->idle)
+                return IRQ_NONE;
+
         bits = omap_i2c_read_reg(dev, OMAP_I2C_IE_REG);
         while ((stat = (omap_i2c_read_reg(dev, OMAP_I2C_STAT_REG))) & bits) {
                 dev_dbg(dev->dev, "IRQ (ISR = 0x%04x)\n", stat);
@@ -575,7 +595,7 @@ omap_i2c_probe(struct platform_device *pdev)
         if ((r = omap_i2c_get_clocks(dev)) != 0)
                 goto err_free_mem;
 
-        omap_i2c_enable_clocks(dev);
+        omap_i2c_unidle(dev);
 
         if (cpu_is_omap15xx())
                 dev->rev1 = omap_i2c_read_reg(dev, OMAP_I2C_REV_REG) < 0x20;
@@ -610,7 +630,7 @@ omap_i2c_probe(struct platform_device *pdev)
                 goto err_free_irq;
         }
 
-        omap_i2c_disable_clocks(dev);
+        omap_i2c_idle(dev);
 
         return 0;
 
@@ -618,7 +638,7 @@ err_free_irq:
         free_irq(dev->irq, dev);
 err_unuse_clocks:
         omap_i2c_write_reg(dev, OMAP_I2C_CON_REG, 0);
-        omap_i2c_disable_clocks(dev);
+        omap_i2c_idle(dev);
         omap_i2c_put_clocks(dev);
 err_free_mem:
         platform_set_drvdata(pdev, NULL);
diff --git a/drivers/i2c/chips/Makefile b/drivers/i2c/chips/Makefile
index 501f00cea782..e47aca0ca5ae 100644
--- a/drivers/i2c/chips/Makefile
+++ b/drivers/i2c/chips/Makefile
@@ -1,6 +1,13 @@
 #
 # Makefile for miscellaneous I2C chip drivers.
 #
+# Think twice before you add a new driver to this directory.
+# Device drivers are better grouped according to the functionality they
+# implement rather than to the bus they are connected to. In particular:
+# * Hardware monitoring chip drivers go to drivers/hwmon
+# * RTC chip drivers go to drivers/rtc
+# * I/O expander drivers go to drivers/gpio
+#
 
 obj-$(CONFIG_DS1682)            += ds1682.o
 obj-$(CONFIG_SENSORS_EEPROM)    += eeprom.o
diff --git a/drivers/i2c/i2c-core.c b/drivers/i2c/i2c-core.c
index 96da22e9a5a4..8b645c6b2cb5 100644
--- a/drivers/i2c/i2c-core.c
+++ b/drivers/i2c/i2c-core.c
@@ -90,12 +90,16 @@ static int i2c_device_probe(struct device *dev)
 {
         struct i2c_client       *client = to_i2c_client(dev);
         struct i2c_driver       *driver = to_i2c_driver(dev->driver);
+        int status;
 
         if (!driver->probe)
                 return -ENODEV;
         client->driver = driver;
         dev_dbg(dev, "probe\n");
-        return driver->probe(client);
+        status = driver->probe(client);
+        if (status)
+                client->driver = NULL;
+        return status;
 }
 
 static int i2c_device_remove(struct device *dev)
@@ -485,8 +489,8 @@ EXPORT_SYMBOL(i2c_add_adapter);
  * Context: can sleep
  *
  * This routine is used to declare an I2C adapter when its bus number
- * matters.  Example: for I2C adapters from system-on-chip CPUs, or
- * otherwise built in to the system's mainboard, and where i2c_board_info
+ * matters.  For example, use it for I2C adapters from system-on-chip CPUs,
+ * or otherwise built in to the system's mainboard, and where i2c_board_info
  * is used to properly configure I2C devices.
  *
  * If no devices have pre-been declared for this bus, then be sure to
diff --git a/drivers/ide/ide-iops.c b/drivers/ide/ide-iops.c
index c419266234a7..01b92208f09d 100644
--- a/drivers/ide/ide-iops.c
+++ b/drivers/ide/ide-iops.c
@@ -595,6 +595,7 @@ u8 eighty_ninty_three (ide_drive_t *drive)
 
         /*
          * FIXME:
+         * - change master/slave IDENTIFY order
          * - force bit13 (80c cable present) check also for !ivb devices
          *   (unless the slave device is pre-ATA3)
          */
diff --git a/drivers/ide/ide-lib.c b/drivers/ide/ide-lib.c
index 29e2c9719c30..7031a8dcf692 100644
--- a/drivers/ide/ide-lib.c
+++ b/drivers/ide/ide-lib.c
@@ -122,7 +122,6 @@ static struct ide_pio_info {
         const char      *name;
         int             pio;
 } ide_pio_blacklist [] = {
-/*      { "Conner Peripherals 1275MB - CFS1275A", 4 }, */
         { "Conner Peripherals 540MB - CFS540A", 3 },
 
         { "WDC AC2700",  3 },
@@ -138,10 +137,8 @@ static struct ide_pio_info {
         { "WDC AC1170",  1 },
         { "WDC AC1210",  1 },
         { "WDC AC280",   0 },
-/*      { "WDC AC21000", 4 }, */
         { "WDC AC31000", 3 },
         { "WDC AC31200", 3 },
-/*      { "WDC AC31600", 4 }, */
 
         { "Maxtor 7131 AT", 1 },
         { "Maxtor 7171 AT", 1 },
@@ -155,13 +152,6 @@ static struct ide_pio_info {
         { "SAMSUNG SHD-3122A", 1 },
         { "SAMSUNG SHD-3172A", 1 },
 
-/*      { "ST51080A", 4 },
- *      { "ST51270A", 4 },
- *      { "ST31220A", 4 },
- *      { "ST31640A", 4 },
- *      { "ST32140A", 4 },
- *      { "ST3780A",  4 },
- */
         { "ST5660A",  3 },
         { "ST3660A",  3 },
         { "ST3630A",  3 },
diff --git a/drivers/ide/ide-probe.c b/drivers/ide/ide-probe.c
index 194ecb0049eb..47a114927c31 100644
--- a/drivers/ide/ide-probe.c
+++ b/drivers/ide/ide-probe.c
@@ -774,9 +774,10 @@ static int ide_probe_port(ide_hwif_t *hwif)
                 printk(KERN_DEBUG "%s: Wait for ready failed before probe !\n", hwif->name);
 
         /*
-         * Need to probe slave device first to make it release PDIAG-.
+         * Second drive should only exist if first drive was found,
+         * but a lot of cdrom drives are configured as single slaves.
          */
-        for (unit = MAX_DRIVES - 1; unit >= 0; unit--) {
+        for (unit = 0; unit < MAX_DRIVES; ++unit) {
                 ide_drive_t *drive = &hwif->drives[unit];
                 drive->dn = (hwif->channel ? 2 : 0) + unit;
                 (void) probe_for_drive(drive);
diff --git a/drivers/ide/ide-tape.c b/drivers/ide/ide-tape.c
index 43e0e0557776..0598ecfd5f37 100644
--- a/drivers/ide/ide-tape.c
+++ b/drivers/ide/ide-tape.c
@@ -3765,11 +3765,6 @@ static int ide_tape_probe(ide_drive_t *drive)
         g->fops = &idetape_block_ops;
         ide_register_region(g);
 
-        printk(KERN_WARNING "It is possible that this driver does not have any"
-                " users anymore and, as a result, it will be REMOVED soon."
-                " Please notify Bart <bzolnier@gmail.com> or Boris"
-                " <petkovbb@gmail.com> in case you still need it.\n");
-
         return 0;
 
 out_free_tape:
diff --git a/drivers/ide/ide-taskfile.c b/drivers/ide/ide-taskfile.c
index 0518a2e948cf..4c86a8d84b4c 100644
--- a/drivers/ide/ide-taskfile.c
+++ b/drivers/ide/ide-taskfile.c
@@ -423,6 +423,25 @@ void task_end_request(ide_drive_t *drive, struct request *rq, u8 stat)
 }
 
 /*
+ * We got an interrupt on a task_in case, but no errors and no DRQ.
+ *
+ * It might be a spurious irq (shared irq), but it might be a
+ * command that had no output.
+ */
+static ide_startstop_t task_in_unexpected(ide_drive_t *drive, struct request *rq, u8 stat)
+{
+        /* Command all done? */
+        if (OK_STAT(stat, READY_STAT, BUSY_STAT)) {
+                task_end_request(drive, rq, stat);
+                return ide_stopped;
+        }
+
+        /* Assume it was a spurious irq */
+        ide_set_handler(drive, &task_in_intr, WAIT_WORSTCASE, NULL);
+        return ide_started;
+}
+
+/*
  * Handler for command with PIO data-in phase (Read/Read Multiple).
  */
 static ide_startstop_t task_in_intr(ide_drive_t *drive)
@@ -431,18 +450,17 @@ static ide_startstop_t task_in_intr(ide_drive_t *drive)
         struct request *rq = HWGROUP(drive)->rq;
         u8 stat = ide_read_status(drive);
 
-        /* new way for dealing with premature shared PCI interrupts */
-        if (!OK_STAT(stat, DRQ_STAT, BAD_R_STAT)) {
-                if (stat & (ERR_STAT | DRQ_STAT))
-                        return task_error(drive, rq, __FUNCTION__, stat);
-                /* No data yet, so wait for another IRQ. */
-                ide_set_handler(drive, &task_in_intr, WAIT_WORSTCASE, NULL);
-                return ide_started;
-        }
+        /* Error? */
+        if (stat & ERR_STAT)
+                return task_error(drive, rq, __FUNCTION__, stat);
+
+        /* Didn't want any data? Odd. */
+        if (!(stat & DRQ_STAT))
+                return task_in_unexpected(drive, rq, stat);
 
         ide_pio_datablock(drive, rq, 0);
 
-        /* If it was the last datablock check status and finish transfer. */
+        /* Are we done? Check status and finish transfer. */
         if (!hwif->nleft) {
                 stat = wait_drive_not_busy(drive);
                 if (!OK_STAT(stat, 0, BAD_STAT))
diff --git a/drivers/ide/ide.c b/drivers/ide/ide.c
index 9976f9d627d4..fc69fe2e3ec0 100644
--- a/drivers/ide/ide.c
+++ b/drivers/ide/ide.c
@@ -1258,7 +1258,7 @@ static int __init ide_setup(char *s)
                 drive = &hwif->drives[unit];
                 if (strncmp(s + 4, "ide-", 4) == 0) {
                         strlcpy(drive->driver_req, s + 4, sizeof(drive->driver_req));
-                        goto done;
+                        goto obsolete_option;
                 }
                 switch (match_parm(&s[3], hd_words, vals, 3)) {
                         case -1: /* "none" */
@@ -1290,13 +1290,13 @@ static int __init ide_setup(char *s)
                                 goto done;
                         case -12: /* "remap" */
                                 drive->remap_0_to_1 = 1;
-                                goto done;
+                                goto obsolete_option;
                         case -13: /* "remap63" */
                                 drive->sect0 = 63;
-                                goto done;
+                                goto obsolete_option;
                         case -14: /* "scsi" */
                                 drive->scsi = 1;
-                                goto done;
+                                goto obsolete_option;
                         case 3: /* cyl,head,sect */
                                 drive->media    = ide_disk;
                                 drive->ready_stat = READY_STAT;
@@ -1370,32 +1370,32 @@ static int __init ide_setup(char *s)
 #ifdef CONFIG_BLK_DEV_ALI14XX
                         case -17: /* "ali14xx" */
                                 probe_ali14xx = 1;
-                                goto done;
+                                goto obsolete_option;
 #endif
 #ifdef CONFIG_BLK_DEV_UMC8672
                         case -16: /* "umc8672" */
                                 probe_umc8672 = 1;
-                                goto done;
+                                goto obsolete_option;
 #endif
 #ifdef CONFIG_BLK_DEV_DTC2278
                         case -15: /* "dtc2278" */
                                 probe_dtc2278 = 1;
-                                goto done;
+                                goto obsolete_option;
 #endif
 #ifdef CONFIG_BLK_DEV_CMD640
                         case -14: /* "cmd640_vlb" */
                                 cmd640_vlb = 1;
-                                goto done;
+                                goto obsolete_option;
 #endif
 #ifdef CONFIG_BLK_DEV_HT6560B
                         case -13: /* "ht6560b" */
                                 probe_ht6560b = 1;
-                                goto done;
+                                goto obsolete_option;
 #endif
 #ifdef CONFIG_BLK_DEV_QD65XX
                         case -12: /* "qd65xx" */
                                 probe_qd65xx = 1;
-                                goto done;
+                                goto obsolete_option;
 #endif
 #ifdef CONFIG_BLK_DEV_4DRIVES
                         case -11: /* "four" drives on one set of ports */
diff --git a/drivers/ieee1394/sbp2.c b/drivers/ieee1394/sbp2.c
index 9e2b1964d71a..f53f72daae34 100644
--- a/drivers/ieee1394/sbp2.c
+++ b/drivers/ieee1394/sbp2.c
@@ -376,6 +376,11 @@ static const struct {
                 .model_id               = SBP2_ROM_VALUE_WILDCARD,
                 .workarounds            = SBP2_WORKAROUND_128K_MAX_TRANS,
         },
+        /* Datafab MD2-FW2 with Symbios/LSILogic SYM13FW500 bridge */ {
+                .firmware_revision      = 0x002600,
+                .model_id               = SBP2_ROM_VALUE_WILDCARD,
+                .workarounds            = SBP2_WORKAROUND_128K_MAX_TRANS,
+        },
         /* iPod 4th generation */ {
                 .firmware_revision      = 0x0a2700,
                 .model_id               = 0x000021,
diff --git a/drivers/infiniband/core/addr.c b/drivers/infiniband/core/addr.c
index a58ad8a470f9..781ea5950373 100644
--- a/drivers/infiniband/core/addr.c
+++ b/drivers/infiniband/core/addr.c
@@ -154,7 +154,7 @@ static void addr_send_arp(struct sockaddr_in *dst_in)
 {
         struct rtable *rt;
         struct flowi fl;
-        u32 dst_ip = dst_in->sin_addr.s_addr;
+        __be32 dst_ip = dst_in->sin_addr.s_addr;
 
         memset(&fl, 0, sizeof fl);
         fl.nl_u.ip4_u.daddr = dst_ip;
@@ -169,8 +169,8 @@ static int addr_resolve_remote(struct sockaddr_in *src_in,
                                struct sockaddr_in *dst_in,
                                struct rdma_dev_addr *addr)
 {
-        u32 src_ip = src_in->sin_addr.s_addr;
-        u32 dst_ip = dst_in->sin_addr.s_addr;
+        __be32 src_ip = src_in->sin_addr.s_addr;
+        __be32 dst_ip = dst_in->sin_addr.s_addr;
         struct flowi fl;
         struct rtable *rt;
         struct neighbour *neigh;
@@ -257,7 +257,7 @@ static int addr_resolve_local(struct sockaddr_in *src_in,
                               struct rdma_dev_addr *addr)
 {
         struct net_device *dev;
-        u32 src_ip = src_in->sin_addr.s_addr;
+        __be32 src_ip = src_in->sin_addr.s_addr;
         __be32 dst_ip = dst_in->sin_addr.s_addr;
         int ret;
 
diff --git a/drivers/infiniband/core/cm.c b/drivers/infiniband/core/cm.c
index 4df405157086..faa7ce318a6d 100644
--- a/drivers/infiniband/core/cm.c
+++ b/drivers/infiniband/core/cm.c
@@ -393,7 +393,7 @@ static int cm_alloc_id(struct cm_id_private *cm_id_priv)
                 spin_unlock_irqrestore(&cm.lock, flags);
         } while( (ret == -EAGAIN) && idr_pre_get(&cm.local_id_table, GFP_KERNEL) );
 
-        cm_id_priv->id.local_id = (__force __be32) (id ^ cm.random_id_operand);
+        cm_id_priv->id.local_id = (__force __be32)id ^ cm.random_id_operand;
         return ret;
 }
 
diff --git a/drivers/infiniband/core/cma.c b/drivers/infiniband/core/cma.c
index 34507daaf9b6..d81c156a22b4 100644
--- a/drivers/infiniband/core/cma.c
+++ b/drivers/infiniband/core/cma.c
@@ -168,15 +168,15 @@ struct cma_work {
 union cma_ip_addr {
         struct in6_addr ip6;
         struct {
-                __u32 pad[3];
-                __u32 addr;
+                __be32 pad[3];
+                __be32 addr;
         } ip4;
 };
 
 struct cma_hdr {
         u8 cma_version;
         u8 ip_version;  /* IP version: 7:4 */
-        __u16 port;
+        __be16 port;
         union cma_ip_addr src_addr;
         union cma_ip_addr dst_addr;
 };
@@ -186,8 +186,8 @@ struct sdp_hh {
         u8 sdp_version; /* Major version: 7:4 */
         u8 ip_version;  /* IP version: 7:4 */
         u8 sdp_specific1[10];
-        __u16 port;
-        __u16 sdp_specific2;
+        __be16 port;
+        __be16 sdp_specific2;
         union cma_ip_addr src_addr;
         union cma_ip_addr dst_addr;
 };
@@ -663,7 +663,7 @@ static inline int cma_any_port(struct sockaddr *addr)
 }
 
 static int cma_get_net_info(void *hdr, enum rdma_port_space ps,
-                            u8 *ip_ver, __u16 *port,
+                            u8 *ip_ver, __be16 *port,
                             union cma_ip_addr **src, union cma_ip_addr **dst)
 {
         switch (ps) {
@@ -695,7 +695,7 @@ static int cma_get_net_info(void *hdr, enum rdma_port_space ps,
 
 static void cma_save_net_info(struct rdma_addr *addr,
                               struct rdma_addr *listen_addr,
-                              u8 ip_ver, __u16 port,
+                              u8 ip_ver, __be16 port,
                               union cma_ip_addr *src, union cma_ip_addr *dst)
 {
         struct sockaddr_in *listen4, *ip4;
@@ -996,7 +996,7 @@ static struct rdma_id_private *cma_new_conn_id(struct rdma_cm_id *listen_id,
         struct rdma_cm_id *id;
         struct rdma_route *rt;
         union cma_ip_addr *src, *dst;
-        __u16 port;
+        __be16 port;
         u8 ip_ver;
 
         if (cma_get_net_info(ib_event->private_data, listen_id->ps,
@@ -1043,7 +1043,7 @@ static struct rdma_id_private *cma_new_udp_id(struct rdma_cm_id *listen_id,
         struct rdma_id_private *id_priv;
         struct rdma_cm_id *id;
         union cma_ip_addr *src, *dst;
-        __u16 port;
+        __be16 port;
         u8 ip_ver;
         int ret;
 
@@ -1165,7 +1165,7 @@ static void cma_set_compare_data(enum rdma_port_space ps, struct sockaddr *addr,
 {
         struct cma_hdr *cma_data, *cma_mask;
         struct sdp_hh *sdp_data, *sdp_mask;
-        __u32 ip4_addr;
+        __be32 ip4_addr;
         struct in6_addr ip6_addr;
 
         memset(compare, 0, sizeof *compare);
@@ -1181,12 +1181,12 @@ static void cma_set_compare_data(enum rdma_port_space ps, struct sockaddr *addr,
                         sdp_set_ip_ver(sdp_data, 4);
                         sdp_set_ip_ver(sdp_mask, 0xF);
                         sdp_data->dst_addr.ip4.addr = ip4_addr;
-                        sdp_mask->dst_addr.ip4.addr = ~0;
+                        sdp_mask->dst_addr.ip4.addr = htonl(~0);
                 } else {
                         cma_set_ip_ver(cma_data, 4);
                         cma_set_ip_ver(cma_mask, 0xF);
                         cma_data->dst_addr.ip4.addr = ip4_addr;
-                        cma_mask->dst_addr.ip4.addr = ~0;
+                        cma_mask->dst_addr.ip4.addr = htonl(~0);
                 }
                 break;
         case AF_INET6:
diff --git a/drivers/infiniband/hw/cxgb3/iwch_cm.c b/drivers/infiniband/hw/cxgb3/iwch_cm.c
index 320f2b6ddee6..99f2f2a46bf7 100644
--- a/drivers/infiniband/hw/cxgb3/iwch_cm.c
+++ b/drivers/infiniband/hw/cxgb3/iwch_cm.c
@@ -1745,7 +1745,7 @@ int iwch_accept_cr(struct iw_cm_id *cm_id, struct iw_cm_conn_param *conn_param)
 
         /* bind QP to EP and move to RTS */
         attrs.mpa_attr = ep->mpa_attr;
-        attrs.max_ird = ep->ord;
+        attrs.max_ird = ep->ird;
         attrs.max_ord = ep->ord;
         attrs.llp_stream_handle = ep;
         attrs.next_state = IWCH_QP_STATE_RTS;
diff --git a/drivers/infiniband/hw/ipath/ipath_common.h b/drivers/infiniband/hw/ipath/ipath_common.h
index 414621095540..591901aab6b7 100644
--- a/drivers/infiniband/hw/ipath/ipath_common.h
+++ b/drivers/infiniband/hw/ipath/ipath_common.h
@@ -75,7 +75,7 @@
 #define IPATH_IB_LINKDOWN               0
 #define IPATH_IB_LINKARM                1
 #define IPATH_IB_LINKACTIVE             2
-#define IPATH_IB_LINKINIT               3
+#define IPATH_IB_LINKDOWN_ONLY          3
 #define IPATH_IB_LINKDOWN_SLEEP         4
 #define IPATH_IB_LINKDOWN_DISABLE       5
 #define IPATH_IB_LINK_LOOPBACK  6 /* enable local loopback */
diff --git a/drivers/infiniband/hw/ipath/ipath_driver.c b/drivers/infiniband/hw/ipath/ipath_driver.c
index d5ff6ca2db30..ca4d0acc6786 100644
--- a/drivers/infiniband/hw/ipath/ipath_driver.c
+++ b/drivers/infiniband/hw/ipath/ipath_driver.c
@@ -851,8 +851,7 @@ void ipath_disarm_piobufs(struct ipath_devdata *dd, unsigned first,
  * -ETIMEDOUT state can have multiple states set, for any of several
  * transitions.
  */
-static int ipath_wait_linkstate(struct ipath_devdata *dd, u32 state,
-                                int msecs)
+int ipath_wait_linkstate(struct ipath_devdata *dd, u32 state, int msecs)
 {
         dd->ipath_state_wanted = state;
         wait_event_interruptible_timeout(ipath_state_wait,
@@ -1656,8 +1655,8 @@ void ipath_cancel_sends(struct ipath_devdata *dd, int restore_sendctrl)
 static void ipath_set_ib_lstate(struct ipath_devdata *dd, int which)
 {
         static const char *what[4] = {
-                [0] = "DOWN",
-                [INFINIPATH_IBCC_LINKCMD_INIT] = "INIT",
+                [0] = "NOP",
+                [INFINIPATH_IBCC_LINKCMD_DOWN] = "DOWN",
                 [INFINIPATH_IBCC_LINKCMD_ARMED] = "ARMED",
                 [INFINIPATH_IBCC_LINKCMD_ACTIVE] = "ACTIVE"
         };
@@ -1672,9 +1671,9 @@ static void ipath_set_ib_lstate(struct ipath_devdata *dd, int which)
                             (dd, dd->ipath_kregs->kr_ibcstatus) >>
                             INFINIPATH_IBCS_LINKTRAININGSTATE_SHIFT) &
                            INFINIPATH_IBCS_LINKTRAININGSTATE_MASK]);
-        /* flush all queued sends when going to DOWN or INIT, to be sure that
+        /* flush all queued sends when going to DOWN to be sure that
          * they don't block MAD packets */
-        if (!linkcmd || linkcmd == INFINIPATH_IBCC_LINKCMD_INIT)
+        if (linkcmd == INFINIPATH_IBCC_LINKCMD_DOWN)
                 ipath_cancel_sends(dd, 1);
 
         ipath_write_kreg(dd, dd->ipath_kregs->kr_ibcctrl,
@@ -1687,6 +1686,13 @@ int ipath_set_linkstate(struct ipath_devdata *dd, u8 newstate)
         int ret;
 
         switch (newstate) {
+        case IPATH_IB_LINKDOWN_ONLY:
+                ipath_set_ib_lstate(dd, INFINIPATH_IBCC_LINKCMD_DOWN <<
+                                    INFINIPATH_IBCC_LINKCMD_SHIFT);
+                /* don't wait */
+                ret = 0;
+                goto bail;
+
         case IPATH_IB_LINKDOWN:
                 ipath_set_ib_lstate(dd, INFINIPATH_IBCC_LINKINITCMD_POLL <<
                                     INFINIPATH_IBCC_LINKINITCMD_SHIFT);
@@ -1709,16 +1715,6 @@ int ipath_set_linkstate(struct ipath_devdata *dd, u8 newstate)
                 ret = 0;
                 goto bail;
 
-        case IPATH_IB_LINKINIT:
-                if (dd->ipath_flags & IPATH_LINKINIT) {
-                        ret = 0;
-                        goto bail;
-                }
-                ipath_set_ib_lstate(dd, INFINIPATH_IBCC_LINKCMD_INIT <<
-                                    INFINIPATH_IBCC_LINKCMD_SHIFT);
-                lstate = IPATH_LINKINIT;
-                break;
-
         case IPATH_IB_LINKARM:
                 if (dd->ipath_flags & IPATH_LINKARMED) {
                         ret = 0;
diff --git a/drivers/infiniband/hw/ipath/ipath_kernel.h b/drivers/infiniband/hw/ipath/ipath_kernel.h
index 4cc0f95ea877..ecf3f7ff7717 100644
--- a/drivers/infiniband/hw/ipath/ipath_kernel.h
+++ b/drivers/infiniband/hw/ipath/ipath_kernel.h
@@ -767,6 +767,7 @@ void ipath_kreceive(struct ipath_portdata *);
 int ipath_setrcvhdrsize(struct ipath_devdata *, unsigned);
 int ipath_reset_device(int);
 void ipath_get_faststats(unsigned long);
+int ipath_wait_linkstate(struct ipath_devdata *, u32, int);
 int ipath_set_linkstate(struct ipath_devdata *, u8);
 int ipath_set_mtu(struct ipath_devdata *, u16);
 int ipath_set_lid(struct ipath_devdata *, u32, u8);
diff --git a/drivers/infiniband/hw/ipath/ipath_mad.c b/drivers/infiniband/hw/ipath/ipath_mad.c
index d98d5f103700..b34b91d3723a 100644
--- a/drivers/infiniband/hw/ipath/ipath_mad.c
+++ b/drivers/infiniband/hw/ipath/ipath_mad.c
@@ -555,10 +555,7 @@ static int recv_subn_set_portinfo(struct ib_smp *smp,
                 /* FALLTHROUGH */
         case IB_PORT_DOWN:
                 if (lstate == 0)
-                        if (get_linkdowndefaultstate(dd))
-                                lstate = IPATH_IB_LINKDOWN_SLEEP;
-                        else
-                                lstate = IPATH_IB_LINKDOWN;
+                        lstate = IPATH_IB_LINKDOWN_ONLY;
                 else if (lstate == 1)
                         lstate = IPATH_IB_LINKDOWN_SLEEP;
                 else if (lstate == 2)
@@ -568,6 +565,8 @@ static int recv_subn_set_portinfo(struct ib_smp *smp,
                 else
                         goto err;
                 ipath_set_linkstate(dd, lstate);
+                ipath_wait_linkstate(dd, IPATH_LINKINIT | IPATH_LINKARMED |
+                                IPATH_LINKACTIVE, 1000);
                 break;
         case IB_PORT_ARMED:
                 ipath_set_linkstate(dd, IPATH_IB_LINKARM);
diff --git a/drivers/infiniband/hw/ipath/ipath_qp.c b/drivers/infiniband/hw/ipath/ipath_qp.c
index 80dc623cee40..087ed3166479 100644
--- a/drivers/infiniband/hw/ipath/ipath_qp.c
+++ b/drivers/infiniband/hw/ipath/ipath_qp.c
@@ -329,8 +329,9 @@ struct ipath_qp *ipath_lookup_qpn(struct ipath_qp_table *qpt, u32 qpn)
 /**
  * ipath_reset_qp - initialize the QP state to the reset state
  * @qp: the QP to reset
+ * @type: the QP type
  */
-static void ipath_reset_qp(struct ipath_qp *qp)
+static void ipath_reset_qp(struct ipath_qp *qp, enum ib_qp_type type)
 {
         qp->remote_qpn = 0;
         qp->qkey = 0;
@@ -342,7 +343,7 @@ static void ipath_reset_qp(struct ipath_qp *qp)
         qp->s_psn = 0;
         qp->r_psn = 0;
         qp->r_msn = 0;
-        if (qp->ibqp.qp_type == IB_QPT_RC) {
+        if (type == IB_QPT_RC) {
                 qp->s_state = IB_OPCODE_RC_SEND_LAST;
                 qp->r_state = IB_OPCODE_RC_SEND_LAST;
         } else {
@@ -414,7 +415,7 @@ int ipath_error_qp(struct ipath_qp *qp, enum ib_wc_status err)
                 wc.wr_id = qp->r_wr_id;
                 wc.opcode = IB_WC_RECV;
                 wc.status = err;
-                ipath_cq_enter(to_icq(qp->ibqp.send_cq), &wc, 1);
+                ipath_cq_enter(to_icq(qp->ibqp.recv_cq), &wc, 1);
         }
         wc.status = IB_WC_WR_FLUSH_ERR;
 
@@ -534,7 +535,7 @@ int ipath_modify_qp(struct ib_qp *ibqp, struct ib_qp_attr *attr,
 
         switch (new_state) {
         case IB_QPS_RESET:
-                ipath_reset_qp(qp);
+                ipath_reset_qp(qp, ibqp->qp_type);
                 break;
 
         case IB_QPS_ERR:
@@ -647,7 +648,7 @@ int ipath_query_qp(struct ib_qp *ibqp, struct ib_qp_attr *attr,
         attr->port_num = 1;
         attr->timeout = qp->timeout;
         attr->retry_cnt = qp->s_retry_cnt;
-        attr->rnr_retry = qp->s_rnr_retry;
+        attr->rnr_retry = qp->s_rnr_retry_cnt;
         attr->alt_port_num = 0;
         attr->alt_timeout = 0;
 
@@ -839,7 +840,7 @@ struct ib_qp *ipath_create_qp(struct ib_pd *ibpd,
                         goto bail_qp;
                 }
                 qp->ip = NULL;
-                ipath_reset_qp(qp);
+                ipath_reset_qp(qp, init_attr->qp_type);
                 break;
 
         default:
diff --git a/drivers/infiniband/hw/ipath/ipath_rc.c b/drivers/infiniband/hw/ipath/ipath_rc.c
index 459e46e2c016..40f3e37d7adc 100644
--- a/drivers/infiniband/hw/ipath/ipath_rc.c
+++ b/drivers/infiniband/hw/ipath/ipath_rc.c
@@ -1196,6 +1196,10 @@ static inline void ipath_rc_rcv_resp(struct ipath_ibdev *dev,
                         list_move_tail(&qp->timerwait,
                                        &dev->pending[dev->pending_index]);
                 spin_unlock(&dev->pending_lock);
+
+                if (opcode == OP(RDMA_READ_RESPONSE_MIDDLE))
+                        qp->s_retry = qp->s_retry_cnt;
+
                 /*
                  * Update the RDMA receive state but do the copy w/o
                  * holding the locks and blocking interrupts.
diff --git a/drivers/infiniband/hw/ipath/ipath_registers.h b/drivers/infiniband/hw/ipath/ipath_registers.h
index 6d2a17f9c1da..92ad73a7fff0 100644
--- a/drivers/infiniband/hw/ipath/ipath_registers.h
+++ b/drivers/infiniband/hw/ipath/ipath_registers.h
@@ -185,7 +185,7 @@
 #define INFINIPATH_IBCC_LINKINITCMD_SLEEP 3
 #define INFINIPATH_IBCC_LINKINITCMD_SHIFT 16
 #define INFINIPATH_IBCC_LINKCMD_MASK 0x3ULL
-#define INFINIPATH_IBCC_LINKCMD_INIT 1  /* move to 0x11 */
+#define INFINIPATH_IBCC_LINKCMD_DOWN 1  /* move to 0x11 */
 #define INFINIPATH_IBCC_LINKCMD_ARMED 2 /* move to 0x21 */
 #define INFINIPATH_IBCC_LINKCMD_ACTIVE 3        /* move to 0x31 */
 #define INFINIPATH_IBCC_LINKCMD_SHIFT 18
diff --git a/drivers/infiniband/hw/nes/nes_cm.c b/drivers/infiniband/hw/nes/nes_cm.c
index 39adb267fb15..0bef878e0f65 100644
--- a/drivers/infiniband/hw/nes/nes_cm.c
+++ b/drivers/infiniband/hw/nes/nes_cm.c
@@ -40,6 +40,7 @@
 #include <linux/tcp.h>
 #include <linux/init.h>
 #include <linux/if_arp.h>
+#include <linux/if_vlan.h>
 #include <linux/notifier.h>
 #include <linux/net.h>
 #include <linux/types.h>
@@ -1072,7 +1073,7 @@ static struct nes_cm_node *make_cm_node(struct nes_cm_core *cm_core,
         ts = current_kernel_time();
         cm_node->tcp_cntxt.loc_seq_num = htonl(ts.tv_nsec);
         cm_node->tcp_cntxt.mss = nesvnic->max_frame_size - sizeof(struct iphdr) -
-                        sizeof(struct tcphdr) - ETH_HLEN;
+                        sizeof(struct tcphdr) - ETH_HLEN - VLAN_HLEN;
         cm_node->tcp_cntxt.rcv_nxt = 0;
         /* get a unique session ID , add thread_id to an upcounter to handle race */
         atomic_inc(&cm_core->node_cnt);
diff --git a/drivers/infiniband/ulp/ipoib/ipoib_cm.c b/drivers/infiniband/ulp/ipoib/ipoib_cm.c
index 52b1bebfa744..2490b2d79dbb 100644
--- a/drivers/infiniband/ulp/ipoib/ipoib_cm.c
+++ b/drivers/infiniband/ulp/ipoib/ipoib_cm.c
@@ -38,6 +38,7 @@
 #include <net/icmp.h>
 #include <linux/icmpv6.h>
 #include <linux/delay.h>
+#include <linux/vmalloc.h>
 
 #include "ipoib.h"
 
@@ -637,6 +638,7 @@ static inline int post_send(struct ipoib_dev_priv *priv,
         priv->tx_sge[0].addr          = addr;
         priv->tx_sge[0].length        = len;
 
+        priv->tx_wr.num_sge     = 1;
         priv->tx_wr.wr_id       = wr_id | IPOIB_OP_CM;
 
         return ib_post_send(tx->qp, &priv->tx_wr, &bad_wr);
@@ -1030,13 +1032,13 @@ static int ipoib_cm_tx_init(struct ipoib_cm_tx *p, u32 qpn,
         struct ipoib_dev_priv *priv = netdev_priv(p->dev);
         int ret;
 
-        p->tx_ring = kzalloc(ipoib_sendq_size * sizeof *p->tx_ring,
-                                GFP_KERNEL);
+        p->tx_ring = vmalloc(ipoib_sendq_size * sizeof *p->tx_ring);
         if (!p->tx_ring) {
                 ipoib_warn(priv, "failed to allocate tx ring\n");
                 ret = -ENOMEM;
                 goto err_tx;
         }
+        memset(p->tx_ring, 0, ipoib_sendq_size * sizeof *p->tx_ring);
 
         p->qp = ipoib_cm_create_tx_qp(p->dev, p);
         if (IS_ERR(p->qp)) {
@@ -1077,6 +1079,7 @@ err_id:
         ib_destroy_qp(p->qp);
 err_qp:
         p->qp = NULL;
+        vfree(p->tx_ring);
 err_tx:
         return ret;
 }
@@ -1127,7 +1130,7 @@ timeout:
         if (p->qp)
                 ib_destroy_qp(p->qp);
 
-        kfree(p->tx_ring);
+        vfree(p->tx_ring);
         kfree(p);
 }
 
diff --git a/drivers/infiniband/ulp/ipoib/ipoib_main.c b/drivers/infiniband/ulp/ipoib/ipoib_main.c
index f96477a8ca5a..57282048865c 100644
--- a/drivers/infiniband/ulp/ipoib/ipoib_main.c
+++ b/drivers/infiniband/ulp/ipoib/ipoib_main.c
@@ -41,6 +41,7 @@
 #include <linux/init.h>
 #include <linux/slab.h>
 #include <linux/kernel.h>
+#include <linux/vmalloc.h>
 
 #include <linux/if_arp.h>       /* For ARPHRD_xxx */
 
@@ -887,13 +888,13 @@ int ipoib_dev_init(struct net_device *dev, struct ib_device *ca, int port)
                 goto out;
         }
 
-        priv->tx_ring = kzalloc(ipoib_sendq_size * sizeof *priv->tx_ring,
-                                GFP_KERNEL);
+        priv->tx_ring = vmalloc(ipoib_sendq_size * sizeof *priv->tx_ring);
         if (!priv->tx_ring) {
                 printk(KERN_WARNING "%s: failed to allocate TX ring (%d entries)\n",
                        ca->name, ipoib_sendq_size);
                 goto out_rx_ring_cleanup;
         }
+        memset(priv->tx_ring, 0, ipoib_sendq_size * sizeof *priv->tx_ring);
 
         /* priv->tx_head, tx_tail & tx_outstanding are already 0 */
 
@@ -903,7 +904,7 @@ int ipoib_dev_init(struct net_device *dev, struct ib_device *ca, int port)
         return 0;
 
 out_tx_ring_cleanup:
-        kfree(priv->tx_ring);
+        vfree(priv->tx_ring);
 
 out_rx_ring_cleanup:
         kfree(priv->rx_ring);
@@ -928,7 +929,7 @@ void ipoib_dev_cleanup(struct net_device *dev)
         ipoib_ib_dev_cleanup(dev);
 
         kfree(priv->rx_ring);
-        kfree(priv->tx_ring);
+        vfree(priv->tx_ring);
 
         priv->rx_ring = NULL;
         priv->tx_ring = NULL;
diff --git a/drivers/infiniband/ulp/ipoib/ipoib_multicast.c b/drivers/infiniband/ulp/ipoib/ipoib_multicast.c
index 2628339e3a99..31a53c5bcb13 100644
--- a/drivers/infiniband/ulp/ipoib/ipoib_multicast.c
+++ b/drivers/infiniband/ulp/ipoib/ipoib_multicast.c
@@ -650,7 +650,7 @@ void ipoib_mcast_send(struct net_device *dev, void *mgid, struct sk_buff *skb)
          */
         spin_lock(&priv->lock);
 
-        if (!test_bit(IPOIB_MCAST_STARTED, &priv->flags)        ||
+        if (!test_bit(IPOIB_FLAG_OPER_UP, &priv->flags)         ||
             !priv->broadcast                                    ||
             !test_bit(IPOIB_MCAST_FLAG_ATTACHED, &priv->broadcast->flags)) {
                 ++dev->stats.tx_dropped;
diff --git a/drivers/input/evdev.c b/drivers/input/evdev.c
index 0727b0a12557..99562cee827e 100644
--- a/drivers/input/evdev.c
+++ b/drivers/input/evdev.c
@@ -853,6 +853,9 @@ static void evdev_cleanup(struct evdev *evdev)
         evdev_hangup(evdev);
         evdev_remove_chrdev(evdev);
 
+        if (evdev->grab)
+                evdev_ungrab(evdev, evdev->grab);
+
         /* evdev is marked dead so no one else accesses evdev->open */
         if (evdev->open) {
                 input_flush_device(handle, NULL);
diff --git a/drivers/input/misc/ixp4xx-beeper.c b/drivers/input/misc/ixp4xx-beeper.c
index d2ade7443b7d..798d84c44d03 100644
--- a/drivers/input/misc/ixp4xx-beeper.c
+++ b/drivers/input/misc/ixp4xx-beeper.c
@@ -25,6 +25,7 @@
 MODULE_AUTHOR("Alessandro Zummo <a.zummo@towertech.it>");
 MODULE_DESCRIPTION("ixp4xx beeper driver");
 MODULE_LICENSE("GPL");
+MODULE_ALIAS("platform:ixp4xx-beeper");
 
 static DEFINE_SPINLOCK(beep_lock);
 
diff --git a/drivers/isdn/i4l/isdn_common.c b/drivers/isdn/i4l/isdn_common.c
index 9cef6fcf587b..d4ad6992f776 100644
--- a/drivers/isdn/i4l/isdn_common.c
+++ b/drivers/isdn/i4l/isdn_common.c
@@ -981,13 +981,13 @@ isdn_readbchan_tty(int di, int channel, struct tty_struct *tty, int cisco_hack)
 }
 
 
-static __inline int
+static inline int
 isdn_minor2drv(int minor)
 {
         return (dev->drvmap[minor]);
 }
 
-static __inline int
+static inline int
 isdn_minor2chan(int minor)
 {
         return (dev->chanmap[minor]);
diff --git a/drivers/isdn/i4l/isdn_v110.c b/drivers/isdn/i4l/isdn_v110.c
index 5484d3c38a57..c5d02b6aafab 100644
--- a/drivers/isdn/i4l/isdn_v110.c
+++ b/drivers/isdn/i4l/isdn_v110.c
@@ -62,7 +62,7 @@ static unsigned char V110_OffMatrix_38400[] =
  * and to 67452301 when keylen = 2. This is necessary because ordering on
  * the isdn line is the other way.
  */
-static __inline unsigned char
+static inline unsigned char
 FlipBits(unsigned char c, int keylen)
 {
         unsigned char b = c;
diff --git a/drivers/lguest/Makefile b/drivers/lguest/Makefile
index 5e8272d296d8..7d463c26124f 100644
--- a/drivers/lguest/Makefile
+++ b/drivers/lguest/Makefile
@@ -19,3 +19,11 @@ Beer:
         @for f in Preparation Guest Drivers Launcher Host Switcher Mastery; do echo "{==- $$f -==}"; make -s $$f; done; echo "{==-==}"
 Preparation Preparation! Guest Drivers Launcher Host Switcher Mastery:
         @sh ../../Documentation/lguest/extract $(PREFIX) `find ../../* -name '*.[chS]' -wholename '*lguest*'`
+Puppy:
+        @clear
+        @printf "      __  \n (___()'\`;\n /,    /\`\n \\\\\\\"--\\\\\\   \n"
+        @sleep 2; clear; printf "\n\n   Sit!\n\n"; sleep 1; clear
+        @printf "    __    \n   ()'\`;  \n   /\\|\` \n  /  |  \n(/_)_|_   \n"
+        @sleep 2; clear; printf "\n\n  Stand!\n\n"; sleep 1; clear
+        @printf "    __    \n   ()'\`;  \n   /\\|\` \n  /._.= \n /| /     \n(_\_)_    \n"
+        @sleep 2; clear; printf "\n\n  Good puppy!\n\n"; sleep 1; clear
diff --git a/drivers/lguest/core.c b/drivers/lguest/core.c
index c632c08cbbdc..5eea4356d703 100644
--- a/drivers/lguest/core.c
+++ b/drivers/lguest/core.c
@@ -1,8 +1,6 @@
 /*P:400 This contains run_guest() which actually calls into the Host<->Guest
  * Switcher and analyzes the return, such as determining if the Guest wants the
- * Host to do something.  This file also contains useful helper routines, and a
- * couple of non-obvious setup and teardown pieces which were implemented after
- * days of debugging pain. :*/
+ * Host to do something.  This file also contains useful helper routines. :*/
 #include <linux/module.h>
 #include <linux/stringify.h>
 #include <linux/stddef.h>
@@ -49,8 +47,8 @@ static __init int map_switcher(void)
          * easy.
          */
 
-        /* We allocate an array of "struct page"s.  map_vm_area() wants the
-         * pages in this form, rather than just an array of pointers. */
+        /* We allocate an array of struct page pointers.  map_vm_area() wants
+         * this, rather than just an array of pages. */
         switcher_page = kmalloc(sizeof(switcher_page[0])*TOTAL_SWITCHER_PAGES,
                                 GFP_KERNEL);
         if (!switcher_page) {
@@ -172,7 +170,7 @@ void __lgread(struct lg_cpu *cpu, void *b, unsigned long addr, unsigned bytes)
         }
 }
 
-/* This is the write (copy into guest) version. */
+/* This is the write (copy into Guest) version. */
 void __lgwrite(struct lg_cpu *cpu, unsigned long addr, const void *b,
                unsigned bytes)
 {
@@ -209,9 +207,9 @@ int run_guest(struct lg_cpu *cpu, unsigned long __user *user)
                 if (cpu->break_out)
                         return -EAGAIN;
 
-                /* Check if there are any interrupts which can be delivered
-                 * now: if so, this sets up the hander to be executed when we
-                 * next run the Guest. */
+                /* Check if there are any interrupts which can be delivered now:
+                 * if so, this sets up the hander to be executed when we next
+                 * run the Guest. */
                 maybe_do_interrupt(cpu);
 
                 /* All long-lived kernel loops need to check with this horrible
@@ -246,8 +244,10 @@ int run_guest(struct lg_cpu *cpu, unsigned long __user *user)
                 lguest_arch_handle_trap(cpu);
         }
 
+        /* Special case: Guest is 'dead' but wants a reboot. */
         if (cpu->lg->dead == ERR_PTR(-ERESTART))
                 return -ERESTART;
+
         /* The Guest is dead => "No such file or directory" */
         return -ENOENT;
 }
diff --git a/drivers/lguest/hypercalls.c b/drivers/lguest/hypercalls.c
index 0f2cb4fd7c69..54d66f05fefa 100644
--- a/drivers/lguest/hypercalls.c
+++ b/drivers/lguest/hypercalls.c
@@ -29,7 +29,7 @@
 #include "lg.h"
 
 /*H:120 This is the core hypercall routine: where the Guest gets what it wants.
- * Or gets killed.  Or, in the case of LHCALL_CRASH, both. */
+ * Or gets killed.  Or, in the case of LHCALL_SHUTDOWN, both. */
 static void do_hcall(struct lg_cpu *cpu, struct hcall_args *args)
 {
         switch (args->arg0) {
@@ -190,6 +190,13 @@ static void initialize(struct lg_cpu *cpu)
          * pagetable. */
         guest_pagetable_clear_all(cpu);
 }
+/*:*/
+
+/*M:013 If a Guest reads from a page (so creates a mapping) that it has never
+ * written to, and then the Launcher writes to it (ie. the output of a virtual
+ * device), the Guest will still see the old page.  In practice, this never
+ * happens: why would the Guest read a page which it has never written to?  But
+ * a similar scenario might one day bite us, so it's worth mentioning. :*/
 
 /*H:100
  * Hypercalls
@@ -227,7 +234,7 @@ void do_hypercalls(struct lg_cpu *cpu)
                  * However, if we are signalled or the Guest sends I/O to the
                  * Launcher, the run_guest() loop will exit without running the
                  * Guest.  When it comes back it would try to re-run the
-                 * hypercall. */
+                 * hypercall.  Finding that bug sucked. */
                 cpu->hcall = NULL;
         }
 }
diff --git a/drivers/lguest/interrupts_and_traps.c b/drivers/lguest/interrupts_and_traps.c
index 32e97c1858e5..0414ddf87587 100644
--- a/drivers/lguest/interrupts_and_traps.c
+++ b/drivers/lguest/interrupts_and_traps.c
@@ -144,7 +144,6 @@ void maybe_do_interrupt(struct lg_cpu *cpu)
         if (copy_from_user(&blk, cpu->lg->lguest_data->blocked_interrupts,
                            sizeof(blk)))
                 return;
-
         bitmap_andnot(blk, cpu->irqs_pending, blk, LGUEST_IRQS);
 
         /* Find the first interrupt. */
@@ -237,9 +236,9 @@ void free_interrupts(void)
                 clear_bit(syscall_vector, used_vectors);
 }
 
-/*H:220 Now we've got the routines to deliver interrupts, delivering traps
- * like page fault is easy.  The only trick is that Intel decided that some
- * traps should have error codes: */
+/*H:220 Now we've got the routines to deliver interrupts, delivering traps like
+ * page fault is easy.  The only trick is that Intel decided that some traps
+ * should have error codes: */
 static int has_err(unsigned int trap)
 {
         return (trap == 8 || (trap >= 10 && trap <= 14) || trap == 17);
diff --git a/drivers/lguest/lguest_device.c b/drivers/lguest/lguest_device.c
index 1b2ec0bf5eb1..2bc9bf7e88e5 100644
--- a/drivers/lguest/lguest_device.c
+++ b/drivers/lguest/lguest_device.c
@@ -1,10 +1,10 @@
 /*P:050 Lguest guests use a very simple method to describe devices.  It's a
- * series of device descriptors contained just above the top of normal
+ * series of device descriptors contained just above the top of normal Guest
  * memory.
  *
  * We use the standard "virtio" device infrastructure, which provides us with a
  * console, a network and a block driver.  Each one expects some configuration
- * information and a "virtqueue" mechanism to send and receive data. :*/
+ * information and a "virtqueue" or two to send and receive data. :*/
 #include <linux/init.h>
 #include <linux/bootmem.h>
 #include <linux/lguest_launcher.h>
@@ -53,7 +53,7 @@ struct lguest_device {
  * Device configurations
  *
  * The configuration information for a device consists of one or more
- * virtqueues, a feature bitmaks, and some configuration bytes.  The
+ * virtqueues, a feature bitmap, and some configuration bytes.  The
  * configuration bytes don't really matter to us: the Launcher sets them up, and
  * the driver will look at them during setup.
  *
@@ -179,7 +179,7 @@ struct lguest_vq_info
 };
 
 /* When the virtio_ring code wants to prod the Host, it calls us here and we
- * make a hypercall.  We hand the page number of the virtqueue so the Host
+ * make a hypercall.  We hand the physical address of the virtqueue so the Host
  * knows which virtqueue we're talking about. */
 static void lg_notify(struct virtqueue *vq)
 {
@@ -199,7 +199,8 @@ static void lg_notify(struct virtqueue *vq)
  * allocate its own pages and tell the Host where they are, but for lguest it's
  * simpler for the Host to simply tell us where the pages are.
  *
- * So we provide devices with a "find virtqueue and set it up" function. */
+ * So we provide drivers with a "find the Nth virtqueue and set it up"
+ * function. */
 static struct virtqueue *lg_find_vq(struct virtio_device *vdev,
                                     unsigned index,
                                     void (*callback)(struct virtqueue *vq))
diff --git a/drivers/lguest/lguest_user.c b/drivers/lguest/lguest_user.c
index 2221485b0773..645e6e040bfb 100644
--- a/drivers/lguest/lguest_user.c
+++ b/drivers/lguest/lguest_user.c
@@ -73,7 +73,7 @@ static ssize_t read(struct file *file, char __user *user, size_t size,loff_t*o)
         if (current != cpu->tsk)
                 return -EPERM;
 
-        /* If the guest is already dead, we indicate why */
+        /* If the Guest is already dead, we indicate why */
         if (lg->dead) {
                 size_t len;
 
@@ -88,7 +88,7 @@ static ssize_t read(struct file *file, char __user *user, size_t size,loff_t*o)
                 return len;
         }
 
-        /* If we returned from read() last time because the Guest notified,
+        /* If we returned from read() last time because the Guest sent I/O,
          * clear the flag. */
         if (cpu->pending_notify)
                 cpu->pending_notify = 0;
@@ -97,14 +97,20 @@ static ssize_t read(struct file *file, char __user *user, size_t size,loff_t*o)
         return run_guest(cpu, (unsigned long __user *)user);
 }
 
+/*L:025 This actually initializes a CPU.  For the moment, a Guest is only
+ * uniprocessor, so "id" is always 0. */
 static int lg_cpu_start(struct lg_cpu *cpu, unsigned id, unsigned long start_ip)
 {
+        /* We have a limited number the number of CPUs in the lguest struct. */
         if (id >= NR_CPUS)
                 return -EINVAL;
 
+        /* Set up this CPU's id, and pointer back to the lguest struct. */
         cpu->id = id;
         cpu->lg = container_of((cpu - id), struct lguest, cpus[0]);
         cpu->lg->nr_cpus++;
+
+        /* Each CPU has a timer it can set. */
         init_clockdev(cpu);
 
         /* We need a complete page for the Guest registers: they are accessible
@@ -120,11 +126,11 @@ static int lg_cpu_start(struct lg_cpu *cpu, unsigned id, unsigned long start_ip)
          * address. */
         lguest_arch_setup_regs(cpu, start_ip);
 
-        /* Initialize the queue for the waker to wait on */
+        /* Initialize the queue for the Waker to wait on */
         init_waitqueue_head(&cpu->break_wq);
 
         /* We keep a pointer to the Launcher task (ie. current task) for when
-         * other Guests want to wake this one (inter-Guest I/O). */
+         * other Guests want to wake this one (eg. console input). */
         cpu->tsk = current;
 
         /* We need to keep a pointer to the Launcher's memory map, because if
@@ -136,6 +142,7 @@ static int lg_cpu_start(struct lg_cpu *cpu, unsigned id, unsigned long start_ip)
          * when the same Guest runs on the same CPU twice. */
         cpu->last_pages = NULL;
 
+        /* No error == success. */
         return 0;
 }
 
@@ -182,17 +189,16 @@ static int initialize(struct file *file, const unsigned long __user *input)
         }
 
         /* Populate the easy fields of our "struct lguest" */
-        lg->mem_base = (void __user *)(long)args[0];
+        lg->mem_base = (void __user *)args[0];
         lg->pfn_limit = args[1];
 
-        /* This is the first cpu */
+        /* This is the first cpu (cpu 0) and it will start booting at args[3] */
         err = lg_cpu_start(&lg->cpus[0], 0, args[3]);
         if (err)
                 goto release_guest;
 
         /* Initialize the Guest's shadow page tables, using the toplevel
-         * address the Launcher gave us.  This allocates memory, so can
-         * fail. */
+         * address the Launcher gave us.  This allocates memory, so can fail. */
         err = init_guest_pagetable(lg, args[2]);
         if (err)
                 goto free_regs;
@@ -218,11 +224,16 @@ unlock:
 /*L:010 The first operation the Launcher does must be a write.  All writes
  * start with an unsigned long number: for the first write this must be
  * LHREQ_INITIALIZE to set up the Guest.  After that the Launcher can use
- * writes of other values to send interrupts. */
+ * writes of other values to send interrupts.
+ *
+ * Note that we overload the "offset" in the /dev/lguest file to indicate what
+ * CPU number we're dealing with.  Currently this is always 0, since we only
+ * support uniprocessor Guests, but you can see the beginnings of SMP support
+ * here. */
 static ssize_t write(struct file *file, const char __user *in,
                      size_t size, loff_t *off)
 {
-        /* Once the guest is initialized, we hold the "struct lguest" in the
+        /* Once the Guest is initialized, we hold the "struct lguest" in the
          * file private data. */
         struct lguest *lg = file->private_data;
         const unsigned long __user *input = (const unsigned long __user *)in;
@@ -230,6 +241,7 @@ static ssize_t write(struct file *file, const char __user *in,
         struct lg_cpu *uninitialized_var(cpu);
         unsigned int cpu_id = *off;
 
+        /* The first value tells us what this request is. */
         if (get_user(req, input) != 0)
                 return -EFAULT;
         input++;
diff --git a/drivers/lguest/page_tables.c b/drivers/lguest/page_tables.c
index a7f64a9d67e0..d93500f24fbb 100644
--- a/drivers/lguest/page_tables.c
+++ b/drivers/lguest/page_tables.c
@@ -2,8 +2,8 @@
  * previous encounters.  It's functional, and as neat as it can be in the
  * circumstances, but be wary, for these things are subtle and break easily.
  * The Guest provides a virtual to physical mapping, but we can neither trust
- * it nor use it: we verify and convert it here to point the hardware to the
- * actual Guest pages when running the Guest. :*/
+ * it nor use it: we verify and convert it here then point the CPU to the
+ * converted Guest pages when running the Guest. :*/
 
 /* Copyright (C) Rusty Russell IBM Corporation 2006.
  * GPL v2 and any later version */
@@ -106,6 +106,11 @@ static unsigned long gpte_addr(pgd_t gpgd, unsigned long vaddr)
         BUG_ON(!(pgd_flags(gpgd) & _PAGE_PRESENT));
         return gpage + ((vaddr>>PAGE_SHIFT) % PTRS_PER_PTE) * sizeof(pte_t);
 }
+/*:*/
+
+/*M:014 get_pfn is slow; it takes the mmap sem and calls get_user_pages.  We
+ * could probably try to grab batches of pages here as an optimization
+ * (ie. pre-faulting). :*/
 
 /*H:350 This routine takes a page number given by the Guest and converts it to
  * an actual, physical page number.  It can fail for several reasons: the
@@ -113,8 +118,8 @@ static unsigned long gpte_addr(pgd_t gpgd, unsigned long vaddr)
  * and the page is read-only, or the write flag was set and the page was
  * shared so had to be copied, but we ran out of memory.
  *
- * This holds a reference to the page, so release_pte() is careful to
- * put that back. */
+ * This holds a reference to the page, so release_pte() is careful to put that
+ * back. */
 static unsigned long get_pfn(unsigned long virtpfn, int write)
 {
         struct page *page;
@@ -532,13 +537,13 @@ static void do_set_pte(struct lg_cpu *cpu, int idx,
  * all processes.  So when the page table above that address changes, we update
  * all the page tables, not just the current one.  This is rare.
  *
- * The benefit is that when we have to track a new page table, we can copy keep
- * all the kernel mappings.  This speeds up context switch immensely. */
+ * The benefit is that when we have to track a new page table, we can keep all
+ * the kernel mappings.  This speeds up context switch immensely. */
 void guest_set_pte(struct lg_cpu *cpu,
                    unsigned long gpgdir, unsigned long vaddr, pte_t gpte)
 {
-        /* Kernel mappings must be changed on all top levels.  Slow, but
-         * doesn't happen often. */
+        /* Kernel mappings must be changed on all top levels.  Slow, but doesn't
+         * happen often. */
         if (vaddr >= cpu->lg->kernel_address) {
                 unsigned int i;
                 for (i = 0; i < ARRAY_SIZE(cpu->lg->pgdirs); i++)
@@ -704,12 +709,11 @@ static __init void populate_switcher_pte_page(unsigned int cpu,
 /* We've made it through the page table code.  Perhaps our tired brains are
  * still processing the details, or perhaps we're simply glad it's over.
  *
- * If nothing else, note that all this complexity in juggling shadow page
- * tables in sync with the Guest's page tables is for one reason: for most
- * Guests this page table dance determines how bad performance will be.  This
- * is why Xen uses exotic direct Guest pagetable manipulation, and why both
- * Intel and AMD have implemented shadow page table support directly into
- * hardware.
+ * If nothing else, note that all this complexity in juggling shadow page tables
+ * in sync with the Guest's page tables is for one reason: for most Guests this
+ * page table dance determines how bad performance will be.  This is why Xen
+ * uses exotic direct Guest pagetable manipulation, and why both Intel and AMD
+ * have implemented shadow page table support directly into hardware.
  *
  * There is just one file remaining in the Host. */
 
diff --git a/drivers/lguest/x86/core.c b/drivers/lguest/x86/core.c
index 635187812d52..5126d5d9ea0e 100644
--- a/drivers/lguest/x86/core.c
+++ b/drivers/lguest/x86/core.c
@@ -17,6 +17,13 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
+/*P:450 This file contains the x86-specific lguest code.  It used to be all
+ * mixed in with drivers/lguest/core.c but several foolhardy code slashers
+ * wrestled most of the dependencies out to here in preparation for porting
+ * lguest to other architectures (see what I mean by foolhardy?).
+ *
+ * This also contains a couple of non-obvious setup and teardown pieces which
+ * were implemented after days of debugging pain. :*/
 #include <linux/kernel.h>
 #include <linux/start_kernel.h>
 #include <linux/string.h>
@@ -157,6 +164,8 @@ static void run_guest_once(struct lg_cpu *cpu, struct lguest_pages *pages)
  * also simplify copy_in_guest_info().  Note that we'd still need to restore
  * things when we exit to Launcher userspace, but that's fairly easy.
  *
+ * We could also try using this hooks for PGE, but that might be too expensive.
+ *
  * The hooks were designed for KVM, but we can also put them to good use. :*/
 
 /*H:040 This is the i386-specific code to setup and run the Guest.  Interrupts
@@ -182,7 +191,7 @@ void lguest_arch_run_guest(struct lg_cpu *cpu)
          * was doing. */
         run_guest_once(cpu, lguest_pages(raw_smp_processor_id()));
 
-        /* Note that the "regs" pointer contains two extra entries which are
+        /* Note that the "regs" structure contains two extra entries which are
          * not really registers: a trap number which says what interrupt or
          * trap made the switcher code come back, and an error code which some
          * traps set.  */
@@ -293,11 +302,10 @@ void lguest_arch_handle_trap(struct lg_cpu *cpu)
                 break;
         case 14: /* We've intercepted a Page Fault. */
                 /* The Guest accessed a virtual address that wasn't mapped.
-                 * This happens a lot: we don't actually set up most of the
-                 * page tables for the Guest at all when we start: as it runs
-                 * it asks for more and more, and we set them up as
-                 * required. In this case, we don't even tell the Guest that
-                 * the fault happened.
+                 * This happens a lot: we don't actually set up most of the page
+                 * tables for the Guest at all when we start: as it runs it asks
+                 * for more and more, and we set them up as required. In this
+                 * case, we don't even tell the Guest that the fault happened.
                  *
                  * The errcode tells whether this was a read or a write, and
                  * whether kernel or userspace code. */
@@ -342,7 +350,7 @@ void lguest_arch_handle_trap(struct lg_cpu *cpu)
         if (!deliver_trap(cpu, cpu->regs->trapnum))
                 /* If the Guest doesn't have a handler (either it hasn't
                  * registered any yet, or it's one of the faults we don't let
-                 * it handle), it dies with a cryptic error message. */
+                 * it handle), it dies with this cryptic error message. */
                 kill_guest(cpu, "unhandled trap %li at %#lx (%#lx)",
                            cpu->regs->trapnum, cpu->regs->eip,
                            cpu->regs->trapnum == 14 ? cpu->arch.last_pagefault
@@ -375,8 +383,8 @@ void __init lguest_arch_host_init(void)
          * The only exception is the interrupt handlers in switcher.S: their
          * addresses are placed in a table (default_idt_entries), so we need to
          * update the table with the new addresses.  switcher_offset() is a
-         * convenience function which returns the distance between the builtin
-         * switcher code and the high-mapped copy we just made. */
+         * convenience function which returns the distance between the
+         * compiled-in switcher code and the high-mapped copy we just made. */
         for (i = 0; i < IDT_ENTRIES; i++)
                 default_idt_entries[i] += switcher_offset();
 
@@ -416,7 +424,7 @@ void __init lguest_arch_host_init(void)
                 state->guest_gdt_desc.address = (long)&state->guest_gdt;
 
                 /* We know where we want the stack to be when the Guest enters
-                 * the switcher: in pages->regs.  The stack grows upwards, so
+                 * the Switcher: in pages->regs.  The stack grows upwards, so
                  * we start it at the end of that structure. */
                 state->guest_tss.sp0 = (long)(&pages->regs + 1);
                 /* And this is the GDT entry to use for the stack: we keep a
@@ -513,8 +521,8 @@ int lguest_arch_init_hypercalls(struct lg_cpu *cpu)
 {
         u32 tsc_speed;
 
-        /* The pointer to the Guest's "struct lguest_data" is the only
-         * argument.  We check that address now. */
+        /* The pointer to the Guest's "struct lguest_data" is the only argument.
+         * We check that address now. */
         if (!lguest_address_ok(cpu->lg, cpu->hcall->arg1,
                                sizeof(*cpu->lg->lguest_data)))
                 return -EFAULT;
@@ -546,6 +554,7 @@ int lguest_arch_init_hypercalls(struct lg_cpu *cpu)
 
         return 0;
 }
+/*:*/
 
 /*L:030 lguest_arch_setup_regs()
  *
diff --git a/drivers/lguest/x86/switcher_32.S b/drivers/lguest/x86/switcher_32.S
index 0af8baaa0d4a..3fc15318a80f 100644
--- a/drivers/lguest/x86/switcher_32.S
+++ b/drivers/lguest/x86/switcher_32.S
@@ -1,6 +1,6 @@
-/*P:900 This is the Switcher: code which sits at 0xFFC00000 to do the low-level
- * Guest<->Host switch.  It is as simple as it can be made, but it's naturally
- * very specific to x86.
+/*P:900 This is the Switcher: code which sits at 0xFFC00000 astride both the
+ * Host and Guest to do the low-level Guest<->Host switch.  It is as simple as
+ * it can be made, but it's naturally very specific to x86.
  *
  * You have now completed Preparation.  If this has whet your appetite; if you
  * are feeling invigorated and refreshed then the next, more challenging stage
@@ -189,7 +189,7 @@ ENTRY(switch_to_guest)
         // Interrupts are turned back on: we are Guest.
         iret
 
-// We treat two paths to switch back to the Host
+// We tread two paths to switch back to the Host
 // Yet both must save Guest state and restore Host
 // So we put the routine in a macro.
 #define SWITCH_TO_HOST                                                  \
diff --git a/drivers/macintosh/via-pmu-backlight.c b/drivers/macintosh/via-pmu-backlight.c
index 741a2e3f4fc6..a348bb0791d3 100644
--- a/drivers/macintosh/via-pmu-backlight.c
+++ b/drivers/macintosh/via-pmu-backlight.c
@@ -17,7 +17,7 @@
 
 static struct backlight_ops pmu_backlight_data;
 static DEFINE_SPINLOCK(pmu_backlight_lock);
-static int sleeping;
+static int sleeping, uses_pmu_bl;
 static u8 bl_curve[FB_BACKLIGHT_LEVELS];
 
 static void pmu_backlight_init_curve(u8 off, u8 min, u8 max)
@@ -128,7 +128,7 @@ void pmu_backlight_set_sleep(int sleep)
 
         spin_lock_irqsave(&pmu_backlight_lock, flags);
         sleeping = sleep;
-        if (pmac_backlight) {
+        if (pmac_backlight && uses_pmu_bl) {
                 if (sleep) {
                         struct adb_request req;
 
@@ -166,6 +166,7 @@ void __init pmu_backlight_init()
                 printk(KERN_ERR "PMU Backlight registration failed\n");
                 return;
         }
+        uses_pmu_bl = 1;
         bd->props.max_brightness = FB_BACKLIGHT_LEVELS - 1;
         pmu_backlight_init_curve(0x7F, 0x46, 0x0E);
 
diff --git a/drivers/macintosh/via-pmu.c b/drivers/macintosh/via-pmu.c
index ebec663d5d37..d6365a9f0637 100644
--- a/drivers/macintosh/via-pmu.c
+++ b/drivers/macintosh/via-pmu.c
@@ -2528,7 +2528,7 @@ EXPORT_SYMBOL(pmu_wait_complete);
 EXPORT_SYMBOL(pmu_suspend);
 EXPORT_SYMBOL(pmu_resume);
 EXPORT_SYMBOL(pmu_unlock);
-#if defined(CONFIG_SUSPEND) && defined(CONFIG_PPC32)
+#if defined(CONFIG_PPC32)
 EXPORT_SYMBOL(pmu_enable_irled);
 EXPORT_SYMBOL(pmu_battery_count);
 EXPORT_SYMBOL(pmu_batteries);
diff --git a/drivers/md/dm-crypt.c b/drivers/md/dm-crypt.c
index b04f98df94ea..835def11419d 100644
--- a/drivers/md/dm-crypt.c
+++ b/drivers/md/dm-crypt.c
@@ -1,7 +1,7 @@
 /*
  * Copyright (C) 2003 Christophe Saout <christophe@saout.de>
  * Copyright (C) 2004 Clemens Fruhwirth <clemens@endorphin.org>
- * Copyright (C) 2006-2007 Red Hat, Inc. All rights reserved.
+ * Copyright (C) 2006-2008 Red Hat, Inc. All rights reserved.
  *
  * This file is released under the GPL.
  */
@@ -93,6 +93,8 @@ struct crypt_config {
 
         struct workqueue_struct *io_queue;
         struct workqueue_struct *crypt_queue;
+        wait_queue_head_t writeq;
+
         /*
          * crypto related data
          */
@@ -331,14 +333,7 @@ static void crypt_convert_init(struct crypt_config *cc,
         ctx->idx_out = bio_out ? bio_out->bi_idx : 0;
         ctx->sector = sector + cc->iv_offset;
         init_completion(&ctx->restart);
-        /*
-         * Crypto operation can be asynchronous,
-         * ctx->pending is increased after request submission.
-         * We need to ensure that we don't call the crypt finish
-         * operation before pending got incremented
-         * (dependent on crypt submission return code).
-         */
-        atomic_set(&ctx->pending, 2);
+        atomic_set(&ctx->pending, 1);
 }
 
 static int crypt_convert_block(struct crypt_config *cc,
@@ -411,43 +406,42 @@ static void crypt_alloc_req(struct crypt_config *cc,
 static int crypt_convert(struct crypt_config *cc,
                          struct convert_context *ctx)
 {
-        int r = 0;
+        int r;
 
         while(ctx->idx_in < ctx->bio_in->bi_vcnt &&
               ctx->idx_out < ctx->bio_out->bi_vcnt) {
 
                 crypt_alloc_req(cc, ctx);
 
+                atomic_inc(&ctx->pending);
+
                 r = crypt_convert_block(cc, ctx, cc->req);
 
                 switch (r) {
+                /* async */
                 case -EBUSY:
                         wait_for_completion(&ctx->restart);
                         INIT_COMPLETION(ctx->restart);
                         /* fall through*/
                 case -EINPROGRESS:
-                        atomic_inc(&ctx->pending);
                         cc->req = NULL;
-                        r = 0;
-                        /* fall through*/
+                        ctx->sector++;
+                        continue;
+
+                /* sync */
                 case 0:
+                        atomic_dec(&ctx->pending);
                         ctx->sector++;
                         continue;
-                }
 
-                break;
+                /* error */
+                default:
+                        atomic_dec(&ctx->pending);
+                        return r;
+                }
         }
 
-        /*
-         * If there are pending crypto operation run async
-         * code. Otherwise process return code synchronously.
-         * The step of 2 ensures that async finish doesn't
-         * call crypto finish too early.
-         */
-        if (atomic_sub_return(2, &ctx->pending))
-                return -EINPROGRESS;
-
-        return r;
+        return 0;
 }
 
 static void dm_crypt_bio_destructor(struct bio *bio)
@@ -624,8 +618,10 @@ static void kcryptd_io_read(struct dm_crypt_io *io)
 static void kcryptd_io_write(struct dm_crypt_io *io)
 {
         struct bio *clone = io->ctx.bio_out;
+        struct crypt_config *cc = io->target->private;
 
         generic_make_request(clone);
+        wake_up(&cc->writeq);
 }
 
 static void kcryptd_io(struct work_struct *work)
@@ -698,7 +694,8 @@ static void kcryptd_crypt_write_convert_loop(struct dm_crypt_io *io)
 
                 r = crypt_convert(cc, &io->ctx);
 
-                if (r != -EINPROGRESS) {
+                if (atomic_dec_and_test(&io->ctx.pending)) {
+                        /* processed, no running async crypto  */
                         kcryptd_crypt_write_io_submit(io, r, 0);
                         if (unlikely(r < 0))
                                 return;
@@ -706,8 +703,12 @@ static void kcryptd_crypt_write_convert_loop(struct dm_crypt_io *io)
                         atomic_inc(&io->pending);
 
                 /* out of memory -> run queues */
-                if (unlikely(remaining))
+                if (unlikely(remaining)) {
+                        /* wait for async crypto then reinitialize pending */
+                        wait_event(cc->writeq, !atomic_read(&io->ctx.pending));
+                        atomic_set(&io->ctx.pending, 1);
                         congestion_wait(WRITE, HZ/100);
+                }
         }
 }
 
@@ -746,7 +747,7 @@ static void kcryptd_crypt_read_convert(struct dm_crypt_io *io)
 
         r = crypt_convert(cc, &io->ctx);
 
-        if (r != -EINPROGRESS)
+        if (atomic_dec_and_test(&io->ctx.pending))
                 kcryptd_crypt_read_done(io, r);
 
         crypt_dec_pending(io);
@@ -1047,6 +1048,7 @@ static int crypt_ctr(struct dm_target *ti, unsigned int argc, char **argv)
                 goto bad_crypt_queue;
         }
 
+        init_waitqueue_head(&cc->writeq);
         ti->private = cc;
         return 0;
 
diff --git a/drivers/md/dm-io.c b/drivers/md/dm-io.c
index b8e342fe7586..8f25f628ef16 100644
--- a/drivers/md/dm-io.c
+++ b/drivers/md/dm-io.c
@@ -114,7 +114,7 @@ static void dec_count(struct io *io, unsigned int region, int error)
                         wake_up_process(io->sleeper);
 
                 else {
-                        int r = io->error;
+                        unsigned long r = io->error;
                         io_notify_fn fn = io->callback;
                         void *context = io->context;
 
diff --git a/drivers/md/dm-raid1.c b/drivers/md/dm-raid1.c
index 51605870f898..762cb086bb7f 100644
--- a/drivers/md/dm-raid1.c
+++ b/drivers/md/dm-raid1.c
@@ -753,7 +753,7 @@ out:
  * are in the no-sync state.  We have to recover these by
  * recopying from the default mirror to all the others.
  *---------------------------------------------------------------*/
-static void recovery_complete(int read_err, unsigned int write_err,
+static void recovery_complete(int read_err, unsigned long write_err,
                               void *context)
 {
         struct region *reg = (struct region *)context;
@@ -767,7 +767,7 @@ static void recovery_complete(int read_err, unsigned int write_err,
         }
 
         if (write_err) {
-                DMERR_LIMIT("Write error during recovery (error = 0x%x)",
+                DMERR_LIMIT("Write error during recovery (error = 0x%lx)",
                             write_err);
                 /*
                  * Bits correspond to devices (excluding default mirror).
diff --git a/drivers/md/dm-snap.c b/drivers/md/dm-snap.c
index ae24eab8cd81..4dc8a43c034b 100644
--- a/drivers/md/dm-snap.c
+++ b/drivers/md/dm-snap.c
@@ -804,7 +804,7 @@ static void commit_callback(void *context, int success)
  * Called when the copy I/O has finished.  kcopyd actually runs
  * this code so don't block.
  */
-static void copy_callback(int read_err, unsigned int write_err, void *context)
+static void copy_callback(int read_err, unsigned long write_err, void *context)
 {
         struct dm_snap_pending_exception *pe = context;
         struct dm_snapshot *s = pe->snap;
diff --git a/drivers/md/kcopyd.c b/drivers/md/kcopyd.c
index f3831f31223e..e76b52ade690 100644
--- a/drivers/md/kcopyd.c
+++ b/drivers/md/kcopyd.c
@@ -169,7 +169,7 @@ struct kcopyd_job {
          * Error state of the job.
          */
         int read_err;
-        unsigned int write_err;
+        unsigned long write_err;
 
         /*
          * Either READ or WRITE
@@ -293,7 +293,7 @@ static int run_complete_job(struct kcopyd_job *job)
 {
         void *context = job->context;
         int read_err = job->read_err;
-        unsigned int write_err = job->write_err;
+        unsigned long write_err = job->write_err;
         kcopyd_notify_fn fn = job->fn;
         struct kcopyd_client *kc = job->kc;
 
@@ -396,7 +396,7 @@ static int process_jobs(struct list_head *jobs, int (*fn) (struct kcopyd_job *))
                 if (r < 0) {
                         /* error this rogue job */
                         if (job->rw == WRITE)
-                                job->write_err = (unsigned int) -1;
+                                job->write_err = (unsigned long) -1L;
                         else
                                 job->read_err = 1;
                         push(&_complete_jobs, job);
@@ -448,8 +448,8 @@ static void dispatch_job(struct kcopyd_job *job)
 }
 
 #define SUB_JOB_SIZE 128
-static void segment_complete(int read_err,
-                             unsigned int write_err, void *context)
+static void segment_complete(int read_err, unsigned long write_err,
+                             void *context)
 {
         /* FIXME: tidy this function */
         sector_t progress = 0;
diff --git a/drivers/md/kcopyd.h b/drivers/md/kcopyd.h
index 4621ea055c0e..4845f2a0c676 100644
--- a/drivers/md/kcopyd.h
+++ b/drivers/md/kcopyd.h
@@ -32,8 +32,8 @@ void kcopyd_client_destroy(struct kcopyd_client *kc);
  * read_err is a boolean,
  * write_err is a bitset, with 1 bit for each destination region
  */
-typedef void (*kcopyd_notify_fn)(int read_err,
-                                 unsigned int write_err, void *context);
+typedef void (*kcopyd_notify_fn)(int read_err, unsigned long write_err,
+                                 void *context);
 
 int kcopyd_copy(struct kcopyd_client *kc, struct io_region *from,
                 unsigned int num_dests, struct io_region *dests,
diff --git a/drivers/md/md.c b/drivers/md/md.c
index ccbbf63727cc..61ccbd2683fa 100644
--- a/drivers/md/md.c
+++ b/drivers/md/md.c
@@ -1864,17 +1864,6 @@ static struct rdev_sysfs_entry rdev_state =
 __ATTR(state, S_IRUGO|S_IWUSR, state_show, state_store);
 
 static ssize_t
-super_show(mdk_rdev_t *rdev, char *page)
-{
-        if (rdev->sb_loaded && rdev->sb_size) {
-                memcpy(page, page_address(rdev->sb_page), rdev->sb_size);
-                return rdev->sb_size;
-        } else
-                return 0;
-}
-static struct rdev_sysfs_entry rdev_super = __ATTR_RO(super);
-
-static ssize_t
 errors_show(mdk_rdev_t *rdev, char *page)
 {
         return sprintf(page, "%d\n", atomic_read(&rdev->corrected_errors));
@@ -2060,7 +2049,6 @@ __ATTR(size, S_IRUGO|S_IWUSR, rdev_size_show, rdev_size_store);
 
 static struct attribute *rdev_default_attrs[] = {
         &rdev_state.attr,
-        &rdev_super.attr,
         &rdev_errors.attr,
         &rdev_slot.attr,
         &rdev_offset.attr,
diff --git a/drivers/md/raid5.c b/drivers/md/raid5.c
index 2d6f1a51359c..c574cf5efb5c 100644
--- a/drivers/md/raid5.c
+++ b/drivers/md/raid5.c
@@ -1143,7 +1143,7 @@ static void raid5_end_read_request(struct bio * bi, int error)
                         rdev = conf->disks[i].rdev;
                         printk(KERN_INFO "raid5:%s: read error corrected (%lu sectors at %llu on %s)\n",
                                mdname(conf->mddev), STRIPE_SECTORS,
-                               (unsigned long long)sh->sector + rdev->data_offset,
+                               (unsigned long long)(sh->sector + rdev->data_offset),
                                bdevname(rdev->bdev, b));
                         clear_bit(R5_ReadError, &sh->dev[i].flags);
                         clear_bit(R5_ReWrite, &sh->dev[i].flags);
@@ -1160,13 +1160,13 @@ static void raid5_end_read_request(struct bio * bi, int error)
                 if (conf->mddev->degraded)
                         printk(KERN_WARNING "raid5:%s: read error not correctable (sector %llu on %s).\n",
                                mdname(conf->mddev),
-                               (unsigned long long)sh->sector + rdev->data_offset,
+                               (unsigned long long)(sh->sector + rdev->data_offset),
                                bdn);
                 else if (test_bit(R5_ReWrite, &sh->dev[i].flags))
                         /* Oh, no!!! */
                         printk(KERN_WARNING "raid5:%s: read error NOT corrected!! (sector %llu on %s).\n",
                                mdname(conf->mddev),
-                               (unsigned long long)sh->sector + rdev->data_offset,
+                               (unsigned long long)(sh->sector + rdev->data_offset),
                                bdn);
                 else if (atomic_read(&rdev->read_errors)
                          > conf->max_nr_stripes)
diff --git a/drivers/media/common/saa7146_core.c b/drivers/media/common/saa7146_core.c
index 168a8d3a5e55..7707b8c7394b 100644
--- a/drivers/media/common/saa7146_core.c
+++ b/drivers/media/common/saa7146_core.c
@@ -306,25 +306,22 @@ static irqreturn_t interrupt_hw(int irq, void *dev_id)
                 return IRQ_NONE;
         }
 
-        if( 0 != (dev->ext)) {
-                if( 0 != (dev->ext->irq_mask & isr )) {
-                        if( 0 != dev->ext->irq_func ) {
+        if (dev->ext) {
+                if (dev->ext->irq_mask & isr) {
+                        if (dev->ext->irq_func)
                                 dev->ext->irq_func(dev, &isr);
-                        }
                         isr &= ~dev->ext->irq_mask;
                 }
         }
         if (0 != (isr & (MASK_27))) {
                 DEB_INT(("irq: RPS0 (0x%08x).\n",isr));
-                if( 0 != dev->vv_data && 0 != dev->vv_callback) {
+                if (dev->vv_data && dev->vv_callback)
                         dev->vv_callback(dev,isr);
-                }
                 isr &= ~MASK_27;
         }
         if (0 != (isr & (MASK_28))) {
-                if( 0 != dev->vv_data && 0 != dev->vv_callback) {
+                if (dev->vv_data && dev->vv_callback)
                         dev->vv_callback(dev,isr);
-                }
                 isr &= ~MASK_28;
         }
         if (0 != (isr & (MASK_16|MASK_17))) {
diff --git a/drivers/media/common/saa7146_fops.c b/drivers/media/common/saa7146_fops.c
index f0703d8bc3e8..171afe7da6b6 100644
--- a/drivers/media/common/saa7146_fops.c
+++ b/drivers/media/common/saa7146_fops.c
@@ -272,7 +272,7 @@ static int fops_open(struct inode *inode, struct file *file)
 
         result = 0;
 out:
-        if( fh != 0 && result != 0 ) {
+        if (fh && result != 0) {
                 kfree(fh);
                 file->private_data = NULL;
         }
diff --git a/drivers/media/dvb/dvb-core/dvb_net.c b/drivers/media/dvb/dvb-core/dvb_net.c
index ed3f8268ed11..4c8b62e2c035 100644
--- a/drivers/media/dvb/dvb-core/dvb_net.c
+++ b/drivers/media/dvb/dvb-core/dvb_net.c
@@ -784,8 +784,8 @@ static int dvb_net_ts_callback(const u8 *buffer1, size_t buffer1_len,
 {
         struct net_device *dev = feed->priv;
 
-        if (buffer2 != 0)
-                printk(KERN_WARNING "buffer2 not 0: %p.\n", buffer2);
+        if (buffer2)
+                printk(KERN_WARNING "buffer2 not NULL: %p.\n", buffer2);
         if (buffer1_len > 32768)
                 printk(KERN_WARNING "length > 32k: %zu.\n", buffer1_len);
         /* printk("TS callback: %u bytes, %u TS cells @ %p.\n",
diff --git a/drivers/media/dvb/dvb-usb/opera1.c b/drivers/media/dvb/dvb-usb/opera1.c
index 21935bf7059e..302cc67407c3 100644
--- a/drivers/media/dvb/dvb-usb/opera1.c
+++ b/drivers/media/dvb/dvb-usb/opera1.c
@@ -478,9 +478,9 @@ static int opera1_xilinx_load_firmware(struct usb_device *dev,
                                 err("could not restart the USB controller CPU.");
                                 ret = -EINVAL;
                         }
-                        kfree(p);
                 }
         }
+        kfree(p);
         if (fw) {
                 release_firmware(fw);
         }
diff --git a/drivers/media/video/Kconfig b/drivers/media/video/Kconfig
index 37072a21d8c9..1832966f53f3 100644
--- a/drivers/media/video/Kconfig
+++ b/drivers/media/video/Kconfig
@@ -305,7 +305,7 @@ comment "MPEG video encoders"
 
 config VIDEO_CX2341X
         tristate "Conexant CX2341x MPEG encoders"
-        depends on VIDEO_V4L2 && EXPERIMENTAL
+        depends on VIDEO_V4L2 && EXPERIMENTAL && VIDEO_V4L2_COMMON
         ---help---
           Support for the Conexant CX23416 MPEG encoders
           and CX23415 MPEG encoder/decoders.
@@ -382,7 +382,7 @@ endmenu # encoder / decoder chips
 
 config VIDEO_VIVI
         tristate "Virtual Video Driver"
-        depends on VIDEO_V4L2 && !SPARC32 && !SPARC64
+        depends on VIDEO_DEV && VIDEO_V4L2 && !SPARC32 && !SPARC64
         select VIDEOBUF_VMALLOC
         default n
         ---help---
diff --git a/drivers/media/video/adv7170.c b/drivers/media/video/adv7170.c
index cbab53fc6243..fea2e723e34b 100644
--- a/drivers/media/video/adv7170.c
+++ b/drivers/media/video/adv7170.c
@@ -408,7 +408,7 @@ adv7170_detect_client (struct i2c_adapter *adapter,
                 return 0;
 
         client = kzalloc(sizeof(struct i2c_client), GFP_KERNEL);
-        if (client == 0)
+        if (!client)
                 return -ENOMEM;
         client->addr = address;
         client->adapter = adapter;
diff --git a/drivers/media/video/adv7175.c b/drivers/media/video/adv7175.c
index 0d0c554bfdf7..10d4d89623f1 100644
--- a/drivers/media/video/adv7175.c
+++ b/drivers/media/video/adv7175.c
@@ -426,7 +426,7 @@ adv7175_detect_client (struct i2c_adapter *adapter,
                 return 0;
 
         client = kzalloc(sizeof(struct i2c_client), GFP_KERNEL);
-        if (client == 0)
+        if (!client)
                 return -ENOMEM;
         client->addr = address;
         client->adapter = adapter;
diff --git a/drivers/media/video/bt819.c b/drivers/media/video/bt819.c
index 12d1b9248be5..e663cc045c41 100644
--- a/drivers/media/video/bt819.c
+++ b/drivers/media/video/bt819.c
@@ -524,7 +524,7 @@ bt819_detect_client (struct i2c_adapter *adapter,
                 return 0;
 
         client = kzalloc(sizeof(struct i2c_client), GFP_KERNEL);
-        if (client == 0)
+        if (!client)
                 return -ENOMEM;
         client->addr = address;
         client->adapter = adapter;
diff --git a/drivers/media/video/bt856.c b/drivers/media/video/bt856.c
index e1028a76c042..7dee2e3235ad 100644
--- a/drivers/media/video/bt856.c
+++ b/drivers/media/video/bt856.c
@@ -311,7 +311,7 @@ bt856_detect_client (struct i2c_adapter *adapter,
                 return 0;
 
         client = kzalloc(sizeof(struct i2c_client), GFP_KERNEL);
-        if (client == 0)
+        if (!client)
                 return -ENOMEM;
         client->addr = address;
         client->adapter = adapter;
diff --git a/drivers/media/video/bt8xx/bttv-driver.c b/drivers/media/video/bt8xx/bttv-driver.c
index 5404fcc5276d..a080c149cc6c 100644
--- a/drivers/media/video/bt8xx/bttv-driver.c
+++ b/drivers/media/video/bt8xx/bttv-driver.c
@@ -3389,7 +3389,6 @@ static struct video_device bttv_video_template =
         .vidiocgmbuf                    = vidiocgmbuf,
 #endif
         .vidioc_g_crop                  = bttv_g_crop,
-        .vidioc_g_crop                  = bttv_g_crop,
         .vidioc_s_crop                  = bttv_s_crop,
         .vidioc_g_fbuf                  = bttv_g_fbuf,
         .vidioc_s_fbuf                  = bttv_s_fbuf,
diff --git a/drivers/media/video/cx88/cx88-cards.c b/drivers/media/video/cx88/cx88-cards.c
index e6b7f518c56e..8c9a8adf52de 100644
--- a/drivers/media/video/cx88/cx88-cards.c
+++ b/drivers/media/video/cx88/cx88-cards.c
@@ -2196,6 +2196,11 @@ struct cx88_core *cx88_core_create(struct pci_dev *pci, int nr)
         cx88_reset(core);
         cx88_card_setup_pre_i2c(core);
         cx88_i2c_init(core, pci);
+
+        /* load tuner module, if needed */
+        if (TUNER_ABSENT != core->board.tuner_type)
+                request_module("tuner");
+
         cx88_call_i2c_clients (core, TUNER_SET_STANDBY, NULL);
         cx88_card_setup(core);
         cx88_ir_init(core, pci);
diff --git a/drivers/media/video/cx88/cx88-video.c b/drivers/media/video/cx88/cx88-video.c
index 7f1931aed207..227179620d13 100644
--- a/drivers/media/video/cx88/cx88-video.c
+++ b/drivers/media/video/cx88/cx88-video.c
@@ -1826,8 +1826,6 @@ static int __devinit cx8800_initdev(struct pci_dev *pci_dev,
         cx_set(MO_PCI_INTMSK, core->pci_irqmask);
 
         /* load and configure helper modules */
-        if (TUNER_ABSENT != core->board.tuner_type)
-                request_module("tuner");
 
         if (core->board.audio_chip == AUDIO_CHIP_WM8775)
                 request_module("wm8775");
diff --git a/drivers/media/video/dpc7146.c b/drivers/media/video/dpc7146.c
index 566e479e2629..9ceb6b2f3949 100644
--- a/drivers/media/video/dpc7146.c
+++ b/drivers/media/video/dpc7146.c
@@ -131,7 +131,7 @@ static int dpc_probe(struct saa7146_dev* dev)
         device_for_each_child(&dpc->i2c_adapter.dev, dpc, dpc_check_clients);
 
         /* check if all devices are present */
-        if( 0 == dpc->saa7111a ) {
+        if (!dpc->saa7111a) {
                 DEB_D(("dpc_v4l2.o: dpc_attach failed for this device.\n"));
                 i2c_del_adapter(&dpc->i2c_adapter);
                 kfree(dpc);
diff --git a/drivers/media/video/em28xx/em28xx-core.c b/drivers/media/video/em28xx/em28xx-core.c
index 7d1537cab867..c1caaa855b99 100644
--- a/drivers/media/video/em28xx/em28xx-core.c
+++ b/drivers/media/video/em28xx/em28xx-core.c
@@ -267,7 +267,7 @@ static int em28xx_write_ac97(struct em28xx *dev, u8 reg, u8 *val)
         for (i = 0; i < 10; i++) {
                 if ((ret = em28xx_read_reg(dev, AC97BUSY_REG)) < 0)
                         return ret;
-                if (!((u8) ret) & 0x01)
+                if (!(ret & 0x01))
                         return 0;
                 msleep(5);
         }
diff --git a/drivers/media/video/ivtv/ivtv-driver.c b/drivers/media/video/ivtv/ivtv-driver.c
index d42f120354e5..948ca35e7ee8 100644
--- a/drivers/media/video/ivtv/ivtv-driver.c
+++ b/drivers/media/video/ivtv/ivtv-driver.c
@@ -54,7 +54,6 @@
 #include "ivtv-vbi.h"
 #include "ivtv-routing.h"
 #include "ivtv-gpio.h"
-#include "ivtv-yuv.h"
 
 #include <media/tveeprom.h>
 #include <media/saa7115.h>
@@ -700,6 +699,9 @@ static int __devinit ivtv_init_struct1(struct ivtv *itv)
         itv->vbi.in.type = V4L2_BUF_TYPE_SLICED_VBI_CAPTURE;
         itv->vbi.sliced_in = &itv->vbi.in.fmt.sliced;
 
+        /* Init the sg table for osd/yuv output */
+        sg_init_table(itv->udma.SGlist, IVTV_DMA_SG_OSD_ENT);
+
         /* OSD */
         itv->osd_global_alpha_state = 1;
         itv->osd_global_alpha = 255;
@@ -1053,9 +1055,6 @@ static int __devinit ivtv_probe(struct pci_dev *dev,
                 goto free_io;
         }
 
-        /* Check yuv output filter table */
-        if (itv->has_cx23415) ivtv_yuv_filter_check(itv);
-
         ivtv_gpio_init(itv);
 
         /* active i2c  */
diff --git a/drivers/media/video/ivtv/ivtv-firmware.c b/drivers/media/video/ivtv/ivtv-firmware.c
index 425eb1063904..6dba55b7e25a 100644
--- a/drivers/media/video/ivtv/ivtv-firmware.c
+++ b/drivers/media/video/ivtv/ivtv-firmware.c
@@ -22,6 +22,7 @@
 #include "ivtv-driver.h"
 #include "ivtv-mailbox.h"
 #include "ivtv-firmware.h"
+#include "ivtv-yuv.h"
 #include <linux/firmware.h>
 
 #define IVTV_MASK_SPU_ENABLE            0xFFFFFFFE
@@ -225,11 +226,14 @@ int ivtv_firmware_init(struct ivtv *itv)
                 return 0;
 
         itv->dec_mbox.mbox = ivtv_search_mailbox(itv->dec_mem, IVTV_DECODER_SIZE);
-        if (itv->dec_mbox.mbox == NULL)
+        if (itv->dec_mbox.mbox == NULL) {
                 IVTV_ERR("Decoder mailbox not found\n");
-        else if (itv->has_cx23415 && ivtv_vapi(itv, CX2341X_DEC_PING_FW, 0)) {
+        } else if (itv->has_cx23415 && ivtv_vapi(itv, CX2341X_DEC_PING_FW, 0)) {
                 IVTV_ERR("Decoder firmware dead!\n");
                 itv->dec_mbox.mbox = NULL;
+        } else {
+                /* Firmware okay, so check yuv output filter table */
+                ivtv_yuv_filter_check(itv);
         }
         return itv->dec_mbox.mbox ? 0 : -ENODEV;
 }
diff --git a/drivers/media/video/mt20xx.c b/drivers/media/video/mt20xx.c
index 58bab653330f..74fd6a01d4c4 100644
--- a/drivers/media/video/mt20xx.c
+++ b/drivers/media/video/mt20xx.c
@@ -647,7 +647,7 @@ struct dvb_frontend *microtune_attach(struct dvb_frontend *fe,
         default:
                 tuner_info("microtune %s found, not (yet?) supported, sorry :-/\n",
                            name);
-                return 0;
+                return NULL;
         }
 
         strlcpy(fe->ops.tuner_ops.info.name, name,
diff --git a/drivers/media/video/mxb.c b/drivers/media/video/mxb.c
index add6d0d680be..cb5a510f9251 100644
--- a/drivers/media/video/mxb.c
+++ b/drivers/media/video/mxb.c
@@ -221,9 +221,8 @@ static int mxb_probe(struct saa7146_dev* dev)
         device_for_each_child(&mxb->i2c_adapter.dev, mxb, mxb_check_clients);
 
         /* check if all devices are present */
-        if(    0 == mxb->tea6420_1      || 0 == mxb->tea6420_2  || 0 == mxb->tea6415c
-            || 0 == mxb->tda9840        || 0 == mxb->saa7111a   || 0 == mxb->tuner ) {
-
+        if (!mxb->tea6420_1 || !mxb->tea6420_2 || !mxb->tea6415c ||
+            !mxb->tda9840 || !mxb->saa7111a || !mxb->tuner) {
                 printk("mxb: did not find all i2c devices. aborting\n");
                 i2c_del_adapter(&mxb->i2c_adapter);
                 kfree(mxb);
diff --git a/drivers/media/video/pvrusb2/pvrusb2-ctrl.c b/drivers/media/video/pvrusb2/pvrusb2-ctrl.c
index 46f156fb108c..5a3e8d21a38a 100644
--- a/drivers/media/video/pvrusb2/pvrusb2-ctrl.c
+++ b/drivers/media/video/pvrusb2/pvrusb2-ctrl.c
@@ -60,7 +60,7 @@ int pvr2_ctrl_set_mask_value(struct pvr2_ctrl *cptr,int mask,int val)
         int ret = 0;
         if (!cptr) return -EINVAL;
         LOCK_TAKE(cptr->hdw->big_lock); do {
-                if (cptr->info->set_value != 0) {
+                if (cptr->info->set_value) {
                         if (cptr->info->type == pvr2_ctl_bitmask) {
                                 mask &= cptr->info->def.type_bitmask.valid_bits;
                         } else if (cptr->info->type == pvr2_ctl_int) {
@@ -265,7 +265,7 @@ unsigned int pvr2_ctrl_get_v4lflags(struct pvr2_ctrl *cptr)
 int pvr2_ctrl_is_writable(struct pvr2_ctrl *cptr)
 {
         if (!cptr) return 0;
-        return cptr->info->set_value != 0;
+        return cptr->info->set_value != NULL;
 }
 
 
diff --git a/drivers/media/video/pvrusb2/pvrusb2-hdw.c b/drivers/media/video/pvrusb2/pvrusb2-hdw.c
index 41ae980405ed..d6955fa39598 100644
--- a/drivers/media/video/pvrusb2/pvrusb2-hdw.c
+++ b/drivers/media/video/pvrusb2/pvrusb2-hdw.c
@@ -2291,7 +2291,7 @@ static int pvr2_hdw_commit_setup(struct pvr2_hdw *hdw)
 
         for (idx = 0; idx < hdw->control_cnt; idx++) {
                 cptr = hdw->controls + idx;
-                if (cptr->info->is_dirty == 0) continue;
+                if (!cptr->info->is_dirty) continue;
                 if (!cptr->info->is_dirty(cptr)) continue;
                 commit_flag = !0;
 
@@ -2646,7 +2646,7 @@ void pvr2_hdw_cpufw_set_enabled(struct pvr2_hdw *hdw,
         u16 address;
         unsigned int pipe;
         LOCK_TAKE(hdw->big_lock); do {
-                if ((hdw->fw_buffer == 0) == !enable_flag) break;
+                if ((hdw->fw_buffer == NULL) == !enable_flag) break;
 
                 if (!enable_flag) {
                         pvr2_trace(PVR2_TRACE_FIRMWARE,
@@ -2715,7 +2715,7 @@ void pvr2_hdw_cpufw_set_enabled(struct pvr2_hdw *hdw,
 /* Return true if we're in a mode for retrieval CPU firmware */
 int pvr2_hdw_cpufw_get_enabled(struct pvr2_hdw *hdw)
 {
-        return hdw->fw_buffer != 0;
+        return hdw->fw_buffer != NULL;
 }
 
 
diff --git a/drivers/media/video/pvrusb2/pvrusb2-io.c b/drivers/media/video/pvrusb2/pvrusb2-io.c
index ce3c8982ffe0..a9889ff96ecc 100644
--- a/drivers/media/video/pvrusb2/pvrusb2-io.c
+++ b/drivers/media/video/pvrusb2/pvrusb2-io.c
@@ -563,7 +563,7 @@ void pvr2_stream_kill(struct pvr2_stream *sp)
         struct pvr2_buffer *bp;
         mutex_lock(&sp->mutex); do {
                 pvr2_stream_internal_flush(sp);
-                while ((bp = pvr2_stream_get_ready_buffer(sp)) != 0) {
+                while ((bp = pvr2_stream_get_ready_buffer(sp)) != NULL) {
                         pvr2_buffer_set_idle(bp);
                 }
                 if (sp->buffer_total_count != sp->buffer_target_count) {
diff --git a/drivers/media/video/pvrusb2/pvrusb2-ioread.c b/drivers/media/video/pvrusb2/pvrusb2-ioread.c
index f782418afa45..c572212c9f15 100644
--- a/drivers/media/video/pvrusb2/pvrusb2-ioread.c
+++ b/drivers/media/video/pvrusb2/pvrusb2-ioread.c
@@ -165,7 +165,7 @@ static int pvr2_ioread_start(struct pvr2_ioread *cp)
         if (!(cp->stream)) return 0;
         pvr2_trace(PVR2_TRACE_START_STOP,
                    "/*---TRACE_READ---*/ pvr2_ioread_start id=%p",cp);
-        while ((bp = pvr2_stream_get_idle_buffer(cp->stream)) != 0) {
+        while ((bp = pvr2_stream_get_idle_buffer(cp->stream)) != NULL) {
                 stat = pvr2_buffer_queue(bp);
                 if (stat < 0) {
                         pvr2_trace(PVR2_TRACE_DATA_FLOW,
diff --git a/drivers/media/video/pwc/pwc-if.c b/drivers/media/video/pwc/pwc-if.c
index f991d72fe108..e0a453a6543d 100644
--- a/drivers/media/video/pwc/pwc-if.c
+++ b/drivers/media/video/pwc/pwc-if.c
@@ -915,7 +915,7 @@ static void pwc_iso_stop(struct pwc_device *pdev)
                 struct urb *urb;
 
                 urb = pdev->sbuf[i].urb;
-                if (urb != 0) {
+                if (urb) {
                         PWC_DEBUG_MEMORY("Unlinking URB %p\n", urb);
                         usb_kill_urb(urb);
                 }
@@ -931,7 +931,7 @@ static void pwc_iso_free(struct pwc_device *pdev)
                 struct urb *urb;
 
                 urb = pdev->sbuf[i].urb;
-                if (urb != 0) {
+                if (urb) {
                         PWC_DEBUG_MEMORY("Freeing URB\n");
                         usb_free_urb(urb);
                         pdev->sbuf[i].urb = NULL;
@@ -1759,8 +1759,7 @@ static int usb_pwc_probe(struct usb_interface *intf, const struct usb_device_id
 
         /* Allocate video_device structure */
         pdev->vdev = video_device_alloc();
-        if (pdev->vdev == 0)
-        {
+        if (!pdev->vdev) {
                 PWC_ERROR("Err, cannot allocate video_device struture. Failing probe.");
                 kfree(pdev);
                 return -ENOMEM;
diff --git a/drivers/media/video/saa7110.c b/drivers/media/video/saa7110.c
index 061134a7ba9f..1df2602cd184 100644
--- a/drivers/media/video/saa7110.c
+++ b/drivers/media/video/saa7110.c
@@ -488,7 +488,7 @@ saa7110_detect_client (struct i2c_adapter *adapter,
                 return 0;
 
         client = kzalloc(sizeof(struct i2c_client), GFP_KERNEL);
-        if (client == 0)
+        if (!client)
                 return -ENOMEM;
         client->addr = address;
         client->adapter = adapter;
@@ -496,7 +496,7 @@ saa7110_detect_client (struct i2c_adapter *adapter,
         strlcpy(I2C_NAME(client), "saa7110", sizeof(I2C_NAME(client)));
 
         decoder = kzalloc(sizeof(struct saa7110), GFP_KERNEL);
-        if (decoder == 0) {
+        if (!decoder) {
                 kfree(client);
                 return -ENOMEM;
         }
diff --git a/drivers/media/video/saa7111.c b/drivers/media/video/saa7111.c
index 7ae2d646d000..a0772c53bb1f 100644
--- a/drivers/media/video/saa7111.c
+++ b/drivers/media/video/saa7111.c
@@ -502,7 +502,7 @@ saa7111_detect_client (struct i2c_adapter *adapter,
                 return 0;
 
         client = kzalloc(sizeof(struct i2c_client), GFP_KERNEL);
-        if (client == 0)
+        if (!client)
                 return -ENOMEM;
         client->addr = address;
         client->adapter = adapter;
diff --git a/drivers/media/video/saa7114.c b/drivers/media/video/saa7114.c
index 677df51de1a9..bf91a4faa706 100644
--- a/drivers/media/video/saa7114.c
+++ b/drivers/media/video/saa7114.c
@@ -841,7 +841,7 @@ saa7114_detect_client (struct i2c_adapter *adapter,
                 return 0;
 
         client = kzalloc(sizeof(struct i2c_client), GFP_KERNEL);
-        if (client == 0)
+        if (!client)
                 return -ENOMEM;
         client->addr = address;
         client->adapter = adapter;
diff --git a/drivers/media/video/saa7134/saa7134-cards.c b/drivers/media/video/saa7134/saa7134-cards.c
index 262830da08c8..6f5744286e8c 100644
--- a/drivers/media/video/saa7134/saa7134-cards.c
+++ b/drivers/media/video/saa7134/saa7134-cards.c
@@ -2484,27 +2484,28 @@ struct saa7134_board saa7134_boards[] = {
                 .tuner_addr     = ADDR_UNSET,
                 .radio_addr     = ADDR_UNSET,
                 .gpiomask       = 0x080200000,
-                .inputs         = {{
-                          .name = name_tv,
-                          .vmux = 4,
-                          .amux = TV,
-                          .tv   = 1,
-                },{
-                          .name = name_comp1,
-                          .vmux = 1,
-                         .amux = LINE2,
-               },{
-                         .name = name_comp2,
-                         .vmux = 0,
-                          .amux = LINE2,
-                },{
-                          .name = name_svideo,
-                          .vmux = 8,
-                          .amux = LINE2,
-                }},
+                .inputs         = { {
+                        .name = name_tv,
+                        .vmux = 4,
+                        .amux = TV,
+                        .tv   = 1,
+                }, {
+                        .name = name_comp1,
+                        .vmux = 1,
+                        .amux = LINE2,
+                }, {
+                        .name = name_comp2,
+                        .vmux = 0,
+                        .amux = LINE2,
+                }, {
+                        .name = name_svideo,
+                        .vmux = 8,
+                        .amux = LINE2,
+                } },
                 .radio = {
-                          .name = name_radio,
-                          .amux = LINE1,
+                        .name = name_radio,
+                        .amux = TV,
+                        .gpio = 0x0200000,
                 },
         },
         [SAA7134_BOARD_ASUSTeK_P7131_DUAL] = {
diff --git a/drivers/media/video/saa7134/saa7134-core.c b/drivers/media/video/saa7134/saa7134-core.c
index 52baa4f7f7dd..58ab163fdbd7 100644
--- a/drivers/media/video/saa7134/saa7134-core.c
+++ b/drivers/media/video/saa7134/saa7134-core.c
@@ -1022,12 +1022,13 @@ static int __devinit saa7134_initdev(struct pci_dev *pci_dev,
         saa7134_i2c_register(dev);
 
         /* initialize hardware #2 */
+        if (TUNER_ABSENT != dev->tuner_type)
+                request_module("tuner");
         saa7134_board_init2(dev);
+
         saa7134_hwinit2(dev);
 
         /* load i2c helpers */
-        if (TUNER_ABSENT != dev->tuner_type)
-                request_module("tuner");
         if (card_is_empress(dev)) {
                 request_module("saa6752hs");
         }
diff --git a/drivers/media/video/saa7185.c b/drivers/media/video/saa7185.c
index 66cc92c0ea66..41f70440fd3b 100644
--- a/drivers/media/video/saa7185.c
+++ b/drivers/media/video/saa7185.c
@@ -403,7 +403,7 @@ saa7185_detect_client (struct i2c_adapter *adapter,
                 return 0;
 
         client = kzalloc(sizeof(struct i2c_client), GFP_KERNEL);
-        if (client == 0)
+        if (!client)
                 return -ENOMEM;
         client->addr = address;
         client->adapter = adapter;
diff --git a/drivers/media/video/tda9840.c b/drivers/media/video/tda9840.c
index ef494febb5e4..bdca5d278978 100644
--- a/drivers/media/video/tda9840.c
+++ b/drivers/media/video/tda9840.c
@@ -172,7 +172,7 @@ static int detect(struct i2c_adapter *adapter, int address, int kind)
 
         /* allocate memory for client structure */
         client = kmalloc(sizeof(struct i2c_client), GFP_KERNEL);
-        if (0 == client) {
+        if (!client) {
                 printk("not enough kernel memory\n");
                 return -ENOMEM;
         }
diff --git a/drivers/media/video/tea6415c.c b/drivers/media/video/tea6415c.c
index 523df0b8cc63..df2fad9f391e 100644
--- a/drivers/media/video/tea6415c.c
+++ b/drivers/media/video/tea6415c.c
@@ -64,7 +64,7 @@ static int detect(struct i2c_adapter *adapter, int address, int kind)
 
         /* allocate memory for client structure */
         client = kmalloc(sizeof(struct i2c_client), GFP_KERNEL);
-        if (0 == client) {
+        if (!client) {
                 return -ENOMEM;
         }
 
diff --git a/drivers/media/video/tea6420.c b/drivers/media/video/tea6420.c
index ca05cd655087..4ff6c63f7237 100644
--- a/drivers/media/video/tea6420.c
+++ b/drivers/media/video/tea6420.c
@@ -101,7 +101,7 @@ static int tea6420_detect(struct i2c_adapter *adapter, int address, int kind)
 
         /* allocate memory for client structure */
         client = kzalloc(sizeof(struct i2c_client), GFP_KERNEL);
-        if (0 == client) {
+        if (!client) {
                 return -ENOMEM;
         }
 
diff --git a/drivers/media/video/tvp5150.c b/drivers/media/video/tvp5150.c
index 445eba4174d7..b6e24e714a23 100644
--- a/drivers/media/video/tvp5150.c
+++ b/drivers/media/video/tvp5150.c
@@ -672,7 +672,7 @@ static int tvp5150_set_vbi(struct i2c_client *c,
         if (std == V4L2_STD_ALL) {
                 tvp5150_err("VBI can't be configured without knowing number of lines\n");
                 return 0;
-        } else if (std && V4L2_STD_625_50) {
+        } else if (std & V4L2_STD_625_50) {
                 /* Don't follow NTSC Line number convension */
                 line += 3;
         }
@@ -719,7 +719,7 @@ static int tvp5150_get_vbi(struct i2c_client *c,
         if (std == V4L2_STD_ALL) {
                 tvp5150_err("VBI can't be configured without knowing number of lines\n");
                 return 0;
-        } else if (std && V4L2_STD_625_50) {
+        } else if (std & V4L2_STD_625_50) {
                 /* Don't follow NTSC Line number convension */
                 line += 3;
         }
@@ -1072,12 +1072,12 @@ static int tvp5150_detect_client(struct i2c_adapter *adapter,
                 return 0;
 
         c = kmalloc(sizeof(struct i2c_client), GFP_KERNEL);
-        if (c == 0)
+        if (!c)
                 return -ENOMEM;
         memcpy(c, &client_template, sizeof(struct i2c_client));
 
         core = kzalloc(sizeof(struct tvp5150), GFP_KERNEL);
-        if (core == 0) {
+        if (!core) {
                 kfree(c);
                 return -ENOMEM;
         }
diff --git a/drivers/media/video/usbvideo/usbvideo.c b/drivers/media/video/usbvideo/usbvideo.c
index fb434b5602a3..5d363be7bc73 100644
--- a/drivers/media/video/usbvideo/usbvideo.c
+++ b/drivers/media/video/usbvideo/usbvideo.c
@@ -1034,6 +1034,11 @@ int usbvideo_RegisterVideoDevice(struct uvd *uvd)
                 info("%s: iface=%d. endpoint=$%02x paletteBits=$%08lx",
                      __FUNCTION__, uvd->iface, uvd->video_endp, uvd->paletteBits);
         }
+        if (uvd->dev == NULL) {
+                err("%s: uvd->dev == NULL", __FUNCTION__);
+                return -EINVAL;
+        }
+        uvd->vdev.dev=&(uvd->dev->dev);
         if (video_register_device(&uvd->vdev, VFL_TYPE_GRABBER, video_nr) == -1) {
                 err("%s: video_register_device failed", __FUNCTION__);
                 return -EPIPE;
@@ -1041,10 +1046,6 @@ int usbvideo_RegisterVideoDevice(struct uvd *uvd)
         if (uvd->debug > 1) {
                 info("%s: video_register_device() successful", __FUNCTION__);
         }
-        if (uvd->dev == NULL) {
-                err("%s: uvd->dev == NULL", __FUNCTION__);
-                return -EINVAL;
-        }
 
         info("%s on /dev/video%d: canvas=%s videosize=%s",
              (uvd->handle != NULL) ? uvd->handle->drvName : "???",
diff --git a/drivers/media/video/v4l1-compat.c b/drivers/media/video/v4l1-compat.c
index dcf22a3b672a..50e1ff9f2be5 100644
--- a/drivers/media/video/v4l1-compat.c
+++ b/drivers/media/video/v4l1-compat.c
@@ -303,7 +303,11 @@ v4l_compat_translate_ioctl(struct inode         *inode,
         {
                 struct video_capability *cap = arg;
 
-                cap2 = kzalloc(sizeof(*cap2),GFP_KERNEL);
+                cap2 = kzalloc(sizeof(*cap2), GFP_KERNEL);
+                if (!cap2) {
+                        err = -ENOMEM;
+                        break;
+                }
                 memset(cap, 0, sizeof(*cap));
                 memset(&fbuf2, 0, sizeof(fbuf2));
 
@@ -426,7 +430,11 @@ v4l_compat_translate_ioctl(struct inode         *inode,
         {
                 struct video_window     *win = arg;
 
-                fmt2 = kzalloc(sizeof(*fmt2),GFP_KERNEL);
+                fmt2 = kzalloc(sizeof(*fmt2), GFP_KERNEL);
+                if (!fmt2) {
+                        err = -ENOMEM;
+                        break;
+                }
                 memset(win,0,sizeof(*win));
 
                 fmt2->type = V4L2_BUF_TYPE_VIDEO_OVERLAY;
@@ -464,7 +472,11 @@ v4l_compat_translate_ioctl(struct inode         *inode,
                 struct video_window     *win = arg;
                 int err1,err2;
 
-                fmt2 = kzalloc(sizeof(*fmt2),GFP_KERNEL);
+                fmt2 = kzalloc(sizeof(*fmt2), GFP_KERNEL);
+                if (!fmt2) {
+                        err = -ENOMEM;
+                        break;
+                }
                 fmt2->type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
                 drv(inode, file, VIDIOC_STREAMOFF, &fmt2->type);
                 err1 = drv(inode, file, VIDIOC_G_FMT, fmt2);
@@ -586,6 +598,12 @@ v4l_compat_translate_ioctl(struct inode         *inode,
         {
                 struct video_picture    *pict = arg;
 
+                fmt2 = kzalloc(sizeof(*fmt2), GFP_KERNEL);
+                if (!fmt2) {
+                        err = -ENOMEM;
+                        break;
+                }
+
                 pict->brightness = get_v4l_control(inode, file,
                                                    V4L2_CID_BRIGHTNESS,drv);
                 pict->hue = get_v4l_control(inode, file,
@@ -597,7 +615,6 @@ v4l_compat_translate_ioctl(struct inode         *inode,
                 pict->whiteness = get_v4l_control(inode, file,
                                                   V4L2_CID_WHITENESS, drv);
 
-                fmt2 = kzalloc(sizeof(*fmt2),GFP_KERNEL);
                 fmt2->type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
                 err = drv(inode, file, VIDIOC_G_FMT, fmt2);
                 if (err < 0) {
@@ -617,6 +634,11 @@ v4l_compat_translate_ioctl(struct inode         *inode,
                 struct video_picture    *pict = arg;
                 int mem_err = 0, ovl_err = 0;
 
+                fmt2 = kzalloc(sizeof(*fmt2), GFP_KERNEL);
+                if (!fmt2) {
+                        err = -ENOMEM;
+                        break;
+                }
                 memset(&fbuf2, 0, sizeof(fbuf2));
 
                 set_v4l_control(inode, file,
@@ -636,7 +658,6 @@ v4l_compat_translate_ioctl(struct inode         *inode,
                  * different pixel formats for memory vs overlay.
                  */
 
-                fmt2 = kzalloc(sizeof(*fmt2),GFP_KERNEL);
                 fmt2->type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
                 err = drv(inode, file, VIDIOC_G_FMT, fmt2);
                 /* If VIDIOC_G_FMT failed, then the driver likely doesn't
@@ -890,7 +911,11 @@ v4l_compat_translate_ioctl(struct inode         *inode,
         {
                 struct video_mmap       *mm = arg;
 
-                fmt2 = kzalloc(sizeof(*fmt2),GFP_KERNEL);
+                fmt2 = kzalloc(sizeof(*fmt2), GFP_KERNEL);
+                if (!fmt2) {
+                        err = -ENOMEM;
+                        break;
+                }
                 memset(&buf2,0,sizeof(buf2));
 
                 fmt2->type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
@@ -986,7 +1011,11 @@ v4l_compat_translate_ioctl(struct inode         *inode,
         {
                 struct vbi_format      *fmt = arg;
 
-                fmt2 = kzalloc(sizeof(*fmt2),GFP_KERNEL);
+                fmt2 = kzalloc(sizeof(*fmt2), GFP_KERNEL);
+                if (!fmt2) {
+                        err = -ENOMEM;
+                        break;
+                }
                 fmt2->type = V4L2_BUF_TYPE_VBI_CAPTURE;
 
                 err = drv(inode, file, VIDIOC_G_FMT, fmt2);
@@ -1018,8 +1047,11 @@ v4l_compat_translate_ioctl(struct inode         *inode,
                         break;
                 }
 
-                fmt2 = kzalloc(sizeof(*fmt2),GFP_KERNEL);
-
+                fmt2 = kzalloc(sizeof(*fmt2), GFP_KERNEL);
+                if (!fmt2) {
+                        err = -ENOMEM;
+                        break;
+                }
                 fmt2->type = V4L2_BUF_TYPE_VBI_CAPTURE;
                 fmt2->fmt.vbi.samples_per_line = fmt->samples_per_line;
                 fmt2->fmt.vbi.sampling_rate    = fmt->sampling_rate;
diff --git a/drivers/media/video/zoran_driver.c b/drivers/media/video/zoran_driver.c
index dd3d7d2c8b0e..fea4946ee713 100644
--- a/drivers/media/video/zoran_driver.c
+++ b/drivers/media/video/zoran_driver.c
@@ -339,7 +339,7 @@ v4l_fbuffer_alloc (struct file *file)
                         /* Use kmalloc */
 
                         mem = kmalloc(fh->v4l_buffers.buffer_size, GFP_KERNEL);
-                        if (mem == 0) {
+                        if (!mem) {
                                 dprintk(1,
                                         KERN_ERR
                                         "%s: v4l_fbuffer_alloc() - kmalloc for V4L buf %d failed\n",
diff --git a/drivers/media/video/zr364xx.c b/drivers/media/video/zr364xx.c
index 1b44784d0efb..04949c823654 100644
--- a/drivers/media/video/zr364xx.c
+++ b/drivers/media/video/zr364xx.c
@@ -390,7 +390,7 @@ static int read_frame(struct zr364xx_camera *cam, int framenum)
 }
 
 
-static ssize_t zr364xx_read(struct file *file, char *buf, size_t cnt,
+static ssize_t zr364xx_read(struct file *file, char __user *buf, size_t cnt,
                             loff_t * ppos)
 {
         unsigned long count = cnt;
diff --git a/drivers/memstick/core/memstick.c b/drivers/memstick/core/memstick.c
index de80dba12f9b..946e3d3506ac 100644
--- a/drivers/memstick/core/memstick.c
+++ b/drivers/memstick/core/memstick.c
@@ -276,8 +276,6 @@ void memstick_init_req_sg(struct memstick_request *mrq, unsigned char tpc,
                 mrq->need_card_int = 1;
         else
                 mrq->need_card_int = 0;
-
-        mrq->get_int_reg = 0;
 }
 EXPORT_SYMBOL(memstick_init_req_sg);
 
@@ -311,8 +309,6 @@ void memstick_init_req(struct memstick_request *mrq, unsigned char tpc,
                 mrq->need_card_int = 1;
         else
                 mrq->need_card_int = 0;
-
-        mrq->get_int_reg = 0;
 }
 EXPORT_SYMBOL(memstick_init_req);
 
@@ -342,6 +338,7 @@ static int h_memstick_read_dev_id(struct memstick_dev *card,
                         card->id.class = id_reg.class;
                 }
                 complete(&card->mrq_complete);
+                dev_dbg(&card->dev, "if_mode = %02x\n", id_reg.if_mode);
                 return -EAGAIN;
         }
 }
@@ -422,7 +419,6 @@ static void memstick_power_on(struct memstick_host *host)
 {
         host->set_param(host, MEMSTICK_POWER, MEMSTICK_POWER_ON);
         host->set_param(host, MEMSTICK_INTERFACE, MEMSTICK_SERIAL);
-        msleep(1);
 }
 
 static void memstick_check(struct work_struct *work)
@@ -579,7 +575,8 @@ EXPORT_SYMBOL(memstick_suspend_host);
 void memstick_resume_host(struct memstick_host *host)
 {
         mutex_lock(&host->lock);
-        host->set_param(host, MEMSTICK_POWER, MEMSTICK_POWER_ON);
+        if (host->card)
+                memstick_power_on(host);
         mutex_unlock(&host->lock);
         memstick_detect_change(host);
 }
diff --git a/drivers/memstick/core/mspro_block.c b/drivers/memstick/core/mspro_block.c
index 1d637e4561d3..557dbbba5cb2 100644
--- a/drivers/memstick/core/mspro_block.c
+++ b/drivers/memstick/core/mspro_block.c
@@ -133,6 +133,7 @@ struct mspro_devinfo {
 struct mspro_block_data {
         struct memstick_dev   *card;
         unsigned int          usage_count;
+        unsigned int          caps;
         struct gendisk        *disk;
         struct request_queue  *queue;
         spinlock_t            q_lock;
@@ -577,7 +578,6 @@ static int h_mspro_block_wait_for_ced(struct memstick_dev *card,
 static int h_mspro_block_transfer_data(struct memstick_dev *card,
                                        struct memstick_request **mrq)
 {
-        struct memstick_host *host = card->host;
         struct mspro_block_data *msb = memstick_get_drvdata(card);
         unsigned char t_val = 0;
         struct scatterlist t_sg = { 0 };
@@ -591,12 +591,12 @@ static int h_mspro_block_transfer_data(struct memstick_dev *card,
         switch ((*mrq)->tpc) {
         case MS_TPC_WRITE_REG:
                 memstick_init_req(*mrq, MS_TPC_SET_CMD, &msb->transfer_cmd, 1);
-                (*mrq)->get_int_reg = 1;
+                (*mrq)->need_card_int = 1;
                 return 0;
         case MS_TPC_SET_CMD:
                 t_val = (*mrq)->int_reg;
                 memstick_init_req(*mrq, MS_TPC_GET_INT, NULL, 1);
-                if (host->caps & MEMSTICK_CAP_AUTO_GET_INT)
+                if (msb->caps & MEMSTICK_CAP_AUTO_GET_INT)
                         goto has_int_reg;
                 return 0;
         case MS_TPC_GET_INT:
@@ -646,12 +646,12 @@ has_int_reg:
                                            ? MS_TPC_READ_LONG_DATA
                                            : MS_TPC_WRITE_LONG_DATA,
                                      &t_sg);
-                (*mrq)->get_int_reg = 1;
+                (*mrq)->need_card_int = 1;
                 return 0;
         case MS_TPC_READ_LONG_DATA:
         case MS_TPC_WRITE_LONG_DATA:
                 msb->current_page++;
-                if (host->caps & MEMSTICK_CAP_AUTO_GET_INT) {
+                if (msb->caps & MEMSTICK_CAP_AUTO_GET_INT) {
                         t_val = (*mrq)->int_reg;
                         goto has_int_reg;
                 } else {
@@ -816,12 +816,13 @@ static int mspro_block_wait_for_ced(struct memstick_dev *card)
         return card->current_mrq.error;
 }
 
-static int mspro_block_switch_to_parallel(struct memstick_dev *card)
+static int mspro_block_set_interface(struct memstick_dev *card,
+                                     unsigned char sys_reg)
 {
         struct memstick_host *host = card->host;
         struct mspro_block_data *msb = memstick_get_drvdata(card);
         struct mspro_param_register param = {
-                .system = MEMSTICK_SYS_PAR4,
+                .system = sys_reg,
                 .data_count = 0,
                 .data_address = 0,
                 .tpc_param = 0
@@ -833,41 +834,70 @@ static int mspro_block_switch_to_parallel(struct memstick_dev *card)
                           sizeof(param));
         memstick_new_req(host);
         wait_for_completion(&card->mrq_complete);
-        if (card->current_mrq.error)
-                return card->current_mrq.error;
+        return card->current_mrq.error;
+}
+
+static int mspro_block_switch_interface(struct memstick_dev *card)
+{
+        struct memstick_host *host = card->host;
+        struct mspro_block_data *msb = memstick_get_drvdata(card);
+        int rc = 0;
+
+        if (msb->caps & MEMSTICK_CAP_PAR4)
+                rc = mspro_block_set_interface(card, MEMSTICK_SYS_PAR4);
+        else
+                return 0;
+
+        if (rc) {
+                printk(KERN_WARNING
+                       "%s: could not switch to 4-bit mode, error %d\n",
+                       card->dev.bus_id, rc);
+                return 0;
+        }
 
         msb->system = MEMSTICK_SYS_PAR4;
         host->set_param(host, MEMSTICK_INTERFACE, MEMSTICK_PAR4);
+        printk(KERN_INFO "%s: switching to 4-bit parallel mode\n",
+               card->dev.bus_id);
+
+        if (msb->caps & MEMSTICK_CAP_PAR8) {
+                rc = mspro_block_set_interface(card, MEMSTICK_SYS_PAR8);
+
+                if (!rc) {
+                        msb->system = MEMSTICK_SYS_PAR8;
+                        host->set_param(host, MEMSTICK_INTERFACE,
+                                        MEMSTICK_PAR8);
+                        printk(KERN_INFO
+                               "%s: switching to 8-bit parallel mode\n",
+                               card->dev.bus_id);
+                } else
+                        printk(KERN_WARNING
+                               "%s: could not switch to 8-bit mode, error %d\n",
+                               card->dev.bus_id, rc);
+        }
 
         card->next_request = h_mspro_block_req_init;
         msb->mrq_handler = h_mspro_block_default;
         memstick_init_req(&card->current_mrq, MS_TPC_GET_INT, NULL, 1);
         memstick_new_req(card->host);
         wait_for_completion(&card->mrq_complete);
+        rc = card->current_mrq.error;
 
-        if (card->current_mrq.error) {
+        if (rc) {
+                printk(KERN_WARNING
+                       "%s: interface error, trying to fall back to serial\n",
+                       card->dev.bus_id);
                 msb->system = MEMSTICK_SYS_SERIAL;
                 host->set_param(host, MEMSTICK_POWER, MEMSTICK_POWER_OFF);
-                msleep(1000);
+                msleep(10);
                 host->set_param(host, MEMSTICK_POWER, MEMSTICK_POWER_ON);
                 host->set_param(host, MEMSTICK_INTERFACE, MEMSTICK_SERIAL);
 
-                if (memstick_set_rw_addr(card))
-                        return card->current_mrq.error;
-
-                param.system = msb->system;
-
-                card->next_request = h_mspro_block_req_init;
-                msb->mrq_handler = h_mspro_block_default;
-                memstick_init_req(&card->current_mrq, MS_TPC_WRITE_REG, &param,
-                                  sizeof(param));
-                memstick_new_req(host);
-                wait_for_completion(&card->mrq_complete);
-
-                return -EFAULT;
+                rc = memstick_set_rw_addr(card);
+                if (!rc)
+                        rc = mspro_block_set_interface(card, msb->system);
         }
-
-        return 0;
+        return rc;
 }
 
 /* Memory allocated for attributes by this function should be freed by
@@ -1052,16 +1082,18 @@ static int mspro_block_init_card(struct memstick_dev *card)
         if (memstick_set_rw_addr(card))
                 return -EIO;
 
-        if (host->caps & MEMSTICK_CAP_PAR4) {
-                if (mspro_block_switch_to_parallel(card))
-                        printk(KERN_WARNING "%s: could not switch to "
-                               "parallel interface\n", card->dev.bus_id);
-        }
+        msb->caps = host->caps;
+        rc = mspro_block_switch_interface(card);
+        if (rc)
+                return rc;
 
+        msleep(200);
         rc = mspro_block_wait_for_ced(card);
         if (rc)
                 return rc;
         dev_dbg(&card->dev, "card activated\n");
+        if (msb->system != MEMSTICK_SYS_SERIAL)
+                msb->caps |= MEMSTICK_CAP_AUTO_GET_INT;
 
         card->next_request = h_mspro_block_req_init;
         msb->mrq_handler = h_mspro_block_get_ro;
diff --git a/drivers/memstick/host/jmb38x_ms.c b/drivers/memstick/host/jmb38x_ms.c
index 03fe8783b1ee..8770a5fac3b6 100644
--- a/drivers/memstick/host/jmb38x_ms.c
+++ b/drivers/memstick/host/jmb38x_ms.c
@@ -12,6 +12,7 @@
 #include <linux/spinlock.h>
 #include <linux/interrupt.h>
 #include <linux/pci.h>
+#include <linux/dma-mapping.h>
 #include <linux/delay.h>
 #include <linux/highmem.h>
 #include <linux/memstick.h>
@@ -56,8 +57,6 @@ struct jmb38x_ms_host {
         unsigned long           timeout_jiffies;
         struct timer_list       timer;
         struct memstick_request *req;
-        unsigned char           eject:1,
-                                use_dma:1;
         unsigned char           cmd_flags;
         unsigned char           io_pos;
         unsigned int            io_word[2];
@@ -94,9 +93,22 @@ struct jmb38x_ms {
 #define HOST_CONTROL_IF_PAR4   0x1
 #define HOST_CONTROL_IF_PAR8   0x3
 
+#define STATUS_BUSY             0x00080000
+#define STATUS_MS_DAT7          0x00040000
+#define STATUS_MS_DAT6          0x00020000
+#define STATUS_MS_DAT5          0x00010000
+#define STATUS_MS_DAT4          0x00008000
+#define STATUS_MS_DAT3          0x00004000
+#define STATUS_MS_DAT2          0x00002000
+#define STATUS_MS_DAT1          0x00001000
+#define STATUS_MS_DAT0          0x00000800
 #define STATUS_HAS_MEDIA        0x00000400
 #define STATUS_FIFO_EMPTY       0x00000200
 #define STATUS_FIFO_FULL        0x00000100
+#define STATUS_MS_CED           0x00000080
+#define STATUS_MS_ERR           0x00000040
+#define STATUS_MS_BRQ           0x00000020
+#define STATUS_MS_CNK           0x00000001
 
 #define INT_STATUS_TPC_ERR      0x00080000
 #define INT_STATUS_CRC_ERR      0x00040000
@@ -119,11 +131,17 @@ struct jmb38x_ms {
 #define PAD_PU_PD_ON_MS_SOCK0 0x5f8f0000
 #define PAD_PU_PD_ON_MS_SOCK1 0x0f0f0000
 
+#define CLOCK_CONTROL_40MHZ   0x00000001
+#define CLOCK_CONTROL_50MHZ   0x00000002
+#define CLOCK_CONTROL_60MHZ   0x00000008
+#define CLOCK_CONTROL_62_5MHZ 0x0000000c
+#define CLOCK_CONTROL_OFF     0x00000000
+
 enum {
         CMD_READY    = 0x01,
         FIFO_READY   = 0x02,
         REG_DATA     = 0x04,
-        AUTO_GET_INT = 0x08
+        DMA_DATA     = 0x08
 };
 
 static unsigned int jmb38x_ms_read_data(struct jmb38x_ms_host *host,
@@ -273,7 +291,7 @@ static int jmb38x_ms_transfer_data(struct jmb38x_ms_host *host)
 {
         unsigned int length;
         unsigned int off;
-        unsigned int t_size, p_off, p_cnt;
+        unsigned int t_size, p_cnt;
         unsigned char *buf;
         struct page *pg;
         unsigned long flags = 0;
@@ -287,6 +305,8 @@ static int jmb38x_ms_transfer_data(struct jmb38x_ms_host *host)
         }
 
         while (length) {
+                unsigned int uninitialized_var(p_off);
+
                 if (host->req->long_data) {
                         pg = nth_page(sg_page(&host->req->sg),
                                       off >> PAGE_SHIFT);
@@ -364,28 +384,27 @@ static int jmb38x_ms_issue_cmd(struct memstick_host *msh)
                 cmd |= TPC_DIR;
         if (host->req->need_card_int)
                 cmd |= TPC_WAIT_INT;
-        if (host->req->get_int_reg)
-                cmd |= TPC_GET_INT;
 
         data = host->req->data;
 
-        host->use_dma = !no_dma;
+        if (!no_dma)
+                host->cmd_flags |= DMA_DATA;
 
         if (host->req->long_data) {
                 data_len = host->req->sg.length;
         } else {
                 data_len = host->req->data_len;
-                host->use_dma = 0;
+                host->cmd_flags &= ~DMA_DATA;
         }
 
         if (data_len <= 8) {
                 cmd &= ~(TPC_DATA_SEL | 0xf);
                 host->cmd_flags |= REG_DATA;
                 cmd |= data_len & 0xf;
-                host->use_dma = 0;
+                host->cmd_flags &= ~DMA_DATA;
         }
 
-        if (host->use_dma) {
+        if (host->cmd_flags & DMA_DATA) {
                 if (1 != pci_map_sg(host->chip->pdev, &host->req->sg, 1,
                                     host->req->data_dir == READ
                                     ? PCI_DMA_FROMDEVICE
@@ -448,13 +467,12 @@ static void jmb38x_ms_complete_cmd(struct memstick_host *msh, int last)
                 readl(host->addr + INT_STATUS));
         dev_dbg(msh->cdev.dev, "c hstatus %08x\n", readl(host->addr + STATUS));
 
-        if (host->req->get_int_reg) {
-                t_val = readl(host->addr + TPC_P0);
-                host->req->int_reg = (t_val & 0xff);
-        }
+        host->req->int_reg = readl(host->addr + STATUS) & 0xff;
+
+        writel(0, host->addr + BLOCK);
+        writel(0, host->addr + DMA_CONTROL);
 
-        if (host->use_dma) {
-                writel(0, host->addr + DMA_CONTROL);
+        if (host->cmd_flags & DMA_DATA) {
                 pci_unmap_sg(host->chip->pdev, &host->req->sg, 1,
                              host->req->data_dir == READ
                              ? PCI_DMA_FROMDEVICE : PCI_DMA_TODEVICE);
@@ -506,7 +524,7 @@ static irqreturn_t jmb38x_ms_isr(int irq, void *dev_id)
                         else
                                 host->req->error = -ETIME;
                 } else {
-                        if (host->use_dma) {
+                        if (host->cmd_flags & DMA_DATA) {
                                 if (irq_status & INT_STATUS_EOTRAN)
                                         host->cmd_flags |= FIFO_READY;
                         } else {
@@ -595,19 +613,18 @@ static void jmb38x_ms_reset(struct jmb38x_ms_host *host)
 {
         unsigned int host_ctl = readl(host->addr + HOST_CONTROL);
 
-        writel(host_ctl | HOST_CONTROL_RESET_REQ | HOST_CONTROL_RESET,
-               host->addr + HOST_CONTROL);
+        writel(HOST_CONTROL_RESET_REQ, host->addr + HOST_CONTROL);
 
         while (HOST_CONTROL_RESET_REQ
                & (host_ctl = readl(host->addr + HOST_CONTROL))) {
-                ndelay(100);
-                dev_dbg(&host->chip->pdev->dev, "reset\n");
+                ndelay(20);
+                dev_dbg(&host->chip->pdev->dev, "reset %08x\n", host_ctl);
         }
 
-        writel(INT_STATUS_ALL, host->addr + INT_STATUS_ENABLE);
+        writel(HOST_CONTROL_RESET, host->addr + HOST_CONTROL);
+        mmiowb();
         writel(INT_STATUS_ALL, host->addr + INT_SIGNAL_ENABLE);
-
-        dev_dbg(&host->chip->pdev->dev, "reset\n");
+        writel(INT_STATUS_ALL, host->addr + INT_STATUS_ENABLE);
 }
 
 static void jmb38x_ms_set_param(struct memstick_host *msh,
@@ -615,10 +632,8 @@ static void jmb38x_ms_set_param(struct memstick_host *msh,
                                 int value)
 {
         struct jmb38x_ms_host *host = memstick_priv(msh);
-        unsigned int host_ctl;
-        unsigned long flags;
-
-        spin_lock_irqsave(&host->lock, flags);
+        unsigned int host_ctl = readl(host->addr + HOST_CONTROL);
+        unsigned int clock_ctl = CLOCK_CONTROL_40MHZ, clock_delay = 0;
 
         switch (param) {
         case MEMSTICK_POWER:
@@ -626,60 +641,57 @@ static void jmb38x_ms_set_param(struct memstick_host *msh,
                         jmb38x_ms_reset(host);
 
                         writel(host->id ? PAD_PU_PD_ON_MS_SOCK1
-                                          : PAD_PU_PD_ON_MS_SOCK0,
+                                        : PAD_PU_PD_ON_MS_SOCK0,
                                host->addr + PAD_PU_PD);
 
                         writel(PAD_OUTPUT_ENABLE_MS,
                                host->addr + PAD_OUTPUT_ENABLE);
 
-                        host_ctl = readl(host->addr + HOST_CONTROL);
-                        host_ctl |= 7;
-                        writel(host_ctl | (HOST_CONTROL_POWER_EN
-                                           | HOST_CONTROL_CLOCK_EN),
-                               host->addr + HOST_CONTROL);
+                        host_ctl = 7;
+                        host_ctl |= HOST_CONTROL_POWER_EN
+                                 | HOST_CONTROL_CLOCK_EN;
+                        writel(host_ctl, host->addr + HOST_CONTROL);
 
                         dev_dbg(&host->chip->pdev->dev, "power on\n");
                 } else if (value == MEMSTICK_POWER_OFF) {
-                        writel(readl(host->addr + HOST_CONTROL)
-                               & ~(HOST_CONTROL_POWER_EN
-                                   | HOST_CONTROL_CLOCK_EN),
-                               host->addr +  HOST_CONTROL);
+                        host_ctl &= ~(HOST_CONTROL_POWER_EN
+                                      | HOST_CONTROL_CLOCK_EN);
+                        writel(host_ctl, host->addr +  HOST_CONTROL);
                         writel(0, host->addr + PAD_OUTPUT_ENABLE);
                         writel(PAD_PU_PD_OFF, host->addr + PAD_PU_PD);
                         dev_dbg(&host->chip->pdev->dev, "power off\n");
                 }
                 break;
         case MEMSTICK_INTERFACE:
-                /* jmb38x_ms_reset(host); */
-
-                host_ctl = readl(host->addr + HOST_CONTROL);
                 host_ctl &= ~(3 << HOST_CONTROL_IF_SHIFT);
-                /* host_ctl |= 7; */
 
                 if (value == MEMSTICK_SERIAL) {
                         host_ctl &= ~HOST_CONTROL_FAST_CLK;
                         host_ctl |= HOST_CONTROL_IF_SERIAL
                                     << HOST_CONTROL_IF_SHIFT;
                         host_ctl |= HOST_CONTROL_REI;
-                        writel(0, host->addr + CLOCK_DELAY);
+                        clock_ctl = CLOCK_CONTROL_40MHZ;
+                        clock_delay = 0;
                 } else if (value == MEMSTICK_PAR4) {
                         host_ctl |= HOST_CONTROL_FAST_CLK;
                         host_ctl |= HOST_CONTROL_IF_PAR4
                                     << HOST_CONTROL_IF_SHIFT;
                         host_ctl &= ~HOST_CONTROL_REI;
-                        writel(4, host->addr + CLOCK_DELAY);
+                        clock_ctl = CLOCK_CONTROL_40MHZ;
+                        clock_delay = 4;
                 } else if (value == MEMSTICK_PAR8) {
                         host_ctl |= HOST_CONTROL_FAST_CLK;
                         host_ctl |= HOST_CONTROL_IF_PAR8
                                     << HOST_CONTROL_IF_SHIFT;
                         host_ctl &= ~HOST_CONTROL_REI;
-                        writel(4, host->addr + CLOCK_DELAY);
+                        clock_ctl = CLOCK_CONTROL_60MHZ;
+                        clock_delay = 0;
                 }
                 writel(host_ctl, host->addr + HOST_CONTROL);
+                writel(clock_ctl, host->addr + CLOCK_CONTROL);
+                writel(clock_delay, host->addr + CLOCK_DELAY);
                 break;
         };
-
-        spin_unlock_irqrestore(&host->lock, flags);
 }
 
 #ifdef CONFIG_PM
@@ -772,13 +784,10 @@ static struct memstick_host *jmb38x_ms_alloc_host(struct jmb38x_ms *jm, int cnt)
         snprintf(host->host_id, DEVICE_ID_SIZE, DRIVER_NAME ":slot%d",
                  host->id);
         host->irq = jm->pdev->irq;
-        host->timeout_jiffies = msecs_to_jiffies(4000);
+        host->timeout_jiffies = msecs_to_jiffies(1000);
         msh->request = jmb38x_ms_request;
         msh->set_param = jmb38x_ms_set_param;
-        /*
-        msh->caps = MEMSTICK_CAP_AUTO_GET_INT | MEMSTICK_CAP_PAR4
-                    | MEMSTICK_CAP_PAR8;
-        */
+
         msh->caps = MEMSTICK_CAP_PAR4 | MEMSTICK_CAP_PAR8;
 
         setup_timer(&host->timer, jmb38x_ms_abort, (unsigned long)msh);
diff --git a/drivers/memstick/host/tifm_ms.c b/drivers/memstick/host/tifm_ms.c
index 2b5bf52a8302..8577de4ebb0e 100644
--- a/drivers/memstick/host/tifm_ms.c
+++ b/drivers/memstick/host/tifm_ms.c
@@ -182,7 +182,7 @@ static unsigned int tifm_ms_transfer_data(struct tifm_ms *host)
         struct tifm_dev *sock = host->dev;
         unsigned int length;
         unsigned int off;
-        unsigned int t_size, p_off, p_cnt;
+        unsigned int t_size, p_cnt;
         unsigned char *buf;
         struct page *pg;
         unsigned long flags = 0;
@@ -198,6 +198,8 @@ static unsigned int tifm_ms_transfer_data(struct tifm_ms *host)
                 host->block_pos);
 
         while (length) {
+                unsigned int uninitialized_var(p_off);
+
                 if (host->req->long_data) {
                         pg = nth_page(sg_page(&host->req->sg),
                                       off >> PAGE_SHIFT);
@@ -340,11 +342,20 @@ static void tifm_ms_complete_cmd(struct tifm_ms *host)
 
         del_timer(&host->timer);
 
-        if (host->use_dma)
+        host->req->int_reg = readl(sock->addr + SOCK_MS_STATUS) & 0xff;
+        host->req->int_reg = (host->req->int_reg & 1)
+                             | ((host->req->int_reg << 4) & 0xe0);
+
+        writel(TIFM_FIFO_INT_SETALL,
+               sock->addr + SOCK_DMA_FIFO_INT_ENABLE_CLEAR);
+        writel(TIFM_DMA_RESET, sock->addr + SOCK_DMA_CONTROL);
+
+        if (host->use_dma) {
                 tifm_unmap_sg(sock, &host->req->sg, 1,
                               host->req->data_dir == READ
                               ? PCI_DMA_FROMDEVICE
                               : PCI_DMA_TODEVICE);
+        }
 
         writel((~TIFM_CTRL_LED) & readl(sock->addr + SOCK_CONTROL),
                sock->addr + SOCK_CONTROL);
@@ -424,12 +435,6 @@ static void tifm_ms_card_event(struct tifm_dev *sock)
                 else if (host_status & TIFM_MS_STAT_CRC)
                         host->req->error = -EILSEQ;
 
-                if (host->req->error) {
-                        writel(TIFM_FIFO_INT_SETALL,
-                               sock->addr + SOCK_DMA_FIFO_INT_ENABLE_CLEAR);
-                        writel(TIFM_DMA_RESET, sock->addr + SOCK_DMA_CONTROL);
-                }
-
                 if (host_status & TIFM_MS_STAT_RDY)
                         host->cmd_flags |= CMD_READY;
 
diff --git a/drivers/message/fusion/mptbase.c b/drivers/message/fusion/mptbase.c
index 6b6df8679585..c6be6eba7dc3 100644
--- a/drivers/message/fusion/mptbase.c
+++ b/drivers/message/fusion/mptbase.c
@@ -1430,6 +1430,98 @@ mpt_get_product_name(u16 vendor, u16 device, u8 revision, char *prod_name)
                 sprintf(prod_name, "%s", product_str);
 }
 
+/**
+ *      mpt_mapresources - map in memory mapped io
+ *      @ioc: Pointer to pointer to IOC adapter
+ *
+ **/
+static int
+mpt_mapresources(MPT_ADAPTER *ioc)
+{
+        u8              __iomem *mem;
+        int              ii;
+        unsigned long    mem_phys;
+        unsigned long    port;
+        u32              msize;
+        u32              psize;
+        u8               revision;
+        int              r = -ENODEV;
+        struct pci_dev *pdev;
+
+        pdev = ioc->pcidev;
+        ioc->bars = pci_select_bars(pdev, IORESOURCE_MEM);
+        if (pci_enable_device_mem(pdev)) {
+                printk(MYIOC_s_ERR_FMT "pci_enable_device_mem() "
+                    "failed\n", ioc->name);
+                return r;
+        }
+        if (pci_request_selected_regions(pdev, ioc->bars, "mpt")) {
+                printk(MYIOC_s_ERR_FMT "pci_request_selected_regions() with "
+                    "MEM failed\n", ioc->name);
+                return r;
+        }
+
+        pci_read_config_byte(pdev, PCI_CLASS_REVISION, &revision);
+
+        if (!pci_set_dma_mask(pdev, DMA_64BIT_MASK)
+            && !pci_set_consistent_dma_mask(pdev, DMA_64BIT_MASK)) {
+                dinitprintk(ioc, printk(MYIOC_s_INFO_FMT
+                    ": 64 BIT PCI BUS DMA ADDRESSING SUPPORTED\n",
+                    ioc->name));
+        } else if (!pci_set_dma_mask(pdev, DMA_32BIT_MASK)
+            && !pci_set_consistent_dma_mask(pdev, DMA_32BIT_MASK)) {
+                dinitprintk(ioc, printk(MYIOC_s_INFO_FMT
+                    ": 32 BIT PCI BUS DMA ADDRESSING SUPPORTED\n",
+                    ioc->name));
+        } else {
+                printk(MYIOC_s_WARN_FMT "no suitable DMA mask for %s\n",
+                    ioc->name, pci_name(pdev));
+                pci_release_selected_regions(pdev, ioc->bars);
+                return r;
+        }
+
+        mem_phys = msize = 0;
+        port = psize = 0;
+        for (ii = 0; ii < DEVICE_COUNT_RESOURCE; ii++) {
+                if (pci_resource_flags(pdev, ii) & PCI_BASE_ADDRESS_SPACE_IO) {
+                        if (psize)
+                                continue;
+                        /* Get I/O space! */
+                        port = pci_resource_start(pdev, ii);
+                        psize = pci_resource_len(pdev, ii);
+                } else {
+                        if (msize)
+                                continue;
+                        /* Get memmap */
+                        mem_phys = pci_resource_start(pdev, ii);
+                        msize = pci_resource_len(pdev, ii);
+                }
+        }
+        ioc->mem_size = msize;
+
+        mem = NULL;
+        /* Get logical ptr for PciMem0 space */
+        /*mem = ioremap(mem_phys, msize);*/
+        mem = ioremap(mem_phys, msize);
+        if (mem == NULL) {
+                printk(MYIOC_s_ERR_FMT ": ERROR - Unable to map adapter"
+                        " memory!\n", ioc->name);
+                return -EINVAL;
+        }
+        ioc->memmap = mem;
+        dinitprintk(ioc, printk(MYIOC_s_INFO_FMT "mem = %p, mem_phys = %lx\n",
+            ioc->name, mem, mem_phys));
+
+        ioc->mem_phys = mem_phys;
+        ioc->chip = (SYSIF_REGS __iomem *)mem;
+
+        /* Save Port IO values in case we need to do downloadboot */
+        ioc->pio_mem_phys = port;
+        ioc->pio_chip = (SYSIF_REGS __iomem *)port;
+
+        return 0;
+}
+
 /*=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=*/
 /**
  *      mpt_attach - Install a PCI intelligent MPT adapter.
@@ -1452,13 +1544,6 @@ int
 mpt_attach(struct pci_dev *pdev, const struct pci_device_id *id)
 {
         MPT_ADAPTER     *ioc;
-        u8              __iomem *mem;
-        u8              __iomem *pmem;
-        unsigned long    mem_phys;
-        unsigned long    port;
-        u32              msize;
-        u32              psize;
-        int              ii;
         u8               cb_idx;
         int              r = -ENODEV;
         u8               revision;
@@ -1468,52 +1553,32 @@ mpt_attach(struct pci_dev *pdev, const struct pci_device_id *id)
         struct proc_dir_entry *dent, *ent;
 #endif
 
-        if (mpt_debug_level)
-                printk(KERN_INFO MYNAM ": mpt_debug_level=%xh\n", mpt_debug_level);
-
         ioc = kzalloc(sizeof(MPT_ADAPTER), GFP_ATOMIC);
         if (ioc == NULL) {
                 printk(KERN_ERR MYNAM ": ERROR - Insufficient memory to add adapter!\n");
                 return -ENOMEM;
         }
-        ioc->debug_level = mpt_debug_level;
+
         ioc->id = mpt_ids++;
         sprintf(ioc->name, "ioc%d", ioc->id);
 
-        ioc->bars = pci_select_bars(pdev, IORESOURCE_MEM);
-        if (pci_enable_device_mem(pdev)) {
-                printk(MYIOC_s_ERR_FMT "pci_enable_device_mem() "
-                       "failed\n", ioc->name);
-                kfree(ioc);
-                return r;
-        }
-        if (pci_request_selected_regions(pdev, ioc->bars, "mpt")) {
-                printk(MYIOC_s_ERR_FMT "pci_request_selected_regions() with "
-                       "MEM failed\n", ioc->name);
-                kfree(ioc);
-                return r;
-        }
+        /*
+         * set initial debug level
+         * (refer to mptdebug.h)
+         *
+         */
+        ioc->debug_level = mpt_debug_level;
+        if (mpt_debug_level)
+                printk(KERN_INFO "mpt_debug_level=%xh\n", mpt_debug_level);
 
         dinitprintk(ioc, printk(MYIOC_s_INFO_FMT ": mpt_adapter_install\n", ioc->name));
 
-        if (!pci_set_dma_mask(pdev, DMA_64BIT_MASK)) {
-                dprintk(ioc, printk(MYIOC_s_INFO_FMT
-                        ": 64 BIT PCI BUS DMA ADDRESSING SUPPORTED\n", ioc->name));
-        } else if (pci_set_dma_mask(pdev, DMA_32BIT_MASK)) {
-                printk(MYIOC_s_WARN_FMT ": 32 BIT PCI BUS DMA ADDRESSING NOT SUPPORTED\n",
-                    ioc->name);
+        ioc->pcidev = pdev;
+        if (mpt_mapresources(ioc)) {
                 kfree(ioc);
                 return r;
         }
 
-        if (!pci_set_consistent_dma_mask(pdev, DMA_64BIT_MASK)) {
-                dprintk(ioc, printk(MYIOC_s_INFO_FMT
-                        ": Using 64 bit consistent mask\n", ioc->name));
-        } else {
-                dprintk(ioc, printk(MYIOC_s_INFO_FMT
-                        ": Not using 64 bit consistent mask\n", ioc->name));
-        }
-
         ioc->alloc_total = sizeof(MPT_ADAPTER);
         ioc->req_sz = MPT_DEFAULT_FRAME_SIZE;           /* avoid div by zero! */
         ioc->reply_sz = MPT_REPLY_FRAME_SIZE;
@@ -1551,48 +1616,9 @@ mpt_attach(struct pci_dev *pdev, const struct pci_device_id *id)
         /* Find lookup slot. */
         INIT_LIST_HEAD(&ioc->list);
 
-        mem_phys = msize = 0;
-        port = psize = 0;
-        for (ii=0; ii < DEVICE_COUNT_RESOURCE; ii++) {
-                if (pci_resource_flags(pdev, ii) & PCI_BASE_ADDRESS_SPACE_IO) {
-                        if (psize)
-                                continue;
-                        /* Get I/O space! */
-                        port = pci_resource_start(pdev, ii);
-                        psize = pci_resource_len(pdev,ii);
-                } else {
-                        if (msize)
-                                continue;
-                        /* Get memmap */
-                        mem_phys = pci_resource_start(pdev, ii);
-                        msize = pci_resource_len(pdev,ii);
-                }
-        }
-        ioc->mem_size = msize;
-
-        mem = NULL;
-        /* Get logical ptr for PciMem0 space */
-        /*mem = ioremap(mem_phys, msize);*/
-        mem = ioremap(mem_phys, msize);
-        if (mem == NULL) {
-                printk(MYIOC_s_ERR_FMT "Unable to map adapter memory!\n", ioc->name);
-                kfree(ioc);
-                return -EINVAL;
-        }
-        ioc->memmap = mem;
-        dinitprintk(ioc, printk(MYIOC_s_INFO_FMT "mem = %p, mem_phys = %lx\n", ioc->name, mem, mem_phys));
-
         dinitprintk(ioc, printk(MYIOC_s_INFO_FMT "facts @ %p, pfacts[0] @ %p\n",
             ioc->name, &ioc->facts, &ioc->pfacts[0]));
 
-        ioc->mem_phys = mem_phys;
-        ioc->chip = (SYSIF_REGS __iomem *)mem;
-
-        /* Save Port IO values in case we need to do downloadboot */
-        ioc->pio_mem_phys = port;
-        pmem = (u8 __iomem *)port;
-        ioc->pio_chip = (SYSIF_REGS __iomem *)pmem;
-
         pci_read_config_byte(pdev, PCI_CLASS_REVISION, &revision);
         mpt_get_product_name(pdev->vendor, pdev->device, revision, ioc->prod_name);
 
@@ -1688,7 +1714,9 @@ mpt_attach(struct pci_dev *pdev, const struct pci_device_id *id)
                 list_del(&ioc->list);
                 if (ioc->alt_ioc)
                         ioc->alt_ioc->alt_ioc = NULL;
-                iounmap(mem);
+                iounmap(ioc->memmap);
+                if (r != -5)
+                        pci_release_selected_regions(pdev, ioc->bars);
                 kfree(ioc);
                 pci_set_drvdata(pdev, NULL);
                 return r;
@@ -1784,13 +1812,10 @@ mpt_suspend(struct pci_dev *pdev, pm_message_t state)
         u32 device_state;
         MPT_ADAPTER *ioc = pci_get_drvdata(pdev);
 
-        device_state=pci_choose_state(pdev, state);
-
-        printk(MYIOC_s_INFO_FMT
-        "pci-suspend: pdev=0x%p, slot=%s, Entering operating state [D%d]\n",
-                ioc->name, pdev, pci_name(pdev), device_state);
-
-        pci_save_state(pdev);
+        device_state = pci_choose_state(pdev, state);
+        printk(MYIOC_s_INFO_FMT "pci-suspend: pdev=0x%p, slot=%s, Entering "
+            "operating state [D%d]\n", ioc->name, pdev, pci_name(pdev),
+            device_state);
 
         /* put ioc into READY_STATE */
         if(SendIocReset(ioc, MPI_FUNCTION_IOC_MESSAGE_UNIT_RESET, CAN_SLEEP)) {
@@ -1805,10 +1830,14 @@ mpt_suspend(struct pci_dev *pdev, pm_message_t state)
         /* Clear any lingering interrupt */
         CHIPREG_WRITE32(&ioc->chip->IntStatus, 0);
 
+        free_irq(ioc->pci_irq, ioc);
+        if (mpt_msi_enable)
+                pci_disable_msi(ioc->pcidev);
+        ioc->pci_irq = -1;
+        pci_save_state(pdev);
         pci_disable_device(pdev);
         pci_release_selected_regions(pdev, ioc->bars);
         pci_set_power_state(pdev, device_state);
-
         return 0;
 }
 
@@ -1823,48 +1852,54 @@ mpt_resume(struct pci_dev *pdev)
         MPT_ADAPTER *ioc = pci_get_drvdata(pdev);
         u32 device_state = pdev->current_state;
         int recovery_state;
+        int err;
 
-        printk(MYIOC_s_INFO_FMT
-        "pci-resume: pdev=0x%p, slot=%s, Previous operating state [D%d]\n",
-                ioc->name, pdev, pci_name(pdev), device_state);
+        printk(MYIOC_s_INFO_FMT "pci-resume: pdev=0x%p, slot=%s, Previous "
+            "operating state [D%d]\n", ioc->name, pdev, pci_name(pdev),
+            device_state);
 
-        pci_set_power_state(pdev, 0);
+        pci_set_power_state(pdev, PCI_D0);
+        pci_enable_wake(pdev, PCI_D0, 0);
         pci_restore_state(pdev);
-        if (ioc->facts.Flags & MPI_IOCFACTS_FLAGS_FW_DOWNLOAD_BOOT) {
-                ioc->bars = pci_select_bars(ioc->pcidev, IORESOURCE_MEM |
-                        IORESOURCE_IO);
-                if (pci_enable_device(pdev))
-                        return 0;
-        } else {
-                ioc->bars = pci_select_bars(pdev, IORESOURCE_MEM);
-                if (pci_enable_device_mem(pdev))
-                        return 0;
-        }
-        if (pci_request_selected_regions(pdev, ioc->bars, "mpt"))
-                return 0;
+        ioc->pcidev = pdev;
+        err = mpt_mapresources(ioc);
+        if (err)
+                return err;
 
-        /* enable interrupts */
-        CHIPREG_WRITE32(&ioc->chip->IntMask, MPI_HIM_DIM);
-        ioc->active = 1;
+        printk(MYIOC_s_INFO_FMT "pci-resume: ioc-state=0x%x,doorbell=0x%x\n",
+            ioc->name, (mpt_GetIocState(ioc, 1) >> MPI_IOC_STATE_SHIFT),
+            CHIPREG_READ32(&ioc->chip->Doorbell));
 
-        printk(MYIOC_s_INFO_FMT
-                "pci-resume: ioc-state=0x%x,doorbell=0x%x\n",
-                ioc->name,
-                (mpt_GetIocState(ioc, 1) >> MPI_IOC_STATE_SHIFT),
-                CHIPREG_READ32(&ioc->chip->Doorbell));
+        /*
+         * Errata workaround for SAS pci express:
+         * Upon returning to the D0 state, the contents of the doorbell will be
+         * stale data, and this will incorrectly signal to the host driver that
+         * the firmware is ready to process mpt commands.   The workaround is
+         * to issue a diagnostic reset.
+         */
+        if (ioc->bus_type == SAS && (pdev->device ==
+            MPI_MANUFACTPAGE_DEVID_SAS1068E || pdev->device ==
+            MPI_MANUFACTPAGE_DEVID_SAS1064E)) {
+                if (KickStart(ioc, 1, CAN_SLEEP) < 0) {
+                        printk(MYIOC_s_WARN_FMT "pci-resume: Cannot recover\n",
+                            ioc->name);
+                        goto out;
+                }
+        }
 
         /* bring ioc to operational state */
-        if ((recovery_state = mpt_do_ioc_recovery(ioc,
-            MPT_HOSTEVENT_IOC_RECOVER, CAN_SLEEP)) != 0) {
-                printk(MYIOC_s_INFO_FMT
-                        "pci-resume: Cannot recover, error:[%x]\n",
-                        ioc->name, recovery_state);
-        } else {
+        printk(MYIOC_s_INFO_FMT "Sending mpt_do_ioc_recovery\n", ioc->name);
+        recovery_state = mpt_do_ioc_recovery(ioc, MPT_HOSTEVENT_IOC_BRINGUP,
+                                                 CAN_SLEEP);
+        if (recovery_state != 0)
+                printk(MYIOC_s_WARN_FMT "pci-resume: Cannot recover, "
+                    "error:[%x]\n", ioc->name, recovery_state);
+        else
                 printk(MYIOC_s_INFO_FMT
-                        "pci-resume: success\n", ioc->name);
-        }
-
+                    "pci-resume: success\n", ioc->name);
+ out:
         return 0;
+
 }
 #endif
 
@@ -1903,6 +1938,7 @@ mpt_signal_reset(u8 index, MPT_ADAPTER *ioc, int reset_phase)
  *              -3 if READY but PrimeIOCFifos Failed
  *              -4 if READY but IOCInit Failed
  *              -5 if failed to enable_device and/or request_selected_regions
+ *              -6 if failed to upload firmware
  */
 static int
 mpt_do_ioc_recovery(MPT_ADAPTER *ioc, u32 reason, int sleepFlag)
@@ -2097,7 +2133,7 @@ mpt_do_ioc_recovery(MPT_ADAPTER *ioc, u32 reason, int sleepFlag)
                                 } else {
                                         printk(MYIOC_s_WARN_FMT
                                             "firmware upload failure!\n", ioc->name);
-                                        ret = -5;
+                                        ret = -6;
                                 }
                         }
                 }
diff --git a/drivers/message/fusion/mptscsih.c b/drivers/message/fusion/mptscsih.c
index 0c252f60c4c1..c207bda6723b 100644
--- a/drivers/message/fusion/mptscsih.c
+++ b/drivers/message/fusion/mptscsih.c
@@ -1170,6 +1170,10 @@ mptscsih_shutdown(struct pci_dev *pdev)
 int
 mptscsih_suspend(struct pci_dev *pdev, pm_message_t state)
 {
+        MPT_ADAPTER             *ioc = pci_get_drvdata(pdev);
+
+        scsi_block_requests(ioc->sh);
+        flush_scheduled_work();
         mptscsih_shutdown(pdev);
         return mpt_suspend(pdev,state);
 }
@@ -1183,7 +1187,12 @@ mptscsih_suspend(struct pci_dev *pdev, pm_message_t state)
 int
 mptscsih_resume(struct pci_dev *pdev)
 {
-        return mpt_resume(pdev);
+        MPT_ADAPTER             *ioc = pci_get_drvdata(pdev);
+        int rc;
+
+        rc = mpt_resume(pdev);
+        scsi_unblock_requests(ioc->sh);
+        return rc;
 }
 
 #endif
diff --git a/drivers/mfd/asic3.c b/drivers/mfd/asic3.c
index 63fb1ff3ad10..f6f2d960cadb 100644
--- a/drivers/mfd/asic3.c
+++ b/drivers/mfd/asic3.c
@@ -28,14 +28,14 @@
 static inline void asic3_write_register(struct asic3 *asic,
                                  unsigned int reg, u32 value)
 {
-        iowrite16(value, (unsigned long)asic->mapping +
+        iowrite16(value, asic->mapping +
                   (reg >> asic->bus_shift));
 }
 
 static inline u32 asic3_read_register(struct asic3 *asic,
                                unsigned int reg)
 {
-        return ioread16((unsigned long)asic->mapping +
+        return ioread16(asic->mapping +
                         (reg >> asic->bus_shift));
 }
 
diff --git a/drivers/misc/Kconfig b/drivers/misc/Kconfig
index 982e27b86d10..962817e49fba 100644
--- a/drivers/misc/Kconfig
+++ b/drivers/misc/Kconfig
@@ -108,6 +108,7 @@ config ACER_WMI
         depends on ACPI
         depends on LEDS_CLASS
         depends on BACKLIGHT_CLASS_DEVICE
+        depends on SERIO_I8042
         select ACPI_WMI
         ---help---
           This is a driver for newer Acer (and Wistron) laptops. It adds
diff --git a/drivers/misc/acer-wmi.c b/drivers/misc/acer-wmi.c
index 74d12b4a3abd..dd13a3749927 100644
--- a/drivers/misc/acer-wmi.c
+++ b/drivers/misc/acer-wmi.c
@@ -219,6 +219,15 @@ static struct dmi_system_id acer_quirks[] = {
         },
         {
                 .callback = dmi_matched,
+                .ident = "Acer Aspire 3610",
+                .matches = {
+                        DMI_MATCH(DMI_SYS_VENDOR, "Acer"),
+                        DMI_MATCH(DMI_PRODUCT_NAME, "Aspire 3610"),
+                },
+                .driver_data = &quirk_acer_travelmate_2490,
+        },
+        {
+                .callback = dmi_matched,
                 .ident = "Acer Aspire 5100",
                 .matches = {
                         DMI_MATCH(DMI_SYS_VENDOR, "Acer"),
@@ -228,6 +237,15 @@ static struct dmi_system_id acer_quirks[] = {
         },
         {
                 .callback = dmi_matched,
+                .ident = "Acer Aspire 5610",
+                .matches = {
+                        DMI_MATCH(DMI_SYS_VENDOR, "Acer"),
+                        DMI_MATCH(DMI_PRODUCT_NAME, "Aspire 5610"),
+                },
+                .driver_data = &quirk_acer_travelmate_2490,
+        },
+        {
+                .callback = dmi_matched,
                 .ident = "Acer Aspire 5630",
                 .matches = {
                         DMI_MATCH(DMI_SYS_VENDOR, "Acer"),
@@ -761,11 +779,11 @@ enum led_brightness value)
 }
 
 static struct led_classdev mail_led = {
-        .name = "acer-mail:green",
+        .name = "acer-wmi::mail",
         .brightness_set = mail_led_set,
 };
 
-static int __init acer_led_init(struct device *dev)
+static int __devinit acer_led_init(struct device *dev)
 {
         return led_classdev_register(dev, &mail_led);
 }
@@ -798,7 +816,7 @@ static struct backlight_ops acer_bl_ops = {
         .update_status = update_bl_status,
 };
 
-static int __init acer_backlight_init(struct device *dev)
+static int __devinit acer_backlight_init(struct device *dev)
 {
         struct backlight_device *bd;
 
@@ -817,7 +835,7 @@ static int __init acer_backlight_init(struct device *dev)
         return 0;
 }
 
-static void __exit acer_backlight_exit(void)
+static void acer_backlight_exit(void)
 {
         backlight_device_unregister(acer_backlight_device);
 }
@@ -1052,11 +1070,12 @@ static int __init acer_wmi_init(void)
 
         if (wmi_has_guid(WMID_GUID2) && interface) {
                 if (ACPI_FAILURE(WMID_set_capabilities())) {
-                        printk(ACER_ERR "Unable to detect available devices\n");
+                        printk(ACER_ERR "Unable to detect available WMID "
+                                        "devices\n");
                         return -ENODEV;
                 }
         } else if (!wmi_has_guid(WMID_GUID2) && interface) {
-                printk(ACER_ERR "Unable to detect available devices\n");
+                printk(ACER_ERR "No WMID device detection method found\n");
                 return -ENODEV;
         }
 
@@ -1064,21 +1083,20 @@ static int __init acer_wmi_init(void)
                 interface = &AMW0_interface;
 
                 if (ACPI_FAILURE(AMW0_set_capabilities())) {
-                        printk(ACER_ERR "Unable to detect available devices\n");
+                        printk(ACER_ERR "Unable to detect available AMW0 "
+                                        "devices\n");
                         return -ENODEV;
                 }
         }
 
-        if (wmi_has_guid(AMW0_GUID1)) {
-                if (ACPI_FAILURE(AMW0_find_mailled()))
-                        printk(ACER_ERR "Unable to detect mail LED\n");
-        }
+        if (wmi_has_guid(AMW0_GUID1))
+                AMW0_find_mailled();
 
         find_quirks();
 
         if (!interface) {
-                printk(ACER_ERR "No or unsupported WMI interface, unable to ");
-                printk(KERN_CONT "load.\n");
+                printk(ACER_ERR "No or unsupported WMI interface, unable to "
+                                "load\n");
                 return -ENODEV;
         }
 
diff --git a/drivers/misc/fujitsu-laptop.c b/drivers/misc/fujitsu-laptop.c
index 1cfd7f3f1294..e2e7c05a147b 100644
--- a/drivers/misc/fujitsu-laptop.c
+++ b/drivers/misc/fujitsu-laptop.c
@@ -231,7 +231,7 @@ static int acpi_fujitsu_remove(struct acpi_device *device, int type)
 
         if (!device || !acpi_driver_data(device))
                 return -EINVAL;
-        fujitsu->acpi_handle = 0;
+        fujitsu->acpi_handle = NULL;
 
         return 0;
 }
diff --git a/drivers/misc/ibmasm/module.c b/drivers/misc/ibmasm/module.c
index 4f9d4a9da983..b5f6add34b0b 100644
--- a/drivers/misc/ibmasm/module.c
+++ b/drivers/misc/ibmasm/module.c
@@ -106,7 +106,7 @@ static int __devinit ibmasm_init_one(struct pci_dev *pdev, const struct pci_devi
         sp->irq = pdev->irq;
         sp->base_address = ioremap(pci_resource_start(pdev, 0),
                                         pci_resource_len(pdev, 0));
-        if (sp->base_address == 0) {
+        if (!sp->base_address) {
                 dev_err(sp->dev, "Failed to ioremap pci memory\n");
                 result =  -ENODEV;
                 goto error_ioremap;
diff --git a/drivers/misc/lkdtm.c b/drivers/misc/lkdtm.c
index c884730c5eaf..1bfe5d16963b 100644
--- a/drivers/misc/lkdtm.c
+++ b/drivers/misc/lkdtm.c
@@ -197,7 +197,7 @@ static int lkdtm_parse_commandline(void)
 {
         int i;
 
-        if (cpoint_name == INVALID || cpoint_type == NONE ||
+        if (cpoint_name == NULL || cpoint_type == NULL ||
                                         cpoint_count < 1 || recur_count < 1)
                 return -EINVAL;
 
diff --git a/drivers/misc/sony-laptop.c b/drivers/misc/sony-laptop.c
index 899e3f75f288..02ff3d19b1cc 100644
--- a/drivers/misc/sony-laptop.c
+++ b/drivers/misc/sony-laptop.c
@@ -315,7 +315,7 @@ static void sony_laptop_report_input_event(u8 event)
                 break;
 
         default:
-                if (event > ARRAY_SIZE(sony_laptop_input_index)) {
+                if (event >= ARRAY_SIZE(sony_laptop_input_index)) {
                         dprintk("sony_laptop_report_input_event, event not known: %d\n", event);
                         break;
                 }
diff --git a/drivers/mmc/core/Makefile b/drivers/mmc/core/Makefile
index 4985807257a8..19a1a254a0c5 100644
--- a/drivers/mmc/core/Makefile
+++ b/drivers/mmc/core/Makefile
@@ -7,7 +7,7 @@ ifeq ($(CONFIG_MMC_DEBUG),y)
 endif
 
 obj-$(CONFIG_MMC)               += mmc_core.o
-mmc_core-y                      := core.o sysfs.o bus.o host.o \
+mmc_core-y                      := core.o bus.o host.o \
                                    mmc.o mmc_ops.o sd.o sd_ops.o \
                                    sdio.o sdio_ops.o sdio_bus.o \
                                    sdio_cis.o sdio_io.o sdio_irq.o
diff --git a/drivers/mmc/core/bus.c b/drivers/mmc/core/bus.c
index b0c22cad9423..fd95b18e988b 100644
--- a/drivers/mmc/core/bus.c
+++ b/drivers/mmc/core/bus.c
@@ -17,7 +17,6 @@
 #include <linux/mmc/card.h>
 #include <linux/mmc/host.h>
 
-#include "sysfs.h"
 #include "core.h"
 #include "sdio_cis.h"
 #include "bus.h"
@@ -43,7 +42,7 @@ static ssize_t mmc_type_show(struct device *dev,
 }
 
 static struct device_attribute mmc_dev_attrs[] = {
-        MMC_ATTR_RO(type),
+        __ATTR(type, S_IRUGO, mmc_type_show, NULL),
         __ATTR_NULL,
 };
 
@@ -189,7 +188,7 @@ static void mmc_release_card(struct device *dev)
 /*
  * Allocate and initialise a new MMC card structure.
  */
-struct mmc_card *mmc_alloc_card(struct mmc_host *host)
+struct mmc_card *mmc_alloc_card(struct mmc_host *host, struct device_type *type)
 {
         struct mmc_card *card;
 
@@ -204,6 +203,7 @@ struct mmc_card *mmc_alloc_card(struct mmc_host *host)
         card->dev.parent = mmc_classdev(host);
         card->dev.bus = &mmc_bus_type;
         card->dev.release = mmc_release_card;
+        card->dev.type = type;
 
         return card;
 }
@@ -248,24 +248,10 @@ int mmc_add_card(struct mmc_card *card)
                         type, card->rca);
         }
 
-        card->dev.uevent_suppress = 1;
-
         ret = device_add(&card->dev);
         if (ret)
                 return ret;
 
-        if (card->host->bus_ops->sysfs_add) {
-                ret = card->host->bus_ops->sysfs_add(card->host, card);
-                if (ret) {
-                        device_del(&card->dev);
-                        return ret;
-                 }
-        }
-
-        card->dev.uevent_suppress = 0;
-
-        kobject_uevent(&card->dev.kobj, KOBJ_ADD);
-
         mmc_card_set_present(card);
 
         return 0;
@@ -285,9 +271,6 @@ void mmc_remove_card(struct mmc_card *card)
                         printk(KERN_INFO "%s: card %04x removed\n",
                                 mmc_hostname(card->host), card->rca);
                 }
-
-                if (card->host->bus_ops->sysfs_remove)
-                        card->host->bus_ops->sysfs_remove(card->host, card);
                 device_del(&card->dev);
         }
 
diff --git a/drivers/mmc/core/bus.h b/drivers/mmc/core/bus.h
index 4f35431116a8..18178766ab46 100644
--- a/drivers/mmc/core/bus.h
+++ b/drivers/mmc/core/bus.h
@@ -11,7 +11,16 @@
 #ifndef _MMC_CORE_BUS_H
 #define _MMC_CORE_BUS_H
 
-struct mmc_card *mmc_alloc_card(struct mmc_host *host);
+#define MMC_DEV_ATTR(name, fmt, args...)                                        \
+static ssize_t mmc_##name##_show (struct device *dev, struct device_attribute *attr, char *buf) \
+{                                                                               \
+        struct mmc_card *card = container_of(dev, struct mmc_card, dev);        \
+        return sprintf(buf, fmt, args);                                         \
+}                                                                               \
+static DEVICE_ATTR(name, S_IRUGO, mmc_##name##_show, NULL)
+
+struct mmc_card *mmc_alloc_card(struct mmc_host *host,
+        struct device_type *type);
 int mmc_add_card(struct mmc_card *card);
 void mmc_remove_card(struct mmc_card *card);
 
diff --git a/drivers/mmc/core/core.h b/drivers/mmc/core/core.h
index 39daf2fb5dc4..cfa8e15b5923 100644
--- a/drivers/mmc/core/core.h
+++ b/drivers/mmc/core/core.h
@@ -18,8 +18,6 @@
 struct mmc_bus_ops {
         void (*remove)(struct mmc_host *);
         void (*detect)(struct mmc_host *);
-        int (*sysfs_add)(struct mmc_host *, struct mmc_card *card);
-        void (*sysfs_remove)(struct mmc_host *, struct mmc_card *card);
         void (*suspend)(struct mmc_host *);
         void (*resume)(struct mmc_host *);
 };
diff --git a/drivers/mmc/core/mmc.c b/drivers/mmc/core/mmc.c
index 68c0e3b2f0e8..3da29eef8f7d 100644
--- a/drivers/mmc/core/mmc.c
+++ b/drivers/mmc/core/mmc.c
@@ -17,7 +17,6 @@
 #include <linux/mmc/mmc.h>
 
 #include "core.h"
-#include "sysfs.h"
 #include "bus.h"
 #include "mmc_ops.h"
 
@@ -248,6 +247,44 @@ out:
         return err;
 }
 
+MMC_DEV_ATTR(cid, "%08x%08x%08x%08x\n", card->raw_cid[0], card->raw_cid[1],
+        card->raw_cid[2], card->raw_cid[3]);
+MMC_DEV_ATTR(csd, "%08x%08x%08x%08x\n", card->raw_csd[0], card->raw_csd[1],
+        card->raw_csd[2], card->raw_csd[3]);
+MMC_DEV_ATTR(date, "%02d/%04d\n", card->cid.month, card->cid.year);
+MMC_DEV_ATTR(fwrev, "0x%x\n", card->cid.fwrev);
+MMC_DEV_ATTR(hwrev, "0x%x\n", card->cid.hwrev);
+MMC_DEV_ATTR(manfid, "0x%06x\n", card->cid.manfid);
+MMC_DEV_ATTR(name, "%s\n", card->cid.prod_name);
+MMC_DEV_ATTR(oemid, "0x%04x\n", card->cid.oemid);
+MMC_DEV_ATTR(serial, "0x%08x\n", card->cid.serial);
+
+static struct attribute *mmc_std_attrs[] = {
+        &dev_attr_cid.attr,
+        &dev_attr_csd.attr,
+        &dev_attr_date.attr,
+        &dev_attr_fwrev.attr,
+        &dev_attr_hwrev.attr,
+        &dev_attr_manfid.attr,
+        &dev_attr_name.attr,
+        &dev_attr_oemid.attr,
+        &dev_attr_serial.attr,
+        NULL,
+};
+
+static struct attribute_group mmc_std_attr_group = {
+        .attrs = mmc_std_attrs,
+};
+
+static struct attribute_group *mmc_attr_groups[] = {
+        &mmc_std_attr_group,
+        NULL,
+};
+
+static struct device_type mmc_type = {
+        .groups = mmc_attr_groups,
+};
+
 /*
  * Handle the detection and initialisation of a card.
  *
@@ -308,7 +345,7 @@ static int mmc_init_card(struct mmc_host *host, u32 ocr,
                 /*
                  * Allocate card structure.
                  */
-                card = mmc_alloc_card(host);
+                card = mmc_alloc_card(host, &mmc_type);
                 if (IS_ERR(card)) {
                         err = PTR_ERR(card);
                         goto err;
@@ -459,53 +496,6 @@ static void mmc_detect(struct mmc_host *host)
         }
 }
 
-MMC_ATTR_FN(cid, "%08x%08x%08x%08x\n", card->raw_cid[0], card->raw_cid[1],
-        card->raw_cid[2], card->raw_cid[3]);
-MMC_ATTR_FN(csd, "%08x%08x%08x%08x\n", card->raw_csd[0], card->raw_csd[1],
-        card->raw_csd[2], card->raw_csd[3]);
-MMC_ATTR_FN(date, "%02d/%04d\n", card->cid.month, card->cid.year);
-MMC_ATTR_FN(fwrev, "0x%x\n", card->cid.fwrev);
-MMC_ATTR_FN(hwrev, "0x%x\n", card->cid.hwrev);
-MMC_ATTR_FN(manfid, "0x%06x\n", card->cid.manfid);
-MMC_ATTR_FN(name, "%s\n", card->cid.prod_name);
-MMC_ATTR_FN(oemid, "0x%04x\n", card->cid.oemid);
-MMC_ATTR_FN(serial, "0x%08x\n", card->cid.serial);
-
-static struct device_attribute mmc_dev_attrs[] = {
-        MMC_ATTR_RO(cid),
-        MMC_ATTR_RO(csd),
-        MMC_ATTR_RO(date),
-        MMC_ATTR_RO(fwrev),
-        MMC_ATTR_RO(hwrev),
-        MMC_ATTR_RO(manfid),
-        MMC_ATTR_RO(name),
-        MMC_ATTR_RO(oemid),
-        MMC_ATTR_RO(serial),
-        __ATTR_NULL,
-};
-
-/*
- * Adds sysfs entries as relevant.
- */
-static int mmc_sysfs_add(struct mmc_host *host, struct mmc_card *card)
-{
-        int ret;
-
-        ret = mmc_add_attrs(card, mmc_dev_attrs);
-        if (ret < 0)
-                return ret;
-
-        return 0;
-}
-
-/*
- * Removes the sysfs entries added by mmc_sysfs_add().
- */
-static void mmc_sysfs_remove(struct mmc_host *host, struct mmc_card *card)
-{
-        mmc_remove_attrs(card, mmc_dev_attrs);
-}
-
 #ifdef CONFIG_MMC_UNSAFE_RESUME
 
 /*
@@ -560,8 +550,6 @@ static void mmc_resume(struct mmc_host *host)
 static const struct mmc_bus_ops mmc_ops = {
         .remove = mmc_remove,
         .detect = mmc_detect,
-        .sysfs_add = mmc_sysfs_add,
-        .sysfs_remove = mmc_sysfs_remove,
         .suspend = mmc_suspend,
         .resume = mmc_resume,
 };
diff --git a/drivers/mmc/core/sd.c b/drivers/mmc/core/sd.c
index d1c1e0f592f1..7ef3b15c5e3d 100644
--- a/drivers/mmc/core/sd.c
+++ b/drivers/mmc/core/sd.c
@@ -18,7 +18,6 @@
 #include <linux/mmc/sd.h>
 
 #include "core.h"
-#include "sysfs.h"
 #include "bus.h"
 #include "mmc_ops.h"
 #include "sd_ops.h"
@@ -283,6 +282,47 @@ out:
         return err;
 }
 
+MMC_DEV_ATTR(cid, "%08x%08x%08x%08x\n", card->raw_cid[0], card->raw_cid[1],
+        card->raw_cid[2], card->raw_cid[3]);
+MMC_DEV_ATTR(csd, "%08x%08x%08x%08x\n", card->raw_csd[0], card->raw_csd[1],
+        card->raw_csd[2], card->raw_csd[3]);
+MMC_DEV_ATTR(scr, "%08x%08x\n", card->raw_scr[0], card->raw_scr[1]);
+MMC_DEV_ATTR(date, "%02d/%04d\n", card->cid.month, card->cid.year);
+MMC_DEV_ATTR(fwrev, "0x%x\n", card->cid.fwrev);
+MMC_DEV_ATTR(hwrev, "0x%x\n", card->cid.hwrev);
+MMC_DEV_ATTR(manfid, "0x%06x\n", card->cid.manfid);
+MMC_DEV_ATTR(name, "%s\n", card->cid.prod_name);
+MMC_DEV_ATTR(oemid, "0x%04x\n", card->cid.oemid);
+MMC_DEV_ATTR(serial, "0x%08x\n", card->cid.serial);
+
+
+static struct attribute *sd_std_attrs[] = {
+        &dev_attr_cid.attr,
+        &dev_attr_csd.attr,
+        &dev_attr_scr.attr,
+        &dev_attr_date.attr,
+        &dev_attr_fwrev.attr,
+        &dev_attr_hwrev.attr,
+        &dev_attr_manfid.attr,
+        &dev_attr_name.attr,
+        &dev_attr_oemid.attr,
+        &dev_attr_serial.attr,
+        NULL,
+};
+
+static struct attribute_group sd_std_attr_group = {
+        .attrs = sd_std_attrs,
+};
+
+static struct attribute_group *sd_attr_groups[] = {
+        &sd_std_attr_group,
+        NULL,
+};
+
+static struct device_type sd_type = {
+        .groups = sd_attr_groups,
+};
+
 /*
  * Handle the detection and initialisation of a card.
  *
@@ -352,7 +392,7 @@ static int mmc_sd_init_card(struct mmc_host *host, u32 ocr,
                 /*
                  * Allocate card structure.
                  */
-                card = mmc_alloc_card(host);
+                card = mmc_alloc_card(host, &sd_type);
                 if (IS_ERR(card)) {
                         err = PTR_ERR(card);
                         goto err;
@@ -518,55 +558,6 @@ static void mmc_sd_detect(struct mmc_host *host)
         }
 }
 
-MMC_ATTR_FN(cid, "%08x%08x%08x%08x\n", card->raw_cid[0], card->raw_cid[1],
-        card->raw_cid[2], card->raw_cid[3]);
-MMC_ATTR_FN(csd, "%08x%08x%08x%08x\n", card->raw_csd[0], card->raw_csd[1],
-        card->raw_csd[2], card->raw_csd[3]);
-MMC_ATTR_FN(scr, "%08x%08x\n", card->raw_scr[0], card->raw_scr[1]);
-MMC_ATTR_FN(date, "%02d/%04d\n", card->cid.month, card->cid.year);
-MMC_ATTR_FN(fwrev, "0x%x\n", card->cid.fwrev);
-MMC_ATTR_FN(hwrev, "0x%x\n", card->cid.hwrev);
-MMC_ATTR_FN(manfid, "0x%06x\n", card->cid.manfid);
-MMC_ATTR_FN(name, "%s\n", card->cid.prod_name);
-MMC_ATTR_FN(oemid, "0x%04x\n", card->cid.oemid);
-MMC_ATTR_FN(serial, "0x%08x\n", card->cid.serial);
-
-static struct device_attribute mmc_sd_dev_attrs[] = {
-        MMC_ATTR_RO(cid),
-        MMC_ATTR_RO(csd),
-        MMC_ATTR_RO(scr),
-        MMC_ATTR_RO(date),
-        MMC_ATTR_RO(fwrev),
-        MMC_ATTR_RO(hwrev),
-        MMC_ATTR_RO(manfid),
-        MMC_ATTR_RO(name),
-        MMC_ATTR_RO(oemid),
-        MMC_ATTR_RO(serial),
-        __ATTR_NULL,
-};
-
-/*
- * Adds sysfs entries as relevant.
- */
-static int mmc_sd_sysfs_add(struct mmc_host *host, struct mmc_card *card)
-{
-        int ret;
-
-        ret = mmc_add_attrs(card, mmc_sd_dev_attrs);
-        if (ret < 0)
-                return ret;
-
-        return 0;
-}
-
-/*
- * Removes the sysfs entries added by mmc_sysfs_add().
- */
-static void mmc_sd_sysfs_remove(struct mmc_host *host, struct mmc_card *card)
-{
-        mmc_remove_attrs(card, mmc_sd_dev_attrs);
-}
-
 #ifdef CONFIG_MMC_UNSAFE_RESUME
 
 /*
@@ -621,8 +612,6 @@ static void mmc_sd_resume(struct mmc_host *host)
 static const struct mmc_bus_ops mmc_sd_ops = {
         .remove = mmc_sd_remove,
         .detect = mmc_sd_detect,
-        .sysfs_add = mmc_sd_sysfs_add,
-        .sysfs_remove = mmc_sd_sysfs_remove,
         .suspend = mmc_sd_suspend,
         .resume = mmc_sd_resume,
 };
diff --git a/drivers/mmc/core/sdio.c b/drivers/mmc/core/sdio.c
index 87a50f456efc..4eab79e09ccc 100644
--- a/drivers/mmc/core/sdio.c
+++ b/drivers/mmc/core/sdio.c
@@ -287,7 +287,7 @@ int mmc_attach_sdio(struct mmc_host *host, u32 ocr)
         /*
          * Allocate card structure.
          */
-        card = mmc_alloc_card(host);
+        card = mmc_alloc_card(host, NULL);
         if (IS_ERR(card)) {
                 err = PTR_ERR(card);
                 goto err;
diff --git a/drivers/mmc/core/sysfs.c b/drivers/mmc/core/sysfs.c
deleted file mode 100644
index 00a97e70f914..000000000000
--- a/drivers/mmc/core/sysfs.c
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- *  linux/drivers/mmc/core/sysfs.c
- *
- *  Copyright (C) 2003 Russell King, All Rights Reserved.
- *  Copyright 2007 Pierre Ossman
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- *
- *  MMC sysfs/driver model support.
- */
-#include <linux/device.h>
-
-#include <linux/mmc/card.h>
-
-#include "sysfs.h"
-
-int mmc_add_attrs(struct mmc_card *card, struct device_attribute *attrs)
-{
-        int error = 0;
-        int i;
-
-        for (i = 0; attr_name(attrs[i]); i++) {
-                error = device_create_file(&card->dev, &attrs[i]);
-                if (error) {
-                        while (--i >= 0)
-                                device_remove_file(&card->dev, &attrs[i]);
-                        break;
-                }
-        }
-
-        return error;
-}
-
-void mmc_remove_attrs(struct mmc_card *card, struct device_attribute *attrs)
-{
-        int i;
-
-        for (i = 0; attr_name(attrs[i]); i++)
-                device_remove_file(&card->dev, &attrs[i]);
-}
-
diff --git a/drivers/mmc/core/sysfs.h b/drivers/mmc/core/sysfs.h
deleted file mode 100644
index 4b8f670bd10f..000000000000
--- a/drivers/mmc/core/sysfs.h
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- *  linux/drivers/mmc/core/sysfs.h
- *
- *  Copyright (C) 2003 Russell King, All Rights Reserved.
- *  Copyright 2007 Pierre Ossman
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- */
-#ifndef _MMC_CORE_SYSFS_H
-#define _MMC_CORE_SYSFS_H
-
-#define MMC_ATTR_FN(name, fmt, args...)                                 \
-static ssize_t mmc_##name##_show (struct device *dev, struct device_attribute *attr, char *buf) \
-{                                                                       \
-        struct mmc_card *card = container_of(dev, struct mmc_card, dev);\
-        return sprintf(buf, fmt, args);                                 \
-}
-
-#define MMC_ATTR_RO(name) __ATTR(name, S_IRUGO, mmc_##name##_show, NULL)
-
-int mmc_add_attrs(struct mmc_card *card, struct device_attribute *attrs);
-void mmc_remove_attrs(struct mmc_card *card, struct device_attribute *attrs);
-
-#endif
diff --git a/drivers/mmc/host/tifm_sd.c b/drivers/mmc/host/tifm_sd.c
index 20d5c7bd940a..1c14a186f000 100644
--- a/drivers/mmc/host/tifm_sd.c
+++ b/drivers/mmc/host/tifm_sd.c
@@ -180,7 +180,7 @@ static void tifm_sd_transfer_data(struct tifm_sd *host)
                         host->sg_pos++;
                         if (host->sg_pos == host->sg_len) {
                                 if ((r_data->flags & MMC_DATA_WRITE)
-                                    && DATA_CARRY)
+                                    && (host->cmd_flags & DATA_CARRY))
                                         writel(host->bounce_buf_data[0],
                                                host->dev->addr
                                                + SOCK_MMCSD_DATA);
diff --git a/drivers/mtd/devices/block2mtd.c b/drivers/mtd/devices/block2mtd.c
index eeaaa9dce6ef..ad1880c67518 100644
--- a/drivers/mtd/devices/block2mtd.c
+++ b/drivers/mtd/devices/block2mtd.c
@@ -408,7 +408,6 @@ static int block2mtd_setup2(const char *val)
         if (token[1]) {
                 ret = parse_num(&erase_size, token[1]);
                 if (ret) {
-                        kfree(name);
                         parse_err("illegal erase size");
                 }
         }
diff --git a/drivers/mtd/maps/physmap.c b/drivers/mtd/maps/physmap.c
index f00e04efbe28..bc4649a17b9d 100644
--- a/drivers/mtd/maps/physmap.c
+++ b/drivers/mtd/maps/physmap.c
@@ -202,9 +202,8 @@ static int physmap_flash_suspend(struct platform_device *dev, pm_message_t state
         int ret = 0;
         int i;
 
-        if (info)
-                for (i = 0; i < MAX_RESOURCES; i++)
-                        ret |= info->mtd[i]->suspend(info->mtd[i]);
+        for (i = 0; i < MAX_RESOURCES && info->mtd[i]; i++)
+                ret |= info->mtd[i]->suspend(info->mtd[i]);
 
         return ret;
 }
@@ -214,9 +213,9 @@ static int physmap_flash_resume(struct platform_device *dev)
         struct physmap_flash_info *info = platform_get_drvdata(dev);
         int i;
 
-        if (info)
-                for (i = 0; i < MAX_RESOURCES; i++)
-                        info->mtd[i]->resume(info->mtd[i]);
+        for (i = 0; i < MAX_RESOURCES && info->mtd[i]; i++)
+                info->mtd[i]->resume(info->mtd[i]);
+
         return 0;
 }
 
@@ -225,8 +224,8 @@ static void physmap_flash_shutdown(struct platform_device *dev)
         struct physmap_flash_info *info = platform_get_drvdata(dev);
         int i;
 
-        for (i = 0; i < MAX_RESOURCES; i++)
-                if (info && info->mtd[i]->suspend(info->mtd[i]) == 0)
+        for (i = 0; i < MAX_RESOURCES && info->mtd[i]; i++)
+                if (info->mtd[i]->suspend(info->mtd[i]) == 0)
                         info->mtd[i]->resume(info->mtd[i]);
 }
 #else
diff --git a/drivers/mtd/nand/rtc_from4.c b/drivers/mtd/nand/rtc_from4.c
index 9189ec8f243e..0f6ac250f434 100644
--- a/drivers/mtd/nand/rtc_from4.c
+++ b/drivers/mtd/nand/rtc_from4.c
@@ -460,7 +460,7 @@ static int rtc_from4_errstat(struct mtd_info *mtd, struct nand_chip *this,
                         er_stat |= 1 << 1;
                 kfree(buf);
         }
-
+out:
         rtn = status;
         if (er_stat == 0) {     /* if ECC is available   */
                 rtn = (status & ~NAND_STATUS_FAIL);     /*   clear the error bit */
diff --git a/drivers/net/3c501.c b/drivers/net/3c501.c
index 7d253686ed0d..5ba4bab6d43e 100644
--- a/drivers/net/3c501.c
+++ b/drivers/net/3c501.c
@@ -485,9 +485,7 @@ static int el_start_xmit(struct sk_buff *skb, struct net_device *dev)
                         printk(KERN_DEBUG "%s: burped during tx load.\n",
                                 dev->name);
                 spin_lock_irqsave(&lp->lock, flags);
-        }
-        while (1);
-
+        } while (1);
 }
 
 /**
@@ -612,7 +610,8 @@ static irqreturn_t el_interrupt(int irq, void *dev_id)
                         dev->stats.tx_packets++;
                         if (el_debug > 6)
                                 printk(KERN_DEBUG " Tx succeeded %s\n",
-                                        (txsr & TX_RDY) ? "." : "but tx is busy!");
+                                        (txsr & TX_RDY) ? "." :
+                                                        "but tx is busy!");
                         /*
                          *      This is safe the interrupt is atomic WRT itself.
                          */
@@ -693,7 +692,8 @@ static void el_receive(struct net_device *dev)
 
         if (pkt_len < 60 || pkt_len > 1536) {
                 if (el_debug)
-                        printk(KERN_DEBUG "%s: bogus packet, length=%d\n", dev->name, pkt_len);
+                        printk(KERN_DEBUG "%s: bogus packet, length=%d\n",
+                                                dev->name, pkt_len);
                 dev->stats.rx_over_errors++;
                 return;
         }
@@ -711,7 +711,8 @@ static void el_receive(struct net_device *dev)
 
         outw(0x00, GP_LOW);
         if (skb == NULL) {
-                printk(KERN_INFO "%s: Memory squeeze, dropping packet.\n", dev->name);
+                printk(KERN_INFO "%s: Memory squeeze, dropping packet.\n",
+                                                                dev->name);
                 dev->stats.rx_dropped++;
                 return;
         } else {
@@ -748,7 +749,8 @@ static void  el_reset(struct net_device *dev)
         if (el_debug > 2)
                 printk(KERN_INFO "3c501 reset...");
         outb(AX_RESET, AX_CMD);         /* Reset the chip */
-        outb(AX_LOOP, AX_CMD);          /* Aux control, irq and loopback enabled */
+        /* Aux control, irq and loopback enabled */
+        outb(AX_LOOP, AX_CMD);
         {
                 int i;
                 for (i = 0; i < 6; i++) /* Set the station address. */
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index a0f0e605d630..fe7b5ec09708 100644
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -2366,15 +2366,15 @@ config GELIC_NET
           module will be called ps3_gelic.
 
 config GELIC_WIRELESS
-       bool "PS3 Wireless support"
-       depends on GELIC_NET
-       select WIRELESS_EXT
-       help
-        This option adds the support for the wireless feature of PS3.
-        If you have the wireless-less model of PS3 or have no plan to
-        use wireless feature, disabling this option saves memory.  As
-        the driver automatically distinguishes the models, you can
-        safely enable this option even if you have a wireless-less model.
+        bool "PS3 Wireless support"
+        depends on GELIC_NET
+        select WIRELESS_EXT
+        help
+          This option adds the support for the wireless feature of PS3.
+          If you have the wireless-less model of PS3 or have no plan to
+          use wireless feature, disabling this option saves memory.  As
+          the driver automatically distinguishes the models, you can
+          safely enable this option even if you have a wireless-less model.
 
 config GIANFAR
         tristate "Gianfar Ethernet"
@@ -2519,7 +2519,7 @@ config CHELSIO_T3
 
 config EHEA
         tristate "eHEA Ethernet support"
-        depends on IBMEBUS && INET
+        depends on IBMEBUS && INET && SPARSEMEM
         select INET_LRO
         ---help---
           This driver supports the IBM pSeries eHEA ethernet adapter.
diff --git a/drivers/net/ac3200.c b/drivers/net/ac3200.c
index 5136d94923aa..b1448637107f 100644
--- a/drivers/net/ac3200.c
+++ b/drivers/net/ac3200.c
@@ -369,7 +369,7 @@ MODULE_PARM_DESC(mem, "Memory base address(es)");
 MODULE_DESCRIPTION("Ansel AC3200 EISA ethernet driver");
 MODULE_LICENSE("GPL");
 
-int __init init_module(void)
+static int __init ac3200_module_init(void)
 {
         struct net_device *dev;
         int this_dev, found = 0;
@@ -404,8 +404,7 @@ static void cleanup_card(struct net_device *dev)
         iounmap(ei_status.mem);
 }
 
-void __exit
-cleanup_module(void)
+static void __exit ac3200_module_exit(void)
 {
         int this_dev;
 
@@ -418,4 +417,6 @@ cleanup_module(void)
                 }
         }
 }
+module_init(ac3200_module_init);
+module_exit(ac3200_module_exit);
 #endif /* MODULE */
diff --git a/drivers/net/apne.c b/drivers/net/apne.c
index c12cbdf368b1..47a8275d3962 100644
--- a/drivers/net/apne.c
+++ b/drivers/net/apne.c
@@ -569,7 +569,7 @@ static irqreturn_t apne_interrupt(int irq, void *dev_id)
 #ifdef MODULE
 static struct net_device *apne_dev;
 
-int __init init_module(void)
+static int __init apne_module_init(void)
 {
         apne_dev = apne_probe(-1);
         if (IS_ERR(apne_dev))
@@ -577,7 +577,7 @@ int __init init_module(void)
         return 0;
 }
 
-void __exit cleanup_module(void)
+static void __exit apne_module_exit(void)
 {
         unregister_netdev(apne_dev);
 
@@ -591,7 +591,8 @@ void __exit cleanup_module(void)
 
         free_netdev(apne_dev);
 }
-
+module_init(apne_module_init);
+module_exit(apne_module_exit);
 #endif
 
 static int init_pcmcia(void)
diff --git a/drivers/net/appletalk/ltpc.c b/drivers/net/appletalk/ltpc.c
index 6ab2c2d4d673..fef5560bc7a2 100644
--- a/drivers/net/appletalk/ltpc.c
+++ b/drivers/net/appletalk/ltpc.c
@@ -1252,7 +1252,7 @@ module_param(irq, int, 0);
 module_param(dma, int, 0);
 
 
-int __init init_module(void)
+static int __init ltpc_module_init(void)
 {
         if(io == 0)
                 printk(KERN_NOTICE
@@ -1263,6 +1263,7 @@ int __init init_module(void)
                 return PTR_ERR(dev_ltpc);
         return 0;
 }
+module_init(ltpc_module_init);
 #endif
 
 static void __exit ltpc_cleanup(void)
diff --git a/drivers/net/arcnet/capmode.c b/drivers/net/arcnet/capmode.c
index cc4610db6395..02cb8f1c1148 100644
--- a/drivers/net/arcnet/capmode.c
+++ b/drivers/net/arcnet/capmode.c
@@ -80,17 +80,19 @@ void arcnet_cap_init(void)
 
 #ifdef MODULE
 
-int __init init_module(void)
+static int __init capmode_module_init(void)
 {
         printk(VERSION);
         arcnet_cap_init();
         return 0;
 }
 
-void cleanup_module(void)
+static void __exit capmode_module_exit(void)
 {
         arcnet_unregister_proto(&capmode_proto);
 }
+module_init(capmode_module_init);
+module_exit(capmode_module_exit);
 
 MODULE_LICENSE("GPL");
 #endif                          /* MODULE */
diff --git a/drivers/net/atarilance.c b/drivers/net/atarilance.c
index b74dbeef8050..13c293b286de 100644
--- a/drivers/net/atarilance.c
+++ b/drivers/net/atarilance.c
@@ -336,8 +336,6 @@ struct lance_addr {
 
 /***************************** Prototypes *****************************/
 
-static int addr_accessible( volatile void *regp, int wordflag, int
-                            writeflag );
 static unsigned long lance_probe1( struct net_device *dev, struct lance_addr
                                    *init_rec );
 static int lance_open( struct net_device *dev );
@@ -406,7 +404,8 @@ struct net_device * __init atarilance_probe(int unit)
 
 /* Derived from hwreg_present() in atari/config.c: */
 
-static int __init addr_accessible( volatile void *regp, int wordflag, int writeflag )
+static noinline int __init addr_accessible(volatile void *regp, int wordflag,
+                                           int writeflag)
 {
         int             ret;
         long    flags;
diff --git a/drivers/net/atl1/atl1_main.c b/drivers/net/atl1/atl1_main.c
index 9200ee59d854..129b8b3aa773 100644
--- a/drivers/net/atl1/atl1_main.c
+++ b/drivers/net/atl1/atl1_main.c
@@ -1765,15 +1765,12 @@ static irqreturn_t atl1_intr(int irq, void *data)
 {
         struct atl1_adapter *adapter = netdev_priv(data);
         u32 status;
-        u8 update_rx;
         int max_ints = 10;
 
         status = adapter->cmb.cmb->int_stats;
         if (!status)
                 return IRQ_NONE;
 
-        update_rx = 0;
-
         do {
                 /* clear CMB interrupt status at once */
                 adapter->cmb.cmb->int_stats = 0;
diff --git a/drivers/net/b44.c b/drivers/net/b44.c
index ea2a2b548e3c..25f1337cd02c 100644
--- a/drivers/net/b44.c
+++ b/drivers/net/b44.c
@@ -2082,6 +2082,11 @@ static int __devinit b44_get_invariants(struct b44 *bp)
                 addr = sdev->bus->sprom.et0mac;
                 bp->phy_addr = sdev->bus->sprom.et0phyaddr;
         }
+        /* Some ROMs have buggy PHY addresses with the high
+         * bits set (sign extension?). Truncate them to a
+         * valid PHY address. */
+        bp->phy_addr &= 0x1F;
+
         memcpy(bp->dev->dev_addr, addr, 6);
 
         if (!is_valid_ether_addr(&bp->dev->dev_addr[0])){
diff --git a/drivers/net/bnx2x.c b/drivers/net/bnx2x.c
index 8af142ccf373..de32b3fba322 100644
--- a/drivers/net/bnx2x.c
+++ b/drivers/net/bnx2x.c
@@ -63,8 +63,8 @@
 #include "bnx2x.h"
 #include "bnx2x_init.h"
 
-#define DRV_MODULE_VERSION      "1.40.22"
-#define DRV_MODULE_RELDATE      "2007/11/27"
+#define DRV_MODULE_VERSION      "1.42.3"
+#define DRV_MODULE_RELDATE      "2008/3/9"
 #define BNX2X_BC_VER            0x040200
 
 /* Time in jiffies before concluding the transmitter is hung. */
@@ -8008,38 +8008,6 @@ static int bnx2x_set_settings(struct net_device *dev, struct ethtool_cmd *cmd)
            cmd->duplex, cmd->port, cmd->phy_address, cmd->transceiver,
            cmd->autoneg, cmd->maxtxpkt, cmd->maxrxpkt);
 
-        switch (cmd->port) {
-        case PORT_TP:
-                if (!(bp->supported & SUPPORTED_TP)) {
-                        DP(NETIF_MSG_LINK, "TP not supported\n");
-                        return -EINVAL;
-                }
-
-                if (bp->phy_flags & PHY_XGXS_FLAG) {
-                        bnx2x_link_reset(bp);
-                        bnx2x_link_settings_supported(bp, SWITCH_CFG_1G);
-                        bnx2x_phy_deassert(bp);
-                }
-                break;
-
-        case PORT_FIBRE:
-                if (!(bp->supported & SUPPORTED_FIBRE)) {
-                        DP(NETIF_MSG_LINK, "FIBRE not supported\n");
-                        return -EINVAL;
-                }
-
-                if (!(bp->phy_flags & PHY_XGXS_FLAG)) {
-                        bnx2x_link_reset(bp);
-                        bnx2x_link_settings_supported(bp, SWITCH_CFG_10G);
-                        bnx2x_phy_deassert(bp);
-                }
-                break;
-
-        default:
-                DP(NETIF_MSG_LINK, "Unknown port type\n");
-                return -EINVAL;
-        }
-
         if (cmd->autoneg == AUTONEG_ENABLE) {
                 if (!(bp->supported & SUPPORTED_Autoneg)) {
                         DP(NETIF_MSG_LINK, "Aotoneg not supported\n");
diff --git a/drivers/net/bonding/bond_3ad.c b/drivers/net/bonding/bond_3ad.c
index cb3c6faa7888..d16e0e1d2b30 100644
--- a/drivers/net/bonding/bond_3ad.c
+++ b/drivers/net/bonding/bond_3ad.c
@@ -310,7 +310,7 @@ static inline int __check_agg_selection_timer(struct port *port)
  */
 static inline void __get_rx_machine_lock(struct port *port)
 {
-        spin_lock(&(SLAVE_AD_INFO(port->slave).rx_machine_lock));
+        spin_lock_bh(&(SLAVE_AD_INFO(port->slave).rx_machine_lock));
 }
 
 /**
@@ -320,7 +320,7 @@ static inline void __get_rx_machine_lock(struct port *port)
  */
 static inline void __release_rx_machine_lock(struct port *port)
 {
-        spin_unlock(&(SLAVE_AD_INFO(port->slave).rx_machine_lock));
+        spin_unlock_bh(&(SLAVE_AD_INFO(port->slave).rx_machine_lock));
 }
 
 /**
diff --git a/drivers/net/bonding/bond_alb.c b/drivers/net/bonding/bond_alb.c
index b57bc9467dbe..3f58c3d0b710 100644
--- a/drivers/net/bonding/bond_alb.c
+++ b/drivers/net/bonding/bond_alb.c
@@ -678,12 +678,8 @@ static struct slave *rlb_choose_channel(struct sk_buff *skb, struct bonding *bon
                 }
 
                 if (!list_empty(&bond->vlan_list)) {
-                        unsigned short vlan_id;
-                        int res = vlan_get_tag(skb, &vlan_id);
-                        if (!res) {
+                        if (!vlan_get_tag(skb, &client_info->vlan_id))
                                 client_info->tag = 1;
-                                client_info->vlan_id = vlan_id;
-                        }
                 }
 
                 if (!client_info->assigned) {
diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c
index 0942d82f7cbf..0f0675319e9c 100644
--- a/drivers/net/bonding/bond_main.c
+++ b/drivers/net/bonding/bond_main.c
@@ -383,7 +383,7 @@ struct vlan_entry *bond_next_vlan(struct bonding *bond, struct vlan_entry *curr)
  */
 int bond_dev_queue_xmit(struct bonding *bond, struct sk_buff *skb, struct net_device *slave_dev)
 {
-        unsigned short vlan_id;
+        unsigned short uninitialized_var(vlan_id);
 
         if (!list_empty(&bond->vlan_list) &&
             !(slave_dev->features & NETIF_F_HW_VLAN_TX) &&
@@ -4528,8 +4528,7 @@ static void bond_free_all(void)
                 netif_tx_unlock_bh(bond_dev);
                 /* Release the bonded slaves */
                 bond_release_all(bond_dev);
-                bond_deinit(bond_dev);
-                unregister_netdevice(bond_dev);
+                bond_destroy(bond);
         }
 
 #ifdef CONFIG_PROC_FS
diff --git a/drivers/net/bonding/bonding.h b/drivers/net/bonding/bonding.h
index 67ccad69d445..a3c74e20aa53 100644
--- a/drivers/net/bonding/bonding.h
+++ b/drivers/net/bonding/bonding.h
@@ -22,8 +22,8 @@
 #include "bond_3ad.h"
 #include "bond_alb.h"
 
-#define DRV_VERSION     "3.2.4"
-#define DRV_RELDATE     "January 28, 2008"
+#define DRV_VERSION     "3.2.5"
+#define DRV_RELDATE     "March 21, 2008"
 #define DRV_NAME        "bonding"
 #define DRV_DESCRIPTION "Ethernet Channel Bonding Driver"
 
diff --git a/drivers/net/cxgb3/sge.c b/drivers/net/cxgb3/sge.c
index 979f3fc5e765..98a6bbd11d4c 100644
--- a/drivers/net/cxgb3/sge.c
+++ b/drivers/net/cxgb3/sge.c
@@ -557,9 +557,9 @@ static void t3_free_qset(struct adapter *adapter, struct sge_qset *q)
 
         for (i = 0; i < SGE_RXQ_PER_SET; ++i)
                 if (q->fl[i].desc) {
-                        spin_lock(&adapter->sge.reg_lock);
+                        spin_lock_irq(&adapter->sge.reg_lock);
                         t3_sge_disable_fl(adapter, q->fl[i].cntxt_id);
-                        spin_unlock(&adapter->sge.reg_lock);
+                        spin_unlock_irq(&adapter->sge.reg_lock);
                         free_rx_bufs(pdev, &q->fl[i]);
                         kfree(q->fl[i].sdesc);
                         dma_free_coherent(&pdev->dev,
@@ -570,9 +570,9 @@ static void t3_free_qset(struct adapter *adapter, struct sge_qset *q)
 
         for (i = 0; i < SGE_TXQ_PER_SET; ++i)
                 if (q->txq[i].desc) {
-                        spin_lock(&adapter->sge.reg_lock);
+                        spin_lock_irq(&adapter->sge.reg_lock);
                         t3_sge_enable_ecntxt(adapter, q->txq[i].cntxt_id, 0);
-                        spin_unlock(&adapter->sge.reg_lock);
+                        spin_unlock_irq(&adapter->sge.reg_lock);
                         if (q->txq[i].sdesc) {
                                 free_tx_desc(adapter, &q->txq[i],
                                              q->txq[i].in_use);
@@ -586,9 +586,9 @@ static void t3_free_qset(struct adapter *adapter, struct sge_qset *q)
                 }
 
         if (q->rspq.desc) {
-                spin_lock(&adapter->sge.reg_lock);
+                spin_lock_irq(&adapter->sge.reg_lock);
                 t3_sge_disable_rspcntxt(adapter, q->rspq.cntxt_id);
-                spin_unlock(&adapter->sge.reg_lock);
+                spin_unlock_irq(&adapter->sge.reg_lock);
                 dma_free_coherent(&pdev->dev,
                                   q->rspq.size * sizeof(struct rsp_desc),
                                   q->rspq.desc, q->rspq.phys_addr);
@@ -1107,9 +1107,15 @@ int t3_eth_xmit(struct sk_buff *skb, struct net_device *dev)
         }
 
         q->in_use += ndesc;
-        if (unlikely(credits - ndesc < q->stop_thres))
-                if (USE_GTS || !should_restart_tx(q))
-                        t3_stop_queue(dev, qs, q);
+        if (unlikely(credits - ndesc < q->stop_thres)) {
+                t3_stop_queue(dev, qs, q);
+
+                if (should_restart_tx(q) &&
+                    test_and_clear_bit(TXQ_ETH, &qs->txq_stopped)) {
+                        q->restarts++;
+                        netif_wake_queue(dev);
+                }
+        }
 
         gen = q->gen;
         q->unacked += ndesc;
@@ -2661,7 +2667,7 @@ int t3_sge_alloc_qset(struct adapter *adapter, unsigned int id, int nports,
                 (16 * 1024) - SKB_DATA_ALIGN(sizeof(struct skb_shared_info)) :
                 MAX_FRAME_SIZE + 2 + sizeof(struct cpl_rx_pkt);
 
-        spin_lock(&adapter->sge.reg_lock);
+        spin_lock_irq(&adapter->sge.reg_lock);
 
         /* FL threshold comparison uses < */
         ret = t3_sge_init_rspcntxt(adapter, q->rspq.cntxt_id, irq_vec_idx,
@@ -2705,7 +2711,7 @@ int t3_sge_alloc_qset(struct adapter *adapter, unsigned int id, int nports,
                         goto err_unlock;
         }
 
-        spin_unlock(&adapter->sge.reg_lock);
+        spin_unlock_irq(&adapter->sge.reg_lock);
 
         q->adap = adapter;
         q->netdev = dev;
@@ -2722,7 +2728,7 @@ int t3_sge_alloc_qset(struct adapter *adapter, unsigned int id, int nports,
         return 0;
 
       err_unlock:
-        spin_unlock(&adapter->sge.reg_lock);
+        spin_unlock_irq(&adapter->sge.reg_lock);
       err:
         t3_free_qset(adapter, q);
         return ret;
diff --git a/drivers/net/dm9000.c b/drivers/net/dm9000.c
index 1fe305ca2cf0..d63cc93f055d 100644
--- a/drivers/net/dm9000.c
+++ b/drivers/net/dm9000.c
@@ -798,8 +798,6 @@ dm9000_init_dm9000(struct net_device *dev)
         /* Set address filter table */
         dm9000_hash_table(dev);
 
-        /* Activate DM9000 */
-        iow(db, DM9000_RCR, RCR_DIS_LONG | RCR_DIS_CRC | RCR_RXEN);
         /* Enable TX/RX interrupt mask */
         iow(db, DM9000_IMR, IMR_PAR | IMR_PTM | IMR_PRM);
 
@@ -970,7 +968,7 @@ dm9000_interrupt(int irq, void *dev_id)
 struct dm9000_rxhdr {
         u8      RxPktReady;
         u8      RxStatus;
-        u16     RxLen;
+        __le16  RxLen;
 } __attribute__((__packed__));
 
 /*
@@ -1197,6 +1195,7 @@ dm9000_hash_table(struct net_device *dev)
         int i, oft;
         u32 hash_val;
         u16 hash_table[4];
+        u8 rcr = RCR_DIS_LONG | RCR_DIS_CRC | RCR_RXEN;
         unsigned long flags;
 
         dm9000_dbg(db, 1, "entering %s\n", __func__);
@@ -1213,6 +1212,12 @@ dm9000_hash_table(struct net_device *dev)
         /* broadcast address */
         hash_table[3] = 0x8000;
 
+        if (dev->flags & IFF_PROMISC)
+                rcr |= RCR_PRMSC;
+
+        if (dev->flags & IFF_ALLMULTI)
+                rcr |= RCR_ALL;
+
         /* the multicast address in Hash Table : 64 bits */
         for (i = 0; i < mc_cnt; i++, mcptr = mcptr->next) {
                 hash_val = ether_crc_le(6, mcptr->dmi_addr) & 0x3f;
@@ -1225,6 +1230,7 @@ dm9000_hash_table(struct net_device *dev)
                 iow(db, oft++, hash_table[i] >> 8);
         }
 
+        iow(db, DM9000_RCR, rcr);
         spin_unlock_irqrestore(&db->lock, flags);
 }
 
diff --git a/drivers/net/e100.c b/drivers/net/e100.c
index 36ba6dc96acc..2d139ec79777 100644
--- a/drivers/net/e100.c
+++ b/drivers/net/e100.c
@@ -960,7 +960,7 @@ static void e100_get_defaults(struct nic *nic)
 
         /* Template for a freshly allocated RFD */
         nic->blank_rfd.command = 0;
-        nic->blank_rfd.rbd = 0xFFFFFFFF;
+        nic->blank_rfd.rbd = cpu_to_le32(0xFFFFFFFF);
         nic->blank_rfd.size = cpu_to_le16(VLAN_ETH_FRAME_LEN);
 
         /* MII setup */
@@ -2782,16 +2782,13 @@ static void __devexit e100_remove(struct pci_dev *pdev)
         }
 }
 
-#ifdef CONFIG_PM
 static int e100_suspend(struct pci_dev *pdev, pm_message_t state)
 {
         struct net_device *netdev = pci_get_drvdata(pdev);
         struct nic *nic = netdev_priv(netdev);
 
         if (netif_running(netdev))
-                napi_disable(&nic->napi);
-        del_timer_sync(&nic->watchdog);
-        netif_carrier_off(nic->netdev);
+                e100_down(nic);
         netif_device_detach(netdev);
 
         pci_save_state(pdev);
@@ -2804,14 +2801,13 @@ static int e100_suspend(struct pci_dev *pdev, pm_message_t state)
                 pci_enable_wake(pdev, PCI_D3cold, 0);
         }
 
-        free_irq(pdev->irq, netdev);
-
         pci_disable_device(pdev);
         pci_set_power_state(pdev, PCI_D3hot);
 
         return 0;
 }
 
+#ifdef CONFIG_PM
 static int e100_resume(struct pci_dev *pdev)
 {
         struct net_device *netdev = pci_get_drvdata(pdev);
@@ -2832,26 +2828,7 @@ static int e100_resume(struct pci_dev *pdev)
 
 static void e100_shutdown(struct pci_dev *pdev)
 {
-        struct net_device *netdev = pci_get_drvdata(pdev);
-        struct nic *nic = netdev_priv(netdev);
-
-        if (netif_running(netdev))
-                napi_disable(&nic->napi);
-        del_timer_sync(&nic->watchdog);
-        netif_carrier_off(nic->netdev);
-
-        if ((nic->flags & wol_magic) | e100_asf(nic)) {
-                pci_enable_wake(pdev, PCI_D3hot, 1);
-                pci_enable_wake(pdev, PCI_D3cold, 1);
-        } else {
-                pci_enable_wake(pdev, PCI_D3hot, 0);
-                pci_enable_wake(pdev, PCI_D3cold, 0);
-        }
-
-        free_irq(pdev->irq, netdev);
-
-        pci_disable_device(pdev);
-        pci_set_power_state(pdev, PCI_D3hot);
+        e100_suspend(pdev, PMSG_SUSPEND);
 }
 
 /* ------------------ PCI Error Recovery infrastructure  -------------- */
diff --git a/drivers/net/ehea/ehea.h b/drivers/net/ehea/ehea.h
index 7c4ead35cfa2..93b7fb246960 100644
--- a/drivers/net/ehea/ehea.h
+++ b/drivers/net/ehea/ehea.h
@@ -40,7 +40,7 @@
 #include <asm/io.h>
 
 #define DRV_NAME        "ehea"
-#define DRV_VERSION     "EHEA_0087"
+#define DRV_VERSION     "EHEA_0089"
 
 /* eHEA capability flags */
 #define DLPAR_PORT_ADD_REM 1
diff --git a/drivers/net/ehea/ehea_main.c b/drivers/net/ehea/ehea_main.c
index 21af674b764e..07c742dd3f09 100644
--- a/drivers/net/ehea/ehea_main.c
+++ b/drivers/net/ehea/ehea_main.c
@@ -3108,7 +3108,7 @@ struct ehea_port *ehea_setup_single_port(struct ehea_adapter *adapter,
         dev->vlan_rx_add_vid = ehea_vlan_rx_add_vid;
         dev->vlan_rx_kill_vid = ehea_vlan_rx_kill_vid;
         dev->features = NETIF_F_SG | NETIF_F_FRAGLIST | NETIF_F_TSO
-                      | NETIF_F_HIGHDMA | NETIF_F_HW_CSUM | NETIF_F_HW_VLAN_TX
+                      | NETIF_F_HIGHDMA | NETIF_F_IP_CSUM | NETIF_F_HW_VLAN_TX
                       | NETIF_F_HW_VLAN_RX | NETIF_F_HW_VLAN_FILTER
                       | NETIF_F_LLTX;
         dev->tx_timeout = &ehea_tx_watchdog;
diff --git a/drivers/net/enc28j60.c b/drivers/net/enc28j60.c
index 0809a6a5a286..46a90e9ec563 100644
--- a/drivers/net/enc28j60.c
+++ b/drivers/net/enc28j60.c
@@ -900,7 +900,7 @@ static void enc28j60_hw_rx(struct net_device *ndev)
                 if (RSV_GETBIT(rxstat, RSV_LENCHECKERR))
                         ndev->stats.rx_frame_errors++;
         } else {
-                skb = dev_alloc_skb(len);
+                skb = dev_alloc_skb(len + NET_IP_ALIGN);
                 if (!skb) {
                         if (netif_msg_rx_err(priv))
                                 dev_err(&ndev->dev,
@@ -908,6 +908,7 @@ static void enc28j60_hw_rx(struct net_device *ndev)
                         ndev->stats.rx_dropped++;
                 } else {
                         skb->dev = ndev;
+                        skb_reserve(skb, NET_IP_ALIGN);
                         /* copy the packet from the receive buffer */
                         enc28j60_mem_read(priv, priv->next_pk_ptr + sizeof(rsv),
                                         len, skb_put(skb, len));
diff --git a/drivers/net/epic100.c b/drivers/net/epic100.c
index 0b365b8d947b..76118ddd1042 100644
--- a/drivers/net/epic100.c
+++ b/drivers/net/epic100.c
@@ -131,8 +131,8 @@ IIIa. Ring buffers
 
 IVb. References
 
-http://www.smsc.com/main/datasheets/83c171.pdf
-http://www.smsc.com/main/datasheets/83c175.pdf
+http://www.smsc.com/main/tools/discontinued/83c171.pdf
+http://www.smsc.com/main/tools/discontinued/83c175.pdf
 http://scyld.com/expert/NWay.html
 http://www.national.com/pf/DP/DP83840A.html
 
@@ -227,7 +227,12 @@ static const u16 media2miictl[16] = {
         0, 0x0C00, 0x0C00, 0x2000,  0x0100, 0x2100, 0, 0,
         0, 0, 0, 0,  0, 0, 0, 0 };
 
-/* The EPIC100 Rx and Tx buffer descriptors. */
+/*
+ * The EPIC100 Rx and Tx buffer descriptors.  Note that these
+ * really ARE host-endian; it's not a misannotation.  We tell
+ * the card to byteswap them internally on big-endian hosts -
+ * look for #ifdef CONFIG_BIG_ENDIAN in epic_open().
+ */
 
 struct epic_tx_desc {
         u32 txstatus;
@@ -418,7 +423,7 @@ static int __devinit epic_init_one (struct pci_dev *pdev,
 
         /* Note: the '175 does not have a serial EEPROM. */
         for (i = 0; i < 3; i++)
-                ((u16 *)dev->dev_addr)[i] = le16_to_cpu(inw(ioaddr + LAN0 + i*4));
+                ((__le16 *)dev->dev_addr)[i] = cpu_to_le16(inw(ioaddr + LAN0 + i*4));
 
         if (debug > 2) {
                 dev_printk(KERN_DEBUG, &pdev->dev, "EEPROM contents:\n");
@@ -682,7 +687,8 @@ static int epic_open(struct net_device *dev)
         if (ep->chip_flags & MII_PWRDWN)
                 outl((inl(ioaddr + NVCTL) & ~0x003C) | 0x4800, ioaddr + NVCTL);
 
-#if defined(__powerpc__) || defined(__sparc__)          /* Big endian */
+        /* Tell the chip to byteswap descriptors on big-endian hosts */
+#ifdef CONFIG_BIG_ENDIAN
         outl(0x4432 | (RX_FIFO_THRESH<<8), ioaddr + GENCTL);
         inl(ioaddr + GENCTL);
         outl(0x0432 | (RX_FIFO_THRESH<<8), ioaddr + GENCTL);
@@ -695,7 +701,7 @@ static int epic_open(struct net_device *dev)
         udelay(20); /* Looks like EPII needs that if you want reliable RX init. FIXME: pci posting bug? */
 
         for (i = 0; i < 3; i++)
-                outl(cpu_to_le16(((u16*)dev->dev_addr)[i]), ioaddr + LAN0 + i*4);
+                outl(le16_to_cpu(((__le16*)dev->dev_addr)[i]), ioaddr + LAN0 + i*4);
 
         ep->tx_threshold = TX_FIFO_THRESH;
         outl(ep->tx_threshold, ioaddr + TxThresh);
@@ -798,7 +804,7 @@ static void epic_restart(struct net_device *dev)
         for (i = 16; i > 0; i--)
                 outl(0x0008, ioaddr + TEST1);
 
-#if defined(__powerpc__) || defined(__sparc__)          /* Big endian */
+#ifdef CONFIG_BIG_ENDIAN
         outl(0x0432 | (RX_FIFO_THRESH<<8), ioaddr + GENCTL);
 #else
         outl(0x0412 | (RX_FIFO_THRESH<<8), ioaddr + GENCTL);
@@ -808,7 +814,7 @@ static void epic_restart(struct net_device *dev)
                 outl((inl(ioaddr + NVCTL) & ~0x003C) | 0x4800, ioaddr + NVCTL);
 
         for (i = 0; i < 3; i++)
-                outl(cpu_to_le16(((u16*)dev->dev_addr)[i]), ioaddr + LAN0 + i*4);
+                outl(le16_to_cpu(((__le16*)dev->dev_addr)[i]), ioaddr + LAN0 + i*4);
 
         ep->tx_threshold = TX_FIFO_THRESH;
         outl(ep->tx_threshold, ioaddr + TxThresh);
@@ -919,7 +925,7 @@ static void epic_init_ring(struct net_device *dev)
         /* Initialize all Rx descriptors. */
         for (i = 0; i < RX_RING_SIZE; i++) {
                 ep->rx_ring[i].rxstatus = 0;
-                ep->rx_ring[i].buflength = cpu_to_le32(ep->rx_buf_sz);
+                ep->rx_ring[i].buflength = ep->rx_buf_sz;
                 ep->rx_ring[i].next = ep->rx_ring_dma +
                                       (i+1)*sizeof(struct epic_rx_desc);
                 ep->rx_skbuff[i] = NULL;
@@ -936,7 +942,7 @@ static void epic_init_ring(struct net_device *dev)
                 skb_reserve(skb, 2);    /* 16 byte align the IP header. */
                 ep->rx_ring[i].bufaddr = pci_map_single(ep->pci_dev,
                         skb->data, ep->rx_buf_sz, PCI_DMA_FROMDEVICE);
-                ep->rx_ring[i].rxstatus = cpu_to_le32(DescOwn);
+                ep->rx_ring[i].rxstatus = DescOwn;
         }
         ep->dirty_rx = (unsigned int)(i - RX_RING_SIZE);
 
@@ -974,20 +980,20 @@ static int epic_start_xmit(struct sk_buff *skb, struct net_device *dev)
         ep->tx_ring[entry].bufaddr = pci_map_single(ep->pci_dev, skb->data,
                                                     skb->len, PCI_DMA_TODEVICE);
         if (free_count < TX_QUEUE_LEN/2) {/* Typical path */
-                ctrl_word = cpu_to_le32(0x100000); /* No interrupt */
+                ctrl_word = 0x100000; /* No interrupt */
         } else if (free_count == TX_QUEUE_LEN/2) {
-                ctrl_word = cpu_to_le32(0x140000); /* Tx-done intr. */
+                ctrl_word = 0x140000; /* Tx-done intr. */
         } else if (free_count < TX_QUEUE_LEN - 1) {
-                ctrl_word = cpu_to_le32(0x100000); /* No Tx-done intr. */
+                ctrl_word = 0x100000; /* No Tx-done intr. */
         } else {
                 /* Leave room for an additional entry. */
-                ctrl_word = cpu_to_le32(0x140000); /* Tx-done intr. */
+                ctrl_word = 0x140000; /* Tx-done intr. */
                 ep->tx_full = 1;
         }
-        ep->tx_ring[entry].buflength = ctrl_word | cpu_to_le32(skb->len);
+        ep->tx_ring[entry].buflength = ctrl_word | skb->len;
         ep->tx_ring[entry].txstatus =
                 ((skb->len >= ETH_ZLEN ? skb->len : ETH_ZLEN) << 16)
-                | cpu_to_le32(DescOwn);
+                            | DescOwn;
 
         ep->cur_tx++;
         if (ep->tx_full)
@@ -1041,7 +1047,7 @@ static void epic_tx(struct net_device *dev, struct epic_private *ep)
         for (dirty_tx = ep->dirty_tx; cur_tx - dirty_tx > 0; dirty_tx++) {
                 struct sk_buff *skb;
                 int entry = dirty_tx % TX_RING_SIZE;
-                int txstatus = le32_to_cpu(ep->tx_ring[entry].txstatus);
+                int txstatus = ep->tx_ring[entry].txstatus;
 
                 if (txstatus & DescOwn)
                         break;  /* It still hasn't been Txed */
@@ -1163,8 +1169,8 @@ static int epic_rx(struct net_device *dev, int budget)
                 rx_work_limit = budget;
 
         /* If we own the next entry, it's a new packet. Send it up. */
-        while ((ep->rx_ring[entry].rxstatus & cpu_to_le32(DescOwn)) == 0) {
-                int status = le32_to_cpu(ep->rx_ring[entry].rxstatus);
+        while ((ep->rx_ring[entry].rxstatus & DescOwn) == 0) {
+                int status = ep->rx_ring[entry].rxstatus;
 
                 if (debug > 4)
                         printk(KERN_DEBUG "  epic_rx() status was %8.8x.\n", status);
@@ -1238,7 +1244,8 @@ static int epic_rx(struct net_device *dev, int budget)
                                 skb->data, ep->rx_buf_sz, PCI_DMA_FROMDEVICE);
                         work_done++;
                 }
-                ep->rx_ring[entry].rxstatus = cpu_to_le32(DescOwn);
+                /* AV: shouldn't we add a barrier here? */
+                ep->rx_ring[entry].rxstatus = DescOwn;
         }
         return work_done;
 }
diff --git a/drivers/net/fec_mpc52xx_phy.c b/drivers/net/fec_mpc52xx_phy.c
index 1837584c4504..6a3ac4ea97e9 100644
--- a/drivers/net/fec_mpc52xx_phy.c
+++ b/drivers/net/fec_mpc52xx_phy.c
@@ -109,7 +109,8 @@ static int mpc52xx_fec_mdio_probe(struct of_device *of, const struct of_device_i
                 int irq = irq_of_parse_and_map(child, 0);
                 if (irq != NO_IRQ) {
                         const u32 *id = of_get_property(child, "reg", NULL);
-                        bus->irq[*id] = irq;
+                        if (id)
+                                bus->irq[*id] = irq;
                 }
         }
 
diff --git a/drivers/net/forcedeth.c b/drivers/net/forcedeth.c
index 801b4d9cd972..6f7e3fde9e7c 100644
--- a/drivers/net/forcedeth.c
+++ b/drivers/net/forcedeth.c
@@ -184,6 +184,7 @@
 #define DEV_HAS_PAUSEFRAME_TX_V1   0x08000  /* device supports tx pause frames version 1 */
 #define DEV_HAS_PAUSEFRAME_TX_V2   0x10000  /* device supports tx pause frames version 2 */
 #define DEV_HAS_PAUSEFRAME_TX_V3   0x20000  /* device supports tx pause frames version 3 */
+#define DEV_NEED_TX_LIMIT          0x40000  /* device needs to limit tx */
 
 enum {
         NvRegIrqStatus = 0x000,
@@ -635,6 +636,8 @@ union ring_type {
 #define NV_RESTART_TX         0x1
 #define NV_RESTART_RX         0x2
 
+#define NV_TX_LIMIT_COUNT     16
+
 /* statistics */
 struct nv_ethtool_str {
         char name[ETH_GSTRING_LEN];
@@ -743,6 +746,8 @@ struct nv_skb_map {
         struct sk_buff *skb;
         dma_addr_t dma;
         unsigned int dma_len;
+        struct ring_desc_ex *first_tx_desc;
+        struct nv_skb_map *next_tx_ctx;
 };
 
 /*
@@ -827,6 +832,10 @@ struct fe_priv {
         union ring_type tx_ring;
         u32 tx_flags;
         int tx_ring_size;
+        int tx_limit;
+        u32 tx_pkts_in_progress;
+        struct nv_skb_map *tx_change_owner;
+        struct nv_skb_map *tx_end_flip;
         int tx_stop;
 
         /* vlan fields */
@@ -1707,6 +1716,9 @@ static void nv_init_tx(struct net_device *dev)
                 np->last_tx.ex = &np->tx_ring.ex[np->tx_ring_size-1];
         np->get_tx_ctx = np->put_tx_ctx = np->first_tx_ctx = np->tx_skb;
         np->last_tx_ctx = &np->tx_skb[np->tx_ring_size-1];
+        np->tx_pkts_in_progress = 0;
+        np->tx_change_owner = NULL;
+        np->tx_end_flip = NULL;
 
         for (i = 0; i < np->tx_ring_size; i++) {
                 if (np->desc_ver == DESC_VER_1 || np->desc_ver == DESC_VER_2) {
@@ -1720,6 +1732,9 @@ static void nv_init_tx(struct net_device *dev)
                 }
                 np->tx_skb[i].skb = NULL;
                 np->tx_skb[i].dma = 0;
+                np->tx_skb[i].dma_len = 0;
+                np->tx_skb[i].first_tx_desc = NULL;
+                np->tx_skb[i].next_tx_ctx = NULL;
         }
 }
 
@@ -1771,7 +1786,14 @@ static void nv_drain_tx(struct net_device *dev)
                 }
                 if (nv_release_txskb(dev, &np->tx_skb[i]))
                         dev->stats.tx_dropped++;
+                np->tx_skb[i].dma = 0;
+                np->tx_skb[i].dma_len = 0;
+                np->tx_skb[i].first_tx_desc = NULL;
+                np->tx_skb[i].next_tx_ctx = NULL;
         }
+        np->tx_pkts_in_progress = 0;
+        np->tx_change_owner = NULL;
+        np->tx_end_flip = NULL;
 }
 
 static void nv_drain_rx(struct net_device *dev)
@@ -1948,6 +1970,7 @@ static int nv_start_xmit_optimized(struct sk_buff *skb, struct net_device *dev)
         struct ring_desc_ex* start_tx;
         struct ring_desc_ex* prev_tx;
         struct nv_skb_map* prev_tx_ctx;
+        struct nv_skb_map* start_tx_ctx;
 
         /* add fragments to entries count */
         for (i = 0; i < fragments; i++) {
@@ -1965,6 +1988,7 @@ static int nv_start_xmit_optimized(struct sk_buff *skb, struct net_device *dev)
         }
 
         start_tx = put_tx = np->put_tx.ex;
+        start_tx_ctx = np->put_tx_ctx;
 
         /* setup the header buffer */
         do {
@@ -2037,6 +2061,26 @@ static int nv_start_xmit_optimized(struct sk_buff *skb, struct net_device *dev)
 
         spin_lock_irq(&np->lock);
 
+        if (np->tx_limit) {
+                /* Limit the number of outstanding tx. Setup all fragments, but
+                 * do not set the VALID bit on the first descriptor. Save a pointer
+                 * to that descriptor and also for next skb_map element.
+                 */
+
+                if (np->tx_pkts_in_progress == NV_TX_LIMIT_COUNT) {
+                        if (!np->tx_change_owner)
+                                np->tx_change_owner = start_tx_ctx;
+
+                        /* remove VALID bit */
+                        tx_flags &= ~NV_TX2_VALID;
+                        start_tx_ctx->first_tx_desc = start_tx;
+                        start_tx_ctx->next_tx_ctx = np->put_tx_ctx;
+                        np->tx_end_flip = np->put_tx_ctx;
+                } else {
+                        np->tx_pkts_in_progress++;
+                }
+        }
+
         /* set tx flags */
         start_tx->flaglen |= cpu_to_le32(tx_flags | tx_flags_extra);
         np->put_tx.ex = put_tx;
@@ -2060,6 +2104,25 @@ static int nv_start_xmit_optimized(struct sk_buff *skb, struct net_device *dev)
         return NETDEV_TX_OK;
 }
 
+static inline void nv_tx_flip_ownership(struct net_device *dev)
+{
+        struct fe_priv *np = netdev_priv(dev);
+
+        np->tx_pkts_in_progress--;
+        if (np->tx_change_owner) {
+                __le32 flaglen = le32_to_cpu(np->tx_change_owner->first_tx_desc->flaglen);
+                flaglen |= NV_TX2_VALID;
+                np->tx_change_owner->first_tx_desc->flaglen = cpu_to_le32(flaglen);
+                np->tx_pkts_in_progress++;
+
+                np->tx_change_owner = np->tx_change_owner->next_tx_ctx;
+                if (np->tx_change_owner == np->tx_end_flip)
+                        np->tx_change_owner = NULL;
+
+                writel(NVREG_TXRXCTL_KICK|np->txrxctl_bits, get_hwbase(dev) + NvRegTxRxControl);
+        }
+}
+
 /*
  * nv_tx_done: check for completed packets, release the skbs.
  *
@@ -2147,6 +2210,10 @@ static void nv_tx_done_optimized(struct net_device *dev, int limit)
                                 dev->stats.tx_packets++;
                         dev_kfree_skb_any(np->get_tx_ctx->skb);
                         np->get_tx_ctx->skb = NULL;
+
+                        if (np->tx_limit) {
+                                nv_tx_flip_ownership(dev);
+                        }
                 }
                 if (unlikely(np->get_tx.ex++ == np->last_tx.ex))
                         np->get_tx.ex = np->first_tx.ex;
@@ -5333,6 +5400,21 @@ static int __devinit nv_probe(struct pci_dev *pci_dev, const struct pci_device_i
                 np->need_linktimer = 0;
         }
 
+        /* Limit the number of tx's outstanding for hw bug */
+        if (id->driver_data & DEV_NEED_TX_LIMIT) {
+                np->tx_limit = 1;
+                if ((id->device == PCI_DEVICE_ID_NVIDIA_NVENET_32 ||
+                     id->device == PCI_DEVICE_ID_NVIDIA_NVENET_33 ||
+                     id->device == PCI_DEVICE_ID_NVIDIA_NVENET_34 ||
+                     id->device == PCI_DEVICE_ID_NVIDIA_NVENET_35 ||
+                     id->device == PCI_DEVICE_ID_NVIDIA_NVENET_36 ||
+                     id->device == PCI_DEVICE_ID_NVIDIA_NVENET_37 ||
+                     id->device == PCI_DEVICE_ID_NVIDIA_NVENET_38 ||
+                     id->device == PCI_DEVICE_ID_NVIDIA_NVENET_39) &&
+                    pci_dev->revision >= 0xA2)
+                        np->tx_limit = 0;
+        }
+
         /* clear phy state and temporarily halt phy interrupts */
         writel(0, base + NvRegMIIMask);
         phystate = readl(base + NvRegAdapterControl);
@@ -5563,19 +5645,19 @@ static struct pci_device_id pci_tbl[] = {
         },
         {       /* CK804 Ethernet Controller */
                 PCI_DEVICE(PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_NVENET_8),
-                .driver_data = DEV_NEED_TIMERIRQ|DEV_NEED_LINKTIMER|DEV_HAS_LARGEDESC|DEV_HAS_CHECKSUM|DEV_HAS_HIGH_DMA|DEV_HAS_STATISTICS_V1,
+                .driver_data = DEV_NEED_TIMERIRQ|DEV_NEED_LINKTIMER|DEV_HAS_LARGEDESC|DEV_HAS_CHECKSUM|DEV_HAS_HIGH_DMA|DEV_HAS_STATISTICS_V1|DEV_NEED_TX_LIMIT,
         },
         {       /* CK804 Ethernet Controller */
                 PCI_DEVICE(PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_NVENET_9),
-                .driver_data = DEV_NEED_TIMERIRQ|DEV_NEED_LINKTIMER|DEV_HAS_LARGEDESC|DEV_HAS_CHECKSUM|DEV_HAS_HIGH_DMA|DEV_HAS_STATISTICS_V1,
+                .driver_data = DEV_NEED_TIMERIRQ|DEV_NEED_LINKTIMER|DEV_HAS_LARGEDESC|DEV_HAS_CHECKSUM|DEV_HAS_HIGH_DMA|DEV_HAS_STATISTICS_V1|DEV_NEED_TX_LIMIT,
         },
         {       /* MCP04 Ethernet Controller */
                 PCI_DEVICE(PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_NVENET_10),
-                .driver_data = DEV_NEED_TIMERIRQ|DEV_NEED_LINKTIMER|DEV_HAS_LARGEDESC|DEV_HAS_CHECKSUM|DEV_HAS_HIGH_DMA|DEV_HAS_STATISTICS_V1,
+                .driver_data = DEV_NEED_TIMERIRQ|DEV_NEED_LINKTIMER|DEV_HAS_LARGEDESC|DEV_HAS_CHECKSUM|DEV_HAS_HIGH_DMA|DEV_HAS_STATISTICS_V1|DEV_NEED_TX_LIMIT,
         },
         {       /* MCP04 Ethernet Controller */
                 PCI_DEVICE(PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_NVENET_11),
-                .driver_data = DEV_NEED_TIMERIRQ|DEV_NEED_LINKTIMER|DEV_HAS_LARGEDESC|DEV_HAS_CHECKSUM|DEV_HAS_HIGH_DMA|DEV_HAS_STATISTICS_V1,
+                .driver_data = DEV_NEED_TIMERIRQ|DEV_NEED_LINKTIMER|DEV_HAS_LARGEDESC|DEV_HAS_CHECKSUM|DEV_HAS_HIGH_DMA|DEV_HAS_STATISTICS_V1|DEV_NEED_TX_LIMIT,
         },
         {       /* MCP51 Ethernet Controller */
                 PCI_DEVICE(PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_NVENET_12),
@@ -5587,11 +5669,11 @@ static struct pci_device_id pci_tbl[] = {
         },
         {       /* MCP55 Ethernet Controller */
                 PCI_DEVICE(PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_NVENET_14),
-                .driver_data = DEV_NEED_TIMERIRQ|DEV_NEED_LINKTIMER|DEV_HAS_LARGEDESC|DEV_HAS_CHECKSUM|DEV_HAS_HIGH_DMA|DEV_HAS_VLAN|DEV_HAS_MSI|DEV_HAS_MSI_X|DEV_HAS_POWER_CNTRL|DEV_HAS_PAUSEFRAME_TX_V1|DEV_HAS_STATISTICS_V2|DEV_HAS_TEST_EXTENDED|DEV_HAS_MGMT_UNIT,
+                .driver_data = DEV_NEED_TIMERIRQ|DEV_NEED_LINKTIMER|DEV_HAS_LARGEDESC|DEV_HAS_CHECKSUM|DEV_HAS_HIGH_DMA|DEV_HAS_VLAN|DEV_HAS_MSI|DEV_HAS_MSI_X|DEV_HAS_POWER_CNTRL|DEV_HAS_PAUSEFRAME_TX_V1|DEV_HAS_STATISTICS_V2|DEV_HAS_TEST_EXTENDED|DEV_HAS_MGMT_UNIT|DEV_NEED_TX_LIMIT,
         },
         {       /* MCP55 Ethernet Controller */
                 PCI_DEVICE(PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_NVENET_15),
-                .driver_data = DEV_NEED_TIMERIRQ|DEV_NEED_LINKTIMER|DEV_HAS_LARGEDESC|DEV_HAS_CHECKSUM|DEV_HAS_HIGH_DMA|DEV_HAS_VLAN|DEV_HAS_MSI|DEV_HAS_MSI_X|DEV_HAS_POWER_CNTRL|DEV_HAS_PAUSEFRAME_TX_V1|DEV_HAS_STATISTICS_V2|DEV_HAS_TEST_EXTENDED|DEV_HAS_MGMT_UNIT,
+                .driver_data = DEV_NEED_TIMERIRQ|DEV_NEED_LINKTIMER|DEV_HAS_LARGEDESC|DEV_HAS_CHECKSUM|DEV_HAS_HIGH_DMA|DEV_HAS_VLAN|DEV_HAS_MSI|DEV_HAS_MSI_X|DEV_HAS_POWER_CNTRL|DEV_HAS_PAUSEFRAME_TX_V1|DEV_HAS_STATISTICS_V2|DEV_HAS_TEST_EXTENDED|DEV_HAS_MGMT_UNIT|DEV_NEED_TX_LIMIT,
         },
         {       /* MCP61 Ethernet Controller */
                 PCI_DEVICE(PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_NVENET_16),
@@ -5611,19 +5693,19 @@ static struct pci_device_id pci_tbl[] = {
         },
         {       /* MCP65 Ethernet Controller */
                 PCI_DEVICE(PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_NVENET_20),
-                .driver_data = DEV_NEED_TIMERIRQ|DEV_NEED_LINKTIMER|DEV_HAS_LARGEDESC|DEV_HAS_HIGH_DMA|DEV_HAS_POWER_CNTRL|DEV_HAS_MSI|DEV_HAS_PAUSEFRAME_TX_V1|DEV_HAS_STATISTICS_V2|DEV_HAS_TEST_EXTENDED|DEV_HAS_MGMT_UNIT|DEV_HAS_CORRECT_MACADDR,
+                .driver_data = DEV_NEED_TIMERIRQ|DEV_NEED_LINKTIMER|DEV_HAS_LARGEDESC|DEV_HAS_HIGH_DMA|DEV_HAS_POWER_CNTRL|DEV_HAS_MSI|DEV_HAS_PAUSEFRAME_TX_V1|DEV_HAS_STATISTICS_V2|DEV_HAS_TEST_EXTENDED|DEV_HAS_MGMT_UNIT|DEV_HAS_CORRECT_MACADDR|DEV_NEED_TX_LIMIT|DEV_NEED_TX_LIMIT,
         },
         {       /* MCP65 Ethernet Controller */
                 PCI_DEVICE(PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_NVENET_21),
-                .driver_data = DEV_NEED_TIMERIRQ|DEV_NEED_LINKTIMER|DEV_HAS_LARGEDESC|DEV_HAS_HIGH_DMA|DEV_HAS_POWER_CNTRL|DEV_HAS_MSI|DEV_HAS_PAUSEFRAME_TX_V1|DEV_HAS_STATISTICS_V2|DEV_HAS_TEST_EXTENDED|DEV_HAS_MGMT_UNIT|DEV_HAS_CORRECT_MACADDR,
+                .driver_data = DEV_NEED_TIMERIRQ|DEV_NEED_LINKTIMER|DEV_HAS_LARGEDESC|DEV_HAS_HIGH_DMA|DEV_HAS_POWER_CNTRL|DEV_HAS_MSI|DEV_HAS_PAUSEFRAME_TX_V1|DEV_HAS_STATISTICS_V2|DEV_HAS_TEST_EXTENDED|DEV_HAS_MGMT_UNIT|DEV_HAS_CORRECT_MACADDR|DEV_NEED_TX_LIMIT,
         },
         {       /* MCP65 Ethernet Controller */
                 PCI_DEVICE(PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_NVENET_22),
-                .driver_data = DEV_NEED_TIMERIRQ|DEV_NEED_LINKTIMER|DEV_HAS_LARGEDESC|DEV_HAS_HIGH_DMA|DEV_HAS_POWER_CNTRL|DEV_HAS_MSI|DEV_HAS_PAUSEFRAME_TX_V1|DEV_HAS_STATISTICS_V2|DEV_HAS_TEST_EXTENDED|DEV_HAS_MGMT_UNIT|DEV_HAS_CORRECT_MACADDR,
+                .driver_data = DEV_NEED_TIMERIRQ|DEV_NEED_LINKTIMER|DEV_HAS_LARGEDESC|DEV_HAS_HIGH_DMA|DEV_HAS_POWER_CNTRL|DEV_HAS_MSI|DEV_HAS_PAUSEFRAME_TX_V1|DEV_HAS_STATISTICS_V2|DEV_HAS_TEST_EXTENDED|DEV_HAS_MGMT_UNIT|DEV_HAS_CORRECT_MACADDR|DEV_NEED_TX_LIMIT,
         },
         {       /* MCP65 Ethernet Controller */
                 PCI_DEVICE(PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_NVENET_23),
-                .driver_data = DEV_NEED_TIMERIRQ|DEV_NEED_LINKTIMER|DEV_HAS_LARGEDESC|DEV_HAS_HIGH_DMA|DEV_HAS_POWER_CNTRL|DEV_HAS_MSI|DEV_HAS_PAUSEFRAME_TX_V1|DEV_HAS_STATISTICS_V2|DEV_HAS_TEST_EXTENDED|DEV_HAS_MGMT_UNIT|DEV_HAS_CORRECT_MACADDR,
+                .driver_data = DEV_NEED_TIMERIRQ|DEV_NEED_LINKTIMER|DEV_HAS_LARGEDESC|DEV_HAS_HIGH_DMA|DEV_HAS_POWER_CNTRL|DEV_HAS_MSI|DEV_HAS_PAUSEFRAME_TX_V1|DEV_HAS_STATISTICS_V2|DEV_HAS_TEST_EXTENDED|DEV_HAS_MGMT_UNIT|DEV_HAS_CORRECT_MACADDR|DEV_NEED_TX_LIMIT,
         },
         {       /* MCP67 Ethernet Controller */
                 PCI_DEVICE(PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_NVENET_24),
@@ -5659,35 +5741,35 @@ static struct pci_device_id pci_tbl[] = {
         },
         {       /* MCP77 Ethernet Controller */
                 PCI_DEVICE(PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_NVENET_32),
-                .driver_data = DEV_NEED_TIMERIRQ|DEV_NEED_LINKTIMER|DEV_HAS_CHECKSUM|DEV_HAS_HIGH_DMA|DEV_HAS_MSI|DEV_HAS_POWER_CNTRL|DEV_HAS_PAUSEFRAME_TX_V2|DEV_HAS_STATISTICS_V2|DEV_HAS_TEST_EXTENDED|DEV_HAS_MGMT_UNIT|DEV_HAS_CORRECT_MACADDR|DEV_HAS_COLLISION_FIX,
+                .driver_data = DEV_NEED_TIMERIRQ|DEV_NEED_LINKTIMER|DEV_HAS_CHECKSUM|DEV_HAS_HIGH_DMA|DEV_HAS_MSI|DEV_HAS_POWER_CNTRL|DEV_HAS_PAUSEFRAME_TX_V2|DEV_HAS_STATISTICS_V2|DEV_HAS_TEST_EXTENDED|DEV_HAS_MGMT_UNIT|DEV_HAS_CORRECT_MACADDR|DEV_HAS_COLLISION_FIX|DEV_NEED_TX_LIMIT,
         },
         {       /* MCP77 Ethernet Controller */
                 PCI_DEVICE(PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_NVENET_33),
-                .driver_data = DEV_NEED_TIMERIRQ|DEV_NEED_LINKTIMER|DEV_HAS_CHECKSUM|DEV_HAS_HIGH_DMA|DEV_HAS_MSI|DEV_HAS_POWER_CNTRL|DEV_HAS_PAUSEFRAME_TX_V2|DEV_HAS_STATISTICS_V2|DEV_HAS_TEST_EXTENDED|DEV_HAS_MGMT_UNIT|DEV_HAS_CORRECT_MACADDR|DEV_HAS_COLLISION_FIX,
+                .driver_data = DEV_NEED_TIMERIRQ|DEV_NEED_LINKTIMER|DEV_HAS_CHECKSUM|DEV_HAS_HIGH_DMA|DEV_HAS_MSI|DEV_HAS_POWER_CNTRL|DEV_HAS_PAUSEFRAME_TX_V2|DEV_HAS_STATISTICS_V2|DEV_HAS_TEST_EXTENDED|DEV_HAS_MGMT_UNIT|DEV_HAS_CORRECT_MACADDR|DEV_HAS_COLLISION_FIX|DEV_NEED_TX_LIMIT,
         },
         {       /* MCP77 Ethernet Controller */
                 PCI_DEVICE(PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_NVENET_34),
-                .driver_data = DEV_NEED_TIMERIRQ|DEV_NEED_LINKTIMER|DEV_HAS_CHECKSUM|DEV_HAS_HIGH_DMA|DEV_HAS_MSI|DEV_HAS_POWER_CNTRL|DEV_HAS_PAUSEFRAME_TX_V2|DEV_HAS_STATISTICS_V2|DEV_HAS_TEST_EXTENDED|DEV_HAS_MGMT_UNIT|DEV_HAS_CORRECT_MACADDR|DEV_HAS_COLLISION_FIX,
+                .driver_data = DEV_NEED_TIMERIRQ|DEV_NEED_LINKTIMER|DEV_HAS_CHECKSUM|DEV_HAS_HIGH_DMA|DEV_HAS_MSI|DEV_HAS_POWER_CNTRL|DEV_HAS_PAUSEFRAME_TX_V2|DEV_HAS_STATISTICS_V2|DEV_HAS_TEST_EXTENDED|DEV_HAS_MGMT_UNIT|DEV_HAS_CORRECT_MACADDR|DEV_HAS_COLLISION_FIX|DEV_NEED_TX_LIMIT,
         },
         {       /* MCP77 Ethernet Controller */
                 PCI_DEVICE(PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_NVENET_35),
-                .driver_data = DEV_NEED_TIMERIRQ|DEV_NEED_LINKTIMER|DEV_HAS_CHECKSUM|DEV_HAS_HIGH_DMA|DEV_HAS_MSI|DEV_HAS_POWER_CNTRL|DEV_HAS_PAUSEFRAME_TX_V2|DEV_HAS_STATISTICS_V2|DEV_HAS_TEST_EXTENDED|DEV_HAS_MGMT_UNIT|DEV_HAS_CORRECT_MACADDR|DEV_HAS_COLLISION_FIX,
+                .driver_data = DEV_NEED_TIMERIRQ|DEV_NEED_LINKTIMER|DEV_HAS_CHECKSUM|DEV_HAS_HIGH_DMA|DEV_HAS_MSI|DEV_HAS_POWER_CNTRL|DEV_HAS_PAUSEFRAME_TX_V2|DEV_HAS_STATISTICS_V2|DEV_HAS_TEST_EXTENDED|DEV_HAS_MGMT_UNIT|DEV_HAS_CORRECT_MACADDR|DEV_HAS_COLLISION_FIX|DEV_NEED_TX_LIMIT,
         },
         {       /* MCP79 Ethernet Controller */
                 PCI_DEVICE(PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_NVENET_36),
-                .driver_data = DEV_NEED_TIMERIRQ|DEV_NEED_LINKTIMER|DEV_HAS_CHECKSUM|DEV_HAS_HIGH_DMA|DEV_HAS_MSI|DEV_HAS_POWER_CNTRL|DEV_HAS_PAUSEFRAME_TX_V3|DEV_HAS_STATISTICS_V2|DEV_HAS_TEST_EXTENDED|DEV_HAS_MGMT_UNIT|DEV_HAS_CORRECT_MACADDR|DEV_HAS_COLLISION_FIX,
+                .driver_data = DEV_NEED_TIMERIRQ|DEV_NEED_LINKTIMER|DEV_HAS_CHECKSUM|DEV_HAS_HIGH_DMA|DEV_HAS_MSI|DEV_HAS_POWER_CNTRL|DEV_HAS_PAUSEFRAME_TX_V3|DEV_HAS_STATISTICS_V2|DEV_HAS_TEST_EXTENDED|DEV_HAS_MGMT_UNIT|DEV_HAS_CORRECT_MACADDR|DEV_HAS_COLLISION_FIX|DEV_NEED_TX_LIMIT,
         },
         {       /* MCP79 Ethernet Controller */
                 PCI_DEVICE(PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_NVENET_37),
-                .driver_data = DEV_NEED_TIMERIRQ|DEV_NEED_LINKTIMER|DEV_HAS_CHECKSUM|DEV_HAS_HIGH_DMA|DEV_HAS_MSI|DEV_HAS_POWER_CNTRL|DEV_HAS_PAUSEFRAME_TX_V3|DEV_HAS_STATISTICS_V2|DEV_HAS_TEST_EXTENDED|DEV_HAS_MGMT_UNIT|DEV_HAS_CORRECT_MACADDR|DEV_HAS_COLLISION_FIX,
+                .driver_data = DEV_NEED_TIMERIRQ|DEV_NEED_LINKTIMER|DEV_HAS_CHECKSUM|DEV_HAS_HIGH_DMA|DEV_HAS_MSI|DEV_HAS_POWER_CNTRL|DEV_HAS_PAUSEFRAME_TX_V3|DEV_HAS_STATISTICS_V2|DEV_HAS_TEST_EXTENDED|DEV_HAS_MGMT_UNIT|DEV_HAS_CORRECT_MACADDR|DEV_HAS_COLLISION_FIX|DEV_NEED_TX_LIMIT,
         },
         {       /* MCP79 Ethernet Controller */
                 PCI_DEVICE(PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_NVENET_38),
-                .driver_data = DEV_NEED_TIMERIRQ|DEV_NEED_LINKTIMER|DEV_HAS_CHECKSUM|DEV_HAS_HIGH_DMA|DEV_HAS_MSI|DEV_HAS_POWER_CNTRL|DEV_HAS_PAUSEFRAME_TX_V3|DEV_HAS_STATISTICS_V2|DEV_HAS_TEST_EXTENDED|DEV_HAS_MGMT_UNIT|DEV_HAS_CORRECT_MACADDR|DEV_HAS_COLLISION_FIX,
+                .driver_data = DEV_NEED_TIMERIRQ|DEV_NEED_LINKTIMER|DEV_HAS_CHECKSUM|DEV_HAS_HIGH_DMA|DEV_HAS_MSI|DEV_HAS_POWER_CNTRL|DEV_HAS_PAUSEFRAME_TX_V3|DEV_HAS_STATISTICS_V2|DEV_HAS_TEST_EXTENDED|DEV_HAS_MGMT_UNIT|DEV_HAS_CORRECT_MACADDR|DEV_HAS_COLLISION_FIX|DEV_NEED_TX_LIMIT,
         },
         {       /* MCP79 Ethernet Controller */
                 PCI_DEVICE(PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_NVENET_39),
-                .driver_data = DEV_NEED_TIMERIRQ|DEV_NEED_LINKTIMER|DEV_HAS_CHECKSUM|DEV_HAS_HIGH_DMA|DEV_HAS_MSI|DEV_HAS_POWER_CNTRL|DEV_HAS_PAUSEFRAME_TX_V3|DEV_HAS_STATISTICS_V2|DEV_HAS_TEST_EXTENDED|DEV_HAS_MGMT_UNIT|DEV_HAS_CORRECT_MACADDR|DEV_HAS_COLLISION_FIX,
+                .driver_data = DEV_NEED_TIMERIRQ|DEV_NEED_LINKTIMER|DEV_HAS_CHECKSUM|DEV_HAS_HIGH_DMA|DEV_HAS_MSI|DEV_HAS_POWER_CNTRL|DEV_HAS_PAUSEFRAME_TX_V3|DEV_HAS_STATISTICS_V2|DEV_HAS_TEST_EXTENDED|DEV_HAS_MGMT_UNIT|DEV_HAS_CORRECT_MACADDR|DEV_HAS_COLLISION_FIX|DEV_NEED_TX_LIMIT,
         },
         {0,},
 };
diff --git a/drivers/net/ibm_newemac/core.c b/drivers/net/ibm_newemac/core.c
index e6c69f77259b..0789802d59ed 100644
--- a/drivers/net/ibm_newemac/core.c
+++ b/drivers/net/ibm_newemac/core.c
@@ -143,6 +143,10 @@ static inline void emac_report_timeout_error(struct emac_instance *dev,
 #define STOP_TIMEOUT_1000       13
 #define STOP_TIMEOUT_1000_JUMBO 73
 
+static unsigned char default_mcast_addr[] = {
+        0x01, 0x80, 0xC2, 0x00, 0x00, 0x01
+};
+
 /* Please, keep in sync with struct ibm_emac_stats/ibm_emac_error_stats */
 static const char emac_stats_keys[EMAC_ETHTOOL_STATS_COUNT][ETH_GSTRING_LEN] = {
         "rx_packets", "rx_bytes", "tx_packets", "tx_bytes", "rx_packets_csum",
@@ -618,6 +622,9 @@ static int emac_configure(struct emac_instance *dev)
         if (emac_phy_gpcs(dev->phy.mode))
                 emac_mii_reset_phy(&dev->phy);
 
+        /* Required for Pause packet support in EMAC */
+        dev_mc_add(ndev, default_mcast_addr, sizeof(default_mcast_addr), 1);
+
         return 0;
 }
 
diff --git a/drivers/net/ibm_newemac/tah.c b/drivers/net/ibm_newemac/tah.c
index 96417adec326..b023d10d7e1c 100644
--- a/drivers/net/ibm_newemac/tah.c
+++ b/drivers/net/ibm_newemac/tah.c
@@ -155,6 +155,10 @@ static int __devexit tah_remove(struct of_device *ofdev)
 static struct of_device_id tah_match[] =
 {
         {
+                .compatible     = "ibm,tah",
+        },
+        /* For backward compat with old DT */
+        {
                 .type           = "tah",
         },
         {},
diff --git a/drivers/net/ifb.c b/drivers/net/ifb.c
index 15949d3df17e..af233b591534 100644
--- a/drivers/net/ifb.c
+++ b/drivers/net/ifb.c
@@ -35,6 +35,7 @@
 #include <linux/moduleparam.h>
 #include <net/pkt_sched.h>
 #include <net/net_namespace.h>
+#include <linux/lockdep.h>
 
 #define TX_TIMEOUT  (2*HZ)
 
@@ -227,6 +228,16 @@ static struct rtnl_link_ops ifb_link_ops __read_mostly = {
 module_param(numifbs, int, 0);
 MODULE_PARM_DESC(numifbs, "Number of ifb devices");
 
+/*
+ * dev_ifb->queue_lock is usually taken after dev->ingress_lock,
+ * reversely to e.g. qdisc_lock_tree(). It should be safe until
+ * ifb doesn't take dev->queue_lock with dev_ifb->ingress_lock.
+ * But lockdep should know that ifb has different locks from dev.
+ */
+static struct lock_class_key ifb_queue_lock_key;
+static struct lock_class_key ifb_ingress_lock_key;
+
+
 static int __init ifb_init_one(int index)
 {
         struct net_device *dev_ifb;
@@ -246,6 +257,10 @@ static int __init ifb_init_one(int index)
         err = register_netdevice(dev_ifb);
         if (err < 0)
                 goto err;
+
+        lockdep_set_class(&dev_ifb->queue_lock, &ifb_queue_lock_key);
+        lockdep_set_class(&dev_ifb->ingress_lock, &ifb_ingress_lock_key);
+
         return 0;
 
 err:
diff --git a/drivers/net/igb/e1000_82575.h b/drivers/net/igb/e1000_82575.h
index 6604d96bd567..76ea846663db 100644
--- a/drivers/net/igb/e1000_82575.h
+++ b/drivers/net/igb/e1000_82575.h
@@ -61,28 +61,28 @@
 /* Receive Descriptor - Advanced */
 union e1000_adv_rx_desc {
         struct {
-                u64 pkt_addr;             /* Packet buffer address */
-                u64 hdr_addr;             /* Header buffer address */
+                __le64 pkt_addr;             /* Packet buffer address */
+                __le64 hdr_addr;             /* Header buffer address */
         } read;
         struct {
                 struct {
                         struct {
-                                u16 pkt_info;   /* RSS type, Packet type */
-                                u16 hdr_info;   /* Split Header,
-                                                 * header buffer length */
+                                __le16 pkt_info;   /* RSS type, Packet type */
+                                __le16 hdr_info;   /* Split Header,
+                                                    * header buffer length */
                         } lo_dword;
                         union {
-                                u32 rss;          /* RSS Hash */
+                                __le32 rss;          /* RSS Hash */
                                 struct {
-                                        u16 ip_id;    /* IP id */
-                                        u16 csum;     /* Packet Checksum */
+                                        __le16 ip_id;    /* IP id */
+                                        __le16 csum;     /* Packet Checksum */
                                 } csum_ip;
                         } hi_dword;
                 } lower;
                 struct {
-                        u32 status_error;     /* ext status/error */
-                        u16 length;           /* Packet length */
-                        u16 vlan;             /* VLAN tag */
+                        __le32 status_error;     /* ext status/error */
+                        __le16 length;           /* Packet length */
+                        __le16 vlan;             /* VLAN tag */
                 } upper;
         } wb;  /* writeback */
 };
@@ -97,14 +97,14 @@ union e1000_adv_rx_desc {
 /* Transmit Descriptor - Advanced */
 union e1000_adv_tx_desc {
         struct {
-                u64 buffer_addr;    /* Address of descriptor's data buf */
-                u32 cmd_type_len;
-                u32 olinfo_status;
+                __le64 buffer_addr;    /* Address of descriptor's data buf */
+                __le32 cmd_type_len;
+                __le32 olinfo_status;
         } read;
         struct {
-                u64 rsvd;       /* Reserved */
-                u32 nxtseq_seed;
-                u32 status;
+                __le64 rsvd;       /* Reserved */
+                __le32 nxtseq_seed;
+                __le32 status;
         } wb;
 };
 
@@ -119,10 +119,10 @@ union e1000_adv_tx_desc {
 
 /* Context descriptors */
 struct e1000_adv_tx_context_desc {
-        u32 vlan_macip_lens;
-        u32 seqnum_seed;
-        u32 type_tucmd_mlhl;
-        u32 mss_l4len_idx;
+        __le32 vlan_macip_lens;
+        __le32 seqnum_seed;
+        __le32 type_tucmd_mlhl;
+        __le32 mss_l4len_idx;
 };
 
 #define E1000_ADVTXD_MACLEN_SHIFT    9  /* Adv ctxt desc mac len shift */
diff --git a/drivers/net/igb/e1000_hw.h b/drivers/net/igb/e1000_hw.h
index 161fb68764af..7b2c70a3b8cc 100644
--- a/drivers/net/igb/e1000_hw.h
+++ b/drivers/net/igb/e1000_hw.h
@@ -143,35 +143,35 @@ enum e1000_fc_type {
 
 /* Receive Descriptor */
 struct e1000_rx_desc {
-        u64 buffer_addr; /* Address of the descriptor's data buffer */
-        u16 length;      /* Length of data DMAed into data buffer */
-        u16 csum;        /* Packet checksum */
+        __le64 buffer_addr; /* Address of the descriptor's data buffer */
+        __le16 length;      /* Length of data DMAed into data buffer */
+        __le16 csum;        /* Packet checksum */
         u8  status;      /* Descriptor status */
         u8  errors;      /* Descriptor Errors */
-        u16 special;
+        __le16 special;
 };
 
 /* Receive Descriptor - Extended */
 union e1000_rx_desc_extended {
         struct {
-                u64 buffer_addr;
-                u64 reserved;
+                __le64 buffer_addr;
+                __le64 reserved;
         } read;
         struct {
                 struct {
-                        u32 mrq;              /* Multiple Rx Queues */
+                        __le32 mrq;              /* Multiple Rx Queues */
                         union {
-                                u32 rss;            /* RSS Hash */
+                                __le32 rss;            /* RSS Hash */
                                 struct {
-                                        u16 ip_id;  /* IP id */
-                                        u16 csum;   /* Packet Checksum */
+                                        __le16 ip_id;  /* IP id */
+                                        __le16 csum;   /* Packet Checksum */
                                 } csum_ip;
                         } hi_dword;
                 } lower;
                 struct {
-                        u32 status_error;     /* ext status/error */
-                        u16 length;
-                        u16 vlan;             /* VLAN tag */
+                        __le32 status_error;     /* ext status/error */
+                        __le16 length;
+                        __le16 vlan;             /* VLAN tag */
                 } upper;
         } wb;  /* writeback */
 };
@@ -181,49 +181,49 @@ union e1000_rx_desc_extended {
 union e1000_rx_desc_packet_split {
         struct {
                 /* one buffer for protocol header(s), three data buffers */
-                u64 buffer_addr[MAX_PS_BUFFERS];
+                __le64 buffer_addr[MAX_PS_BUFFERS];
         } read;
         struct {
                 struct {
-                        u32 mrq;              /* Multiple Rx Queues */
+                        __le32 mrq;              /* Multiple Rx Queues */
                         union {
-                                u32 rss;              /* RSS Hash */
+                                __le32 rss;              /* RSS Hash */
                                 struct {
-                                        u16 ip_id;    /* IP id */
-                                        u16 csum;     /* Packet Checksum */
+                                        __le16 ip_id;    /* IP id */
+                                        __le16 csum;     /* Packet Checksum */
                                 } csum_ip;
                         } hi_dword;
                 } lower;
                 struct {
-                        u32 status_error;     /* ext status/error */
-                        u16 length0;          /* length of buffer 0 */
-                        u16 vlan;             /* VLAN tag */
+                        __le32 status_error;     /* ext status/error */
+                        __le16 length0;          /* length of buffer 0 */
+                        __le16 vlan;             /* VLAN tag */
                 } middle;
                 struct {
-                        u16 header_status;
-                        u16 length[3];        /* length of buffers 1-3 */
+                        __le16 header_status;
+                        __le16 length[3];        /* length of buffers 1-3 */
                 } upper;
-                u64 reserved;
+                __le64 reserved;
         } wb; /* writeback */
 };
 
 /* Transmit Descriptor */
 struct e1000_tx_desc {
-        u64 buffer_addr;      /* Address of the descriptor's data buffer */
+        __le64 buffer_addr;      /* Address of the descriptor's data buffer */
         union {
-                u32 data;
+                __le32 data;
                 struct {
-                        u16 length;    /* Data buffer length */
+                        __le16 length;    /* Data buffer length */
                         u8 cso;        /* Checksum offset */
                         u8 cmd;        /* Descriptor control */
                 } flags;
         } lower;
         union {
-                u32 data;
+                __le32 data;
                 struct {
                         u8 status;     /* Descriptor status */
                         u8 css;        /* Checksum start */
-                        u16 special;
+                        __le16 special;
                 } fields;
         } upper;
 };
@@ -231,49 +231,49 @@ struct e1000_tx_desc {
 /* Offload Context Descriptor */
 struct e1000_context_desc {
         union {
-                u32 ip_config;
+                __le32 ip_config;
                 struct {
                         u8 ipcss;      /* IP checksum start */
                         u8 ipcso;      /* IP checksum offset */
-                        u16 ipcse;     /* IP checksum end */
+                        __le16 ipcse;     /* IP checksum end */
                 } ip_fields;
         } lower_setup;
         union {
-                u32 tcp_config;
+                __le32 tcp_config;
                 struct {
                         u8 tucss;      /* TCP checksum start */
                         u8 tucso;      /* TCP checksum offset */
-                        u16 tucse;     /* TCP checksum end */
+                        __le16 tucse;     /* TCP checksum end */
                 } tcp_fields;
         } upper_setup;
-        u32 cmd_and_length;
+        __le32 cmd_and_length;
         union {
-                u32 data;
+                __le32 data;
                 struct {
                         u8 status;     /* Descriptor status */
                         u8 hdr_len;    /* Header length */
-                        u16 mss;       /* Maximum segment size */
+                        __le16 mss;       /* Maximum segment size */
                 } fields;
         } tcp_seg_setup;
 };
 
 /* Offload data descriptor */
 struct e1000_data_desc {
-        u64 buffer_addr;   /* Address of the descriptor's buffer address */
+        __le64 buffer_addr;   /* Address of the descriptor's buffer address */
         union {
-                u32 data;
+                __le32 data;
                 struct {
-                        u16 length;    /* Data buffer length */
+                        __le16 length;    /* Data buffer length */
                         u8 typ_len_ext;
                         u8 cmd;
                 } flags;
         } lower;
         union {
-                u32 data;
+                __le32 data;
                 struct {
                         u8 status;     /* Descriptor status */
                         u8 popts;      /* Packet Options */
-                        u16 special;
+                        __le16 special;
                 } fields;
         } upper;
 };
diff --git a/drivers/net/igb/igb_main.c b/drivers/net/igb/igb_main.c
index 6a1f23092099..aaee02e9e3f0 100644
--- a/drivers/net/igb/igb_main.c
+++ b/drivers/net/igb/igb_main.c
@@ -31,7 +31,6 @@
 #include <linux/vmalloc.h>
 #include <linux/pagemap.h>
 #include <linux/netdevice.h>
-#include <linux/tcp.h>
 #include <linux/ipv6.h>
 #include <net/checksum.h>
 #include <net/ip6_checksum.h>
@@ -2484,10 +2483,24 @@ static inline bool igb_tx_csum_adv(struct igb_adapter *adapter,
                 tu_cmd |= (E1000_TXD_CMD_DEXT | E1000_ADVTXD_DTYP_CTXT);
 
                 if (skb->ip_summed == CHECKSUM_PARTIAL) {
-                        if (skb->protocol == htons(ETH_P_IP))
+                        switch (skb->protocol) {
+                        case __constant_htons(ETH_P_IP):
                                 tu_cmd |= E1000_ADVTXD_TUCMD_IPV4;
-                        if (skb->sk && (skb->sk->sk_protocol == IPPROTO_TCP))
-                                tu_cmd |= E1000_ADVTXD_TUCMD_L4T_TCP;
+                                if (ip_hdr(skb)->protocol == IPPROTO_TCP)
+                                        tu_cmd |= E1000_ADVTXD_TUCMD_L4T_TCP;
+                                break;
+                        case __constant_htons(ETH_P_IPV6):
+                                /* XXX what about other V6 headers?? */
+                                if (ipv6_hdr(skb)->nexthdr == IPPROTO_TCP)
+                                        tu_cmd |= E1000_ADVTXD_TUCMD_L4T_TCP;
+                                break;
+                        default:
+                                if (unlikely(net_ratelimit()))
+                                        dev_warn(&adapter->pdev->dev,
+                                            "partial checksum but proto=%x!\n",
+                                            skb->protocol);
+                                break;
+                        }
                 }
 
                 context_desc->type_tucmd_mlhl = cpu_to_le32(tu_cmd);
@@ -3241,6 +3254,13 @@ quit_polling:
 
         return 1;
 }
+
+static inline u32 get_head(struct igb_ring *tx_ring)
+{
+        void *end = (struct e1000_tx_desc *)tx_ring->desc + tx_ring->count;
+        return le32_to_cpu(*(volatile __le32 *)end);
+}
+
 /**
  * igb_clean_tx_irq - Reclaim resources after transmit completes
  * @adapter: board private structure
@@ -3262,9 +3282,7 @@ static bool igb_clean_tx_irq(struct igb_adapter *adapter,
         unsigned int total_bytes = 0, total_packets = 0;
 
         rmb();
-        head = *(volatile u32 *)((struct e1000_tx_desc *)tx_ring->desc
-                                 + tx_ring->count);
-        head = le32_to_cpu(head);
+        head = get_head(tx_ring);
         i = tx_ring->next_to_clean;
         while (1) {
                 while (i != head) {
@@ -3299,9 +3317,7 @@ static bool igb_clean_tx_irq(struct igb_adapter *adapter,
                 }
                 oldhead = head;
                 rmb();
-                head = *(volatile u32 *)((struct e1000_tx_desc *)tx_ring->desc
-                                         + tx_ring->count);
-                head = le32_to_cpu(head);
+                head = get_head(tx_ring);
                 if (head == oldhead)
                         goto done_cleaning;
         }  /* while (1) */
@@ -3375,7 +3391,7 @@ done_cleaning:
  * @vlan: descriptor vlan field as written by hardware (no le/be conversion)
  * @skb: pointer to sk_buff to be indicated to stack
  **/
-static void igb_receive_skb(struct igb_adapter *adapter, u8 status, u16 vlan,
+static void igb_receive_skb(struct igb_adapter *adapter, u8 status, __le16 vlan,
                             struct sk_buff *skb)
 {
         if (adapter->vlgrp && (status & E1000_RXD_STAT_VP))
@@ -3439,8 +3455,8 @@ static bool igb_clean_rx_irq_adv(struct igb_adapter *adapter,
                  * that case, it fills the header buffer and spills the rest
                  * into the page.
                  */
-                hlen = le16_to_cpu((rx_desc->wb.lower.lo_dword.hdr_info &
-                  E1000_RXDADV_HDRBUFLEN_MASK) >> E1000_RXDADV_HDRBUFLEN_SHIFT);
+                hlen = (le16_to_cpu(rx_desc->wb.lower.lo_dword.hdr_info) &
+                  E1000_RXDADV_HDRBUFLEN_MASK) >> E1000_RXDADV_HDRBUFLEN_SHIFT;
                 if (hlen > adapter->rx_ps_hdr_size)
                         hlen = adapter->rx_ps_hdr_size;
 
diff --git a/drivers/net/ioc3-eth.c b/drivers/net/ioc3-eth.c
index 373f72cdbe8e..1f25263dc7eb 100644
--- a/drivers/net/ioc3-eth.c
+++ b/drivers/net/ioc3-eth.c
@@ -1221,7 +1221,8 @@ static void __devinit ioc3_serial_probe(struct pci_dev *pdev, struct ioc3 *ioc3)
 }
 #endif
 
-static int ioc3_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
+static int __devinit ioc3_probe(struct pci_dev *pdev,
+        const struct pci_device_id *ent)
 {
         unsigned int sw_physid1, sw_physid2;
         struct net_device *dev = NULL;
diff --git a/drivers/net/ipg.c b/drivers/net/ipg.c
index 5e5d9b527ed1..9b358f61ed7f 100644
--- a/drivers/net/ipg.c
+++ b/drivers/net/ipg.c
@@ -472,7 +472,6 @@ static int ipg_config_autoneg(struct net_device *dev)
         unsigned int txflowcontrol;
         unsigned int rxflowcontrol;
         unsigned int fullduplex;
-        unsigned int gig;
         u32 mac_ctrl_val;
         u32 asicctrl;
         u8 phyctrl;
@@ -489,7 +488,6 @@ static int ipg_config_autoneg(struct net_device *dev)
         fullduplex = 0;
         txflowcontrol = 0;
         rxflowcontrol = 0;
-        gig = 0;
 
         /* To accomodate a problem in 10Mbps operation,
          * set a global flag if PHY running in 10Mbps mode.
@@ -511,7 +509,6 @@ static int ipg_config_autoneg(struct net_device *dev)
                 break;
         case IPG_PC_LINK_SPEED_1000MBPS:
                 printk("1000Mbps.\n");
-                gig = 1;
                 break;
         default:
                 printk("undefined!\n");
@@ -1900,8 +1897,13 @@ static int ipg_nic_hard_start_xmit(struct sk_buff *skb, struct net_device *dev)
 
         /* Specify the TFC field within the TFD. */
         txfd->tfc |= cpu_to_le64(IPG_TFC_WORDALIGNDISABLED |
-                (IPG_TFC_FRAMEID & cpu_to_le64(sp->tx_current)) |
+                (IPG_TFC_FRAMEID & sp->tx_current) |
                 (IPG_TFC_FRAGCOUNT & (1 << 24)));
+        /*
+         * 16--17 (WordAlign) <- 3 (disable),
+         * 0--15 (FrameId) <- sp->tx_current,
+         * 24--27 (FragCount) <- 1
+         */
 
         /* Request TxComplete interrupts at an interval defined
          * by the constant IPG_FRAMESBETWEENTXCOMPLETES.
diff --git a/drivers/net/ixgb/ixgb_main.c b/drivers/net/ixgb/ixgb_main.c
index 269e6f805f47..6738b4d097fe 100644
--- a/drivers/net/ixgb/ixgb_main.c
+++ b/drivers/net/ixgb/ixgb_main.c
@@ -2088,14 +2088,12 @@ ixgb_alloc_rx_buffers(struct ixgb_adapter *adapter)
         struct ixgb_buffer *buffer_info;
         struct sk_buff *skb;
         unsigned int i;
-        int num_group_tail_writes;
         long cleancount;
 
         i = rx_ring->next_to_use;
         buffer_info = &rx_ring->buffer_info[i];
         cleancount = IXGB_DESC_UNUSED(rx_ring);
 
-        num_group_tail_writes = IXGB_RX_BUFFER_WRITE;
 
         /* leave three descriptors unused */
         while(--cleancount > 2) {
diff --git a/drivers/net/ixgbe/ixgbe_main.c b/drivers/net/ixgbe/ixgbe_main.c
index 23d0a4afe0e1..c2095ce531c9 100644
--- a/drivers/net/ixgbe/ixgbe_main.c
+++ b/drivers/net/ixgbe/ixgbe_main.c
@@ -2133,7 +2133,7 @@ static void ixgbe_watchdog(unsigned long data)
                                 (link_speed == IXGBE_LINK_SPEED_10GB_FULL ?
                                  "10 Gbps" :
                                  (link_speed == IXGBE_LINK_SPEED_1GB_FULL ?
-                                  "1 Gpbs" : "unknown speed")),
+                                  "1 Gbps" : "unknown speed")),
                                 ((FLOW_RX && FLOW_TX) ? "RX/TX" :
                                  (FLOW_RX ? "RX" :
                                  (FLOW_TX ? "TX" : "None"))));
diff --git a/drivers/net/mv643xx_eth.c b/drivers/net/mv643xx_eth.c
index b528ce77c406..771139e283af 100644
--- a/drivers/net/mv643xx_eth.c
+++ b/drivers/net/mv643xx_eth.c
@@ -2104,6 +2104,7 @@ MODULE_LICENSE("GPL");
 MODULE_AUTHOR(  "Rabeeh Khoury, Assaf Hoffman, Matthew Dharm, Manish Lachwani"
                 " and Dale Farnsworth");
 MODULE_DESCRIPTION("Ethernet driver for Marvell MV643XX");
+MODULE_ALIAS("platform:mv643xx_eth");
 
 /*
  * The second part is the low level driver of the gigE ethernet ports.
diff --git a/drivers/net/ne2k-pci.c b/drivers/net/ne2k-pci.c
index b569c90da4ba..de0de744a8fa 100644
--- a/drivers/net/ne2k-pci.c
+++ b/drivers/net/ne2k-pci.c
@@ -535,9 +535,9 @@ static void ne2k_pci_block_input(struct net_device *dev, int count,
                 if (count & 3) {
                         buf += count & ~3;
                         if (count & 2) {
-                                u16 *b = (u16 *)buf;
+                                __le16 *b = (__le16 *)buf;
 
-                                *b++ = le16_to_cpu(inw(NE_BASE + NE_DATAPORT));
+                                *b++ = cpu_to_le16(inw(NE_BASE + NE_DATAPORT));
                                 buf = (char *)b;
                         }
                         if (count & 1)
@@ -600,9 +600,9 @@ static void ne2k_pci_block_output(struct net_device *dev, int count,
                 if (count & 3) {
                         buf += count & ~3;
                         if (count & 2) {
-                                u16 *b = (u16 *)buf;
+                                __le16 *b = (__le16 *)buf;
 
-                                outw(cpu_to_le16(*b++), NE_BASE + NE_DATAPORT);
+                                outw(le16_to_cpu(*b++), NE_BASE + NE_DATAPORT);
                                 buf = (char *)b;
                         }
                 }
diff --git a/drivers/net/netxen/netxen_nic.h b/drivers/net/netxen/netxen_nic.h
index 2bc5eaae141f..7f20a03623a0 100644
--- a/drivers/net/netxen/netxen_nic.h
+++ b/drivers/net/netxen/netxen_nic.h
@@ -85,7 +85,7 @@
         (sizeof(struct netxen_cmd_buffer) * adapter->max_tx_desc_count)
 #define RCV_BUFFSIZE    \
         (sizeof(struct netxen_rx_buffer) * rcv_desc->max_rx_desc_count)
-#define find_diff_among(a,b,range) ((a)<=(b)?((b)-(a)):((b)+(range)-(a)))
+#define find_diff_among(a,b,range) ((a)<(b)?((b)-(a)):((b)+(range)-(a)))
 
 #define NETXEN_NETDEV_STATUS            0x1
 #define NETXEN_RCV_PRODUCER_OFFSET      0
@@ -204,7 +204,7 @@ enum {
                         ? RCV_DESC_LRO :        \
                         (RCV_DESC_NORMAL)))
 
-#define MAX_CMD_DESCRIPTORS             1024
+#define MAX_CMD_DESCRIPTORS             4096
 #define MAX_RCV_DESCRIPTORS             16384
 #define MAX_CMD_DESCRIPTORS_HOST        (MAX_CMD_DESCRIPTORS / 4)
 #define MAX_RCV_DESCRIPTORS_1G          (MAX_RCV_DESCRIPTORS / 4)
@@ -818,15 +818,8 @@ struct netxen_adapter_stats {
         u64  badskblen;
         u64  nocmddescriptor;
         u64  polled;
-        u64  uphappy;
-        u64  updropped;
-        u64  uplcong;
-        u64  uphcong;
-        u64  upmcong;
-        u64  updunno;
-        u64  skbfreed;
+        u64  rxdropped;
         u64  txdropped;
-        u64  txnullskb;
         u64  csummed;
         u64  no_rcv;
         u64  rxbytes;
@@ -842,7 +835,6 @@ struct netxen_rcv_desc_ctx {
         u32 flags;
         u32 producer;
         u32 rcv_pending;        /* Num of bufs posted in phantom */
-        u32 rcv_free;           /* Num of bufs in free list */
         dma_addr_t phys_addr;
         struct pci_dev *phys_pdev;
         struct rcv_desc *desc_head;     /* address of rx ring in Phantom */
@@ -889,8 +881,6 @@ struct netxen_adapter {
         int mtu;
         int portnum;
 
-        spinlock_t tx_lock;
-        spinlock_t lock;
         struct work_struct watchdog_task;
         struct timer_list watchdog_timer;
         struct work_struct  tx_timeout_task;
@@ -899,16 +889,12 @@ struct netxen_adapter {
 
         u32 cmd_producer;
         __le32 *cmd_consumer;
-
         u32 last_cmd_consumer;
+
         u32 max_tx_desc_count;
         u32 max_rx_desc_count;
         u32 max_jumbo_rx_desc_count;
         u32 max_lro_rx_desc_count;
-        /* Num of instances active on cmd buffer ring */
-        u32 proc_cmd_buf_counter;
-
-        u32 num_threads, total_threads; /*Use to keep track of xmit threads */
 
         u32 flags;
         u32 irq;
@@ -942,6 +928,7 @@ struct netxen_adapter {
         struct pci_dev *ctx_desc_pdev;
         dma_addr_t ctx_desc_phys_addr;
         int intr_scheme;
+        int msi_mode;
         int (*enable_phy_interrupts) (struct netxen_adapter *);
         int (*disable_phy_interrupts) (struct netxen_adapter *);
         void (*handle_phy_intr) (struct netxen_adapter *);
@@ -1075,12 +1062,10 @@ void netxen_tso_check(struct netxen_adapter *adapter,
                       struct cmd_desc_type0 *desc, struct sk_buff *skb);
 int netxen_nic_hw_resources(struct netxen_adapter *adapter);
 void netxen_nic_clear_stats(struct netxen_adapter *adapter);
-int netxen_nic_rx_has_work(struct netxen_adapter *adapter);
-int netxen_nic_tx_has_work(struct netxen_adapter *adapter);
 void netxen_watchdog_task(struct work_struct *work);
 void netxen_post_rx_buffers(struct netxen_adapter *adapter, u32 ctx,
                             u32 ringid);
-int netxen_process_cmd_ring(unsigned long data);
+int netxen_process_cmd_ring(struct netxen_adapter *adapter);
 u32 netxen_process_rcv_ring(struct netxen_adapter *adapter, int ctx, int max);
 void netxen_nic_set_multi(struct net_device *netdev);
 int netxen_nic_change_mtu(struct net_device *netdev, int new_mtu);
diff --git a/drivers/net/netxen/netxen_nic_ethtool.c b/drivers/net/netxen/netxen_nic_ethtool.c
index 7a876f4b8db2..6e98d830eefb 100644
--- a/drivers/net/netxen/netxen_nic_ethtool.c
+++ b/drivers/net/netxen/netxen_nic_ethtool.c
@@ -64,15 +64,7 @@ static const struct netxen_nic_stats netxen_nic_gstrings_stats[] = {
         {"bad_skb_len", NETXEN_NIC_STAT(stats.badskblen)},
         {"no_cmd_desc", NETXEN_NIC_STAT(stats.nocmddescriptor)},
         {"polled", NETXEN_NIC_STAT(stats.polled)},
-        {"uphappy", NETXEN_NIC_STAT(stats.uphappy)},
-        {"updropped", NETXEN_NIC_STAT(stats.updropped)},
-        {"uplcong", NETXEN_NIC_STAT(stats.uplcong)},
-        {"uphcong", NETXEN_NIC_STAT(stats.uphcong)},
-        {"upmcong", NETXEN_NIC_STAT(stats.upmcong)},
-        {"updunno", NETXEN_NIC_STAT(stats.updunno)},
-        {"skb_freed", NETXEN_NIC_STAT(stats.skbfreed)},
         {"tx_dropped", NETXEN_NIC_STAT(stats.txdropped)},
-        {"tx_null_skb", NETXEN_NIC_STAT(stats.txnullskb)},
         {"csummed", NETXEN_NIC_STAT(stats.csummed)},
         {"no_rcv", NETXEN_NIC_STAT(stats.no_rcv)},
         {"rx_bytes", NETXEN_NIC_STAT(stats.rxbytes)},
diff --git a/drivers/net/netxen/netxen_nic_hdr.h b/drivers/net/netxen/netxen_nic_hdr.h
index d72f8f8fcb50..160f605e58db 100644
--- a/drivers/net/netxen/netxen_nic_hdr.h
+++ b/drivers/net/netxen/netxen_nic_hdr.h
@@ -456,6 +456,12 @@ enum {
 #define ISR_INT_MASK_SLOW       (NETXEN_PCIX_PS_REG(PCIX_INT_MASK))
 #define ISR_INT_TARGET_STATUS   (NETXEN_PCIX_PS_REG(PCIX_TARGET_STATUS))
 #define ISR_INT_TARGET_MASK     (NETXEN_PCIX_PS_REG(PCIX_TARGET_MASK))
+#define ISR_INT_TARGET_STATUS_F1   (NETXEN_PCIX_PS_REG(PCIX_TARGET_STATUS_F1))
+#define ISR_INT_TARGET_MASK_F1     (NETXEN_PCIX_PS_REG(PCIX_TARGET_MASK_F1))
+#define ISR_INT_TARGET_STATUS_F2   (NETXEN_PCIX_PS_REG(PCIX_TARGET_STATUS_F2))
+#define ISR_INT_TARGET_MASK_F2     (NETXEN_PCIX_PS_REG(PCIX_TARGET_MASK_F2))
+#define ISR_INT_TARGET_STATUS_F3   (NETXEN_PCIX_PS_REG(PCIX_TARGET_STATUS_F3))
+#define ISR_INT_TARGET_MASK_F3     (NETXEN_PCIX_PS_REG(PCIX_TARGET_MASK_F3))
 
 #define NETXEN_PCI_MAPSIZE      128
 #define NETXEN_PCI_DDR_NET      (0x00000000UL)
@@ -662,6 +668,12 @@ enum {
 
 #define PCIX_TARGET_STATUS      (0x10118)
 #define PCIX_TARGET_MASK        (0x10128)
+#define PCIX_TARGET_STATUS_F1 (0x10160)
+#define PCIX_TARGET_MASK_F1   (0x10170)
+#define PCIX_TARGET_STATUS_F2 (0x10164)
+#define PCIX_TARGET_MASK_F2   (0x10174)
+#define PCIX_TARGET_STATUS_F3 (0x10168)
+#define PCIX_TARGET_MASK_F3   (0x10178)
 
 #define PCIX_MSI_F0             (0x13000)
 #define PCIX_MSI_F1             (0x13004)
diff --git a/drivers/net/netxen/netxen_nic_hw.c b/drivers/net/netxen/netxen_nic_hw.c
index 01355701bf8e..05748ca6f216 100644
--- a/drivers/net/netxen/netxen_nic_hw.c
+++ b/drivers/net/netxen/netxen_nic_hw.c
@@ -398,6 +398,8 @@ int netxen_nic_hw_resources(struct netxen_adapter *adapter)
                 NETXEN_CRB_NORMALIZE(adapter, CRB_NIC_CAPABILITIES_FW));
         printk(KERN_NOTICE "%s: FW capabilities:0x%x\n", netxen_nic_driver_name,
                         adapter->intr_scheme);
+        adapter->msi_mode = readl(
+                NETXEN_CRB_NORMALIZE(adapter, CRB_NIC_MSI_MODE_FW));
         DPRINTK(INFO, "Receive Peg ready too. starting stuff\n");
 
         addr = netxen_alloc(adapter->ahw.pdev,
diff --git a/drivers/net/netxen/netxen_nic_init.c b/drivers/net/netxen/netxen_nic_init.c
index 9e38bcb3fba9..45fa33e0cb90 100644
--- a/drivers/net/netxen/netxen_nic_init.c
+++ b/drivers/net/netxen/netxen_nic_init.c
@@ -145,6 +145,8 @@ int netxen_init_firmware(struct netxen_adapter *adapter)
         /* Window 1 call */
         writel(INTR_SCHEME_PERPORT,
                NETXEN_CRB_NORMALIZE(adapter, CRB_NIC_CAPABILITIES_HOST));
+        writel(MSI_MODE_MULTIFUNC,
+               NETXEN_CRB_NORMALIZE(adapter, CRB_NIC_MSI_MODE_HOST));
         writel(MPORT_MULTI_FUNCTION_MODE,
                NETXEN_CRB_NORMALIZE(adapter, CRB_MPORT_MODE));
         writel(PHAN_INITIALIZE_ACK,
@@ -183,7 +185,6 @@ void netxen_initialize_adapter_sw(struct netxen_adapter *adapter)
                 for (ring = 0; ring < NUM_RCV_DESC_RINGS; ring++) {
                         struct netxen_rx_buffer *rx_buf;
                         rcv_desc = &adapter->recv_ctx[ctxid].rcv_desc[ring];
-                        rcv_desc->rcv_free = rcv_desc->max_rx_desc_count;
                         rcv_desc->begin_alloc = 0;
                         rx_buf = rcv_desc->rx_buf_arr;
                         num_rx_bufs = rcv_desc->max_rx_desc_count;
@@ -974,28 +975,6 @@ int netxen_phantom_init(struct netxen_adapter *adapter, int pegtune_val)
         return 0;
 }
 
-int netxen_nic_rx_has_work(struct netxen_adapter *adapter)
-{
-        int ctx;
-
-        for (ctx = 0; ctx < MAX_RCV_CTX; ++ctx) {
-                struct netxen_recv_context *recv_ctx =
-                    &(adapter->recv_ctx[ctx]);
-                u32 consumer;
-                struct status_desc *desc_head;
-                struct status_desc *desc;
-
-                consumer = recv_ctx->status_rx_consumer;
-                desc_head = recv_ctx->rcv_status_desc_head;
-                desc = &desc_head[consumer];
-
-                if (netxen_get_sts_owner(desc) & STATUS_OWNER_HOST)
-                        return 1;
-        }
-
-        return 0;
-}
-
 static int netxen_nic_check_temp(struct netxen_adapter *adapter)
 {
         struct net_device *netdev = adapter->netdev;
@@ -1038,7 +1017,6 @@ static int netxen_nic_check_temp(struct netxen_adapter *adapter)
 
 void netxen_watchdog_task(struct work_struct *work)
 {
-        struct net_device *netdev;
         struct netxen_adapter *adapter =
                 container_of(work, struct netxen_adapter, watchdog_task);
 
@@ -1048,20 +1026,6 @@ void netxen_watchdog_task(struct work_struct *work)
         if (adapter->handle_phy_intr)
                 adapter->handle_phy_intr(adapter);
 
-        netdev = adapter->netdev;
-        if ((netif_running(netdev)) && !netif_carrier_ok(netdev) &&
-                        netxen_nic_link_ok(adapter) ) {
-                printk(KERN_INFO "%s %s (port %d), Link is up\n",
-                               netxen_nic_driver_name, netdev->name, adapter->portnum);
-                netif_carrier_on(netdev);
-                netif_wake_queue(netdev);
-        } else if(!(netif_running(netdev)) && netif_carrier_ok(netdev)) {
-                printk(KERN_ERR "%s %s Link is Down\n",
-                                netxen_nic_driver_name, netdev->name);
-                netif_carrier_off(netdev);
-                netif_stop_queue(netdev);
-        }
-
         mod_timer(&adapter->watchdog_timer, jiffies + 2 * HZ);
 }
 
@@ -1125,7 +1089,7 @@ static void netxen_process_rcv(struct netxen_adapter *adapter, int ctxid,
         skb = (struct sk_buff *)buffer->skb;
 
         if (likely(adapter->rx_csum &&
-                                netxen_get_sts_status(sts_data) == STATUS_CKSUM_OK)) {
+                        netxen_get_sts_status(sts_data) == STATUS_CKSUM_OK)) {
                 adapter->stats.csummed++;
                 skb->ip_summed = CHECKSUM_UNNECESSARY;
         } else
@@ -1142,40 +1106,8 @@ static void netxen_process_rcv(struct netxen_adapter *adapter, int ctxid,
         skb->protocol = eth_type_trans(skb, netdev);
 
         ret = netif_receive_skb(skb);
-
-        /*
-         * RH: Do we need these stats on a regular basis. Can we get it from
-         * Linux stats.
-         */
-        switch (ret) {
-        case NET_RX_SUCCESS:
-                adapter->stats.uphappy++;
-                break;
-
-        case NET_RX_CN_LOW:
-                adapter->stats.uplcong++;
-                break;
-
-        case NET_RX_CN_MOD:
-                adapter->stats.upmcong++;
-                break;
-
-        case NET_RX_CN_HIGH:
-                adapter->stats.uphcong++;
-                break;
-
-        case NET_RX_DROP:
-                adapter->stats.updropped++;
-                break;
-
-        default:
-                adapter->stats.updunno++;
-                break;
-        }
-
         netdev->last_rx = jiffies;
 
-        rcv_desc->rcv_free++;
         rcv_desc->rcv_pending--;
 
         /*
@@ -1200,13 +1132,6 @@ u32 netxen_process_rcv_ring(struct netxen_adapter *adapter, int ctxid, int max)
         u32 producer = 0;
         int count = 0, ring;
 
-        DPRINTK(INFO, "procesing receive\n");
-        /*
-         * we assume in this case that there is only one port and that is
-         * port #1...changes need to be done in firmware to indicate port
-         * number as part of the descriptor. This way we will be able to get
-         * the netdev which is associated with that device.
-         */
         while (count < max) {
                 desc = &desc_head[consumer];
                 if (!(netxen_get_sts_owner(desc) & STATUS_OWNER_HOST)) {
@@ -1219,11 +1144,8 @@ u32 netxen_process_rcv_ring(struct netxen_adapter *adapter, int ctxid, int max)
                 consumer = (consumer + 1) & (adapter->max_rx_desc_count - 1);
                 count++;
         }
-        if (count) {
-                for (ring = 0; ring < NUM_RCV_DESC_RINGS; ring++) {
-                        netxen_post_rx_buffers_nodb(adapter, ctxid, ring);
-                }
-        }
+        for (ring = 0; ring < NUM_RCV_DESC_RINGS; ring++)
+                netxen_post_rx_buffers_nodb(adapter, ctxid, ring);
 
         /* update the consumer index in phantom */
         if (count) {
@@ -1233,108 +1155,60 @@ u32 netxen_process_rcv_ring(struct netxen_adapter *adapter, int ctxid, int max)
                 /* Window = 1 */
                 writel(consumer,
                        NETXEN_CRB_NORMALIZE(adapter,
-                                            recv_crb_registers[adapter->portnum].
+                                    recv_crb_registers[adapter->portnum].
                                             crb_rcv_status_consumer));
-                wmb();
         }
 
         return count;
 }
 
 /* Process Command status ring */
-int netxen_process_cmd_ring(unsigned long data)
+int netxen_process_cmd_ring(struct netxen_adapter *adapter)
 {
-        u32 last_consumer;
-        u32 consumer;
-        struct netxen_adapter *adapter = (struct netxen_adapter *)data;
-        int count1 = 0;
-        int count2 = 0;
+        u32 last_consumer, consumer;
+        int count = 0, i;
         struct netxen_cmd_buffer *buffer;
-        struct pci_dev *pdev;
+        struct pci_dev *pdev = adapter->pdev;
+        struct net_device *netdev = adapter->netdev;
         struct netxen_skb_frag *frag;
-        u32 i;
-        int done;
+        int done = 0;
 
-        spin_lock(&adapter->tx_lock);
         last_consumer = adapter->last_cmd_consumer;
-        DPRINTK(INFO, "procesing xmit complete\n");
-        /* we assume in this case that there is only one port and that is
-         * port #1...changes need to be done in firmware to indicate port
-         * number as part of the descriptor. This way we will be able to get
-         * the netdev which is associated with that device.
-         */
-
         consumer = le32_to_cpu(*(adapter->cmd_consumer));
-        if (last_consumer == consumer) {        /* Ring is empty    */
-                DPRINTK(INFO, "last_consumer %d == consumer %d\n",
-                        last_consumer, consumer);
-                spin_unlock(&adapter->tx_lock);
-                return 1;
-        }
-
-        adapter->proc_cmd_buf_counter++;
-        /*
-         * Not needed - does not seem to be used anywhere.
-         * adapter->cmd_consumer = consumer;
-         */
-        spin_unlock(&adapter->tx_lock);
 
-        while ((last_consumer != consumer) && (count1 < MAX_STATUS_HANDLE)) {
+        while (last_consumer != consumer) {
                 buffer = &adapter->cmd_buf_arr[last_consumer];
-                pdev = adapter->pdev;
                 if (buffer->skb) {
                         frag = &buffer->frag_array[0];
                         pci_unmap_single(pdev, frag->dma, frag->length,
                                          PCI_DMA_TODEVICE);
                         frag->dma = 0ULL;
                         for (i = 1; i < buffer->frag_count; i++) {
-                                DPRINTK(INFO, "getting fragment no %d\n", i);
                                 frag++; /* Get the next frag */
                                 pci_unmap_page(pdev, frag->dma, frag->length,
                                                PCI_DMA_TODEVICE);
                                 frag->dma = 0ULL;
                         }
 
-                        adapter->stats.skbfreed++;
+                        adapter->stats.xmitfinished++;
                         dev_kfree_skb_any(buffer->skb);
                         buffer->skb = NULL;
-                } else if (adapter->proc_cmd_buf_counter == 1) {
-                        adapter->stats.txnullskb++;
-                }
-                if (unlikely(netif_queue_stopped(adapter->netdev)
-                             && netif_carrier_ok(adapter->netdev))
-                    && ((jiffies - adapter->netdev->trans_start) >
-                        adapter->netdev->watchdog_timeo)) {
-                        SCHEDULE_WORK(&adapter->tx_timeout_task);
                 }
 
                 last_consumer = get_next_index(last_consumer,
                                                adapter->max_tx_desc_count);
-                count1++;
+                if (++count >= MAX_STATUS_HANDLE)
+                        break;
         }
 
-        count2 = 0;
-        spin_lock(&adapter->tx_lock);
-        if ((--adapter->proc_cmd_buf_counter) == 0) {
+        if (count) {
                 adapter->last_cmd_consumer = last_consumer;
-                while ((adapter->last_cmd_consumer != consumer)
-                       && (count2 < MAX_STATUS_HANDLE)) {
-                        buffer =
-                            &adapter->cmd_buf_arr[adapter->last_cmd_consumer];
-                        count2++;
-                        if (buffer->skb)
-                                break;
-                        else
-                                adapter->last_cmd_consumer =
-                                    get_next_index(adapter->last_cmd_consumer,
-                                                   adapter->max_tx_desc_count);
-                }
-        }
-        if (count1 || count2) {
-                if (netif_queue_stopped(adapter->netdev)
-                    && (adapter->flags & NETXEN_NETDEV_STATUS)) {
-                        netif_wake_queue(adapter->netdev);
-                        adapter->flags &= ~NETXEN_NETDEV_STATUS;
+                smp_mb();
+                if (netif_queue_stopped(netdev) && netif_running(netdev)) {
+                        netif_tx_lock(netdev);
+                        netif_wake_queue(netdev);
+                        smp_mb();
+                        netif_tx_unlock(netdev);
                 }
         }
         /*
@@ -1350,16 +1224,9 @@ int netxen_process_cmd_ring(unsigned long data)
          * There is still a possible race condition and the host could miss an
          * interrupt. The card has to take care of this.
          */
-        if (adapter->last_cmd_consumer == consumer &&
-            (((adapter->cmd_producer + 1) %
-              adapter->max_tx_desc_count) == adapter->last_cmd_consumer)) {
-                consumer = le32_to_cpu(*(adapter->cmd_consumer));
-        }
-        done = (adapter->last_cmd_consumer == consumer);
+        consumer = le32_to_cpu(*(adapter->cmd_consumer));
+        done = (last_consumer == consumer);
 
-        spin_unlock(&adapter->tx_lock);
-        DPRINTK(INFO, "last consumer is %d in %s\n", last_consumer,
-                __FUNCTION__);
         return (done);
 }
 
@@ -1433,8 +1300,6 @@ void netxen_post_rx_buffers(struct netxen_adapter *adapter, u32 ctx, u32 ringid)
                 rcv_desc->begin_alloc = index;
                 rcv_desc->rcv_pending += count;
                 rcv_desc->producer = producer;
-                if (rcv_desc->rcv_free >= 32) {
-                        rcv_desc->rcv_free = 0;
                         /* Window = 1 */
                         writel((producer - 1) &
                                (rcv_desc->max_rx_desc_count - 1),
@@ -1458,8 +1323,6 @@ void netxen_post_rx_buffers(struct netxen_adapter *adapter, u32 ctx, u32 ringid)
                         writel(msg,
                                DB_NORMALIZE(adapter,
                                             NETXEN_RCV_PRODUCER_OFFSET));
-                        wmb();
-                }
         }
 }
 
@@ -1523,8 +1386,6 @@ static void netxen_post_rx_buffers_nodb(struct netxen_adapter *adapter,
                 rcv_desc->begin_alloc = index;
                 rcv_desc->rcv_pending += count;
                 rcv_desc->producer = producer;
-                if (rcv_desc->rcv_free >= 32) {
-                        rcv_desc->rcv_free = 0;
                         /* Window = 1 */
                         writel((producer - 1) &
                                (rcv_desc->max_rx_desc_count - 1),
@@ -1534,21 +1395,9 @@ static void netxen_post_rx_buffers_nodb(struct netxen_adapter *adapter,
                                                     rcv_desc_crb[ringid].
                                                     crb_rcv_producer_offset));
                         wmb();
-                }
         }
 }
 
-int netxen_nic_tx_has_work(struct netxen_adapter *adapter)
-{
-        if (find_diff_among(adapter->last_cmd_consumer,
-                            adapter->cmd_producer,
-                            adapter->max_tx_desc_count) > 0)
-                return 1;
-
-        return 0;
-}
-
-
 void netxen_nic_clear_stats(struct netxen_adapter *adapter)
 {
         memset(&adapter->stats, 0, sizeof(adapter->stats));
diff --git a/drivers/net/netxen/netxen_nic_isr.c b/drivers/net/netxen/netxen_nic_isr.c
index 48a404aa66ce..c81313b717bd 100644
--- a/drivers/net/netxen/netxen_nic_isr.c
+++ b/drivers/net/netxen/netxen_nic_isr.c
@@ -59,7 +59,7 @@ struct net_device_stats *netxen_nic_get_stats(struct net_device *netdev)
         /* packet transmit problems */
         stats->tx_errors = adapter->stats.nocmddescriptor;
         /* no space in linux buffers    */
-        stats->rx_dropped = adapter->stats.updropped;
+        stats->rx_dropped = adapter->stats.rxdropped;
         /* no space available in linux  */
         stats->tx_dropped = adapter->stats.txdropped;
 
@@ -193,14 +193,14 @@ int netxen_nic_link_ok(struct netxen_adapter *adapter)
 void netxen_nic_xgbe_handle_phy_intr(struct netxen_adapter *adapter)
 {
         struct net_device *netdev = adapter->netdev;
-        u32 val, val1;
+        u32 val;
 
         /* WINDOW = 1 */
         val = readl(NETXEN_CRB_NORMALIZE(adapter, CRB_XG_STATE));
         val >>= (physical_port[adapter->portnum] * 8);
-        val1 = val & 0xff;
+        val &= 0xff;
 
-        if (adapter->ahw.xg_linkup == 1 && val1 != XG_LINK_UP) {
+        if (adapter->ahw.xg_linkup == 1 && val != XG_LINK_UP) {
                 printk(KERN_INFO "%s: %s NIC Link is down\n",
                        netxen_nic_driver_name, netdev->name);
                 adapter->ahw.xg_linkup = 0;
@@ -208,16 +208,7 @@ void netxen_nic_xgbe_handle_phy_intr(struct netxen_adapter *adapter)
                         netif_carrier_off(netdev);
                         netif_stop_queue(netdev);
                 }
-                /* read twice to clear sticky bits */
-                /* WINDOW = 0 */
-                netxen_nic_read_w0(adapter, NETXEN_NIU_XG_STATUS, &val1);
-                netxen_nic_read_w0(adapter, NETXEN_NIU_XG_STATUS, &val1);
-
-                if ((val & 0xffb) != 0xffb) {
-                        printk(KERN_INFO "%s ISR: Sync/Align BAD: 0x%08x\n",
-                               netxen_nic_driver_name, val1);
-                }
-        } else if (adapter->ahw.xg_linkup == 0 && val1 == XG_LINK_UP) {
+        } else if (adapter->ahw.xg_linkup == 0 && val == XG_LINK_UP) {
                 printk(KERN_INFO "%s: %s NIC Link is up\n",
                        netxen_nic_driver_name, netdev->name);
                 adapter->ahw.xg_linkup = 1;
diff --git a/drivers/net/netxen/netxen_nic_main.c b/drivers/net/netxen/netxen_nic_main.c
index 9737eae5ef11..a8fb439a4d03 100644
--- a/drivers/net/netxen/netxen_nic_main.c
+++ b/drivers/net/netxen/netxen_nic_main.c
@@ -63,12 +63,12 @@ static int netxen_nic_xmit_frame(struct sk_buff *, struct net_device *);
 static void netxen_tx_timeout(struct net_device *netdev);
 static void netxen_tx_timeout_task(struct work_struct *work);
 static void netxen_watchdog(unsigned long);
-static int netxen_handle_int(struct netxen_adapter *, struct net_device *);
 static int netxen_nic_poll(struct napi_struct *napi, int budget);
 #ifdef CONFIG_NET_POLL_CONTROLLER
 static void netxen_nic_poll_controller(struct net_device *netdev);
 #endif
 static irqreturn_t netxen_intr(int irq, void *data);
+static irqreturn_t netxen_msi_intr(int irq, void *data);
 
 int physical_port[] = {0, 1, 2, 3};
 
@@ -149,33 +149,30 @@ static void netxen_nic_update_cmd_consumer(struct netxen_adapter *adapter,
 
 #define ADAPTER_LIST_SIZE 12
 
+static uint32_t msi_tgt_status[4] = {
+        ISR_INT_TARGET_STATUS, ISR_INT_TARGET_STATUS_F1,
+        ISR_INT_TARGET_STATUS_F2, ISR_INT_TARGET_STATUS_F3
+};
+
+static uint32_t sw_int_mask[4] = {
+        CRB_SW_INT_MASK_0, CRB_SW_INT_MASK_1,
+        CRB_SW_INT_MASK_2, CRB_SW_INT_MASK_3
+};
+
 static void netxen_nic_disable_int(struct netxen_adapter *adapter)
 {
-        uint32_t        mask = 0x7ff;
+        u32 mask = 0x7ff;
         int retries = 32;
+        int port = adapter->portnum;
+        int pci_fn = adapter->ahw.pci_func;
 
-        DPRINTK(1, INFO, "Entered ISR Disable \n");
-
-        switch (adapter->portnum) {
-        case 0:
-                writel(0x0, NETXEN_CRB_NORMALIZE(adapter, CRB_SW_INT_MASK_0));
-                break;
-        case 1:
-                writel(0x0, NETXEN_CRB_NORMALIZE(adapter, CRB_SW_INT_MASK_1));
-                break;
-        case 2:
-                writel(0x0, NETXEN_CRB_NORMALIZE(adapter, CRB_SW_INT_MASK_2));
-                break;
-        case 3:
-                writel(0x0, NETXEN_CRB_NORMALIZE(adapter, CRB_SW_INT_MASK_3));
-                break;
-        }
+        if (adapter->msi_mode != MSI_MODE_MULTIFUNC)
+                writel(0x0, NETXEN_CRB_NORMALIZE(adapter, sw_int_mask[port]));
 
         if (adapter->intr_scheme != -1 &&
             adapter->intr_scheme != INTR_SCHEME_PERPORT)
                 writel(mask,PCI_OFFSET_SECOND_RANGE(adapter, ISR_INT_MASK));
 
-        /* Window = 0 or 1 */
         if (!(adapter->flags & NETXEN_NIC_MSI_ENABLED)) {
                 do {
                         writel(0xffffffff,
@@ -190,14 +187,18 @@ static void netxen_nic_disable_int(struct netxen_adapter *adapter)
                         printk(KERN_NOTICE "%s: Failed to disable interrupt completely\n",
                                         netxen_nic_driver_name);
                 }
+        } else {
+                if (adapter->msi_mode == MSI_MODE_MULTIFUNC) {
+                        writel(0xffffffff, PCI_OFFSET_SECOND_RANGE(adapter,
+                                                msi_tgt_status[pci_fn]));
+                }
         }
-
-        DPRINTK(1, INFO, "Done with Disable Int\n");
 }
 
 static void netxen_nic_enable_int(struct netxen_adapter *adapter)
 {
         u32 mask;
+        int port = adapter->portnum;
 
         DPRINTK(1, INFO, "Entered ISR Enable \n");
 
@@ -218,20 +219,7 @@ static void netxen_nic_enable_int(struct netxen_adapter *adapter)
                 writel(mask, PCI_OFFSET_SECOND_RANGE(adapter, ISR_INT_MASK));
         }
 
-        switch (adapter->portnum) {
-        case 0:
-                writel(0x1, NETXEN_CRB_NORMALIZE(adapter, CRB_SW_INT_MASK_0));
-                break;
-        case 1:
-                writel(0x1, NETXEN_CRB_NORMALIZE(adapter, CRB_SW_INT_MASK_1));
-                break;
-        case 2:
-                writel(0x1, NETXEN_CRB_NORMALIZE(adapter, CRB_SW_INT_MASK_2));
-                break;
-        case 3:
-                writel(0x1, NETXEN_CRB_NORMALIZE(adapter, CRB_SW_INT_MASK_3));
-                break;
-        }
+        writel(0x1, NETXEN_CRB_NORMALIZE(adapter, sw_int_mask[port]));
 
         if (!(adapter->flags & NETXEN_NIC_MSI_ENABLED)) {
                 mask = 0xbff;
@@ -328,7 +316,6 @@ netxen_nic_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
 
         adapter->ahw.pdev = pdev;
         adapter->ahw.pci_func  = pci_func_id;
-        spin_lock_init(&adapter->tx_lock);
 
         /* remap phys address */
         mem_base = pci_resource_start(pdev, 0); /* 0 is for BAR 0 */
@@ -401,6 +388,7 @@ netxen_nic_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
 
         /* this will be read from FW later */
         adapter->intr_scheme = -1;
+        adapter->msi_mode = -1;
 
         /* This will be reset for mezz cards  */
         adapter->portnum = pci_func_id;
@@ -415,7 +403,7 @@ netxen_nic_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
         netdev->set_mac_address    = netxen_nic_set_mac;
         netdev->change_mtu         = netxen_nic_change_mtu;
         netdev->tx_timeout         = netxen_tx_timeout;
-        netdev->watchdog_timeo     = HZ;
+        netdev->watchdog_timeo     = 2*HZ;
 
         netxen_nic_change_mtu(netdev, netdev->mtu);
 
@@ -543,7 +531,6 @@ netxen_nic_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
         adapter->watchdog_timer.data = (unsigned long)adapter;
         INIT_WORK(&adapter->watchdog_task, netxen_watchdog_task);
         adapter->ahw.pdev = pdev;
-        adapter->proc_cmd_buf_counter = 0;
         adapter->ahw.revision_id = pdev->revision;
 
         /* make sure Window == 1 */
@@ -833,6 +820,8 @@ static int netxen_nic_open(struct net_device *netdev)
         struct netxen_adapter *adapter = (struct netxen_adapter *)netdev->priv;
         int err = 0;
         int ctx, ring;
+        irq_handler_t handler;
+        unsigned long flags = IRQF_SAMPLE_RANDOM;
 
         if (adapter->is_up != NETXEN_ADAPTER_UP_MAGIC) {
                 err = netxen_init_firmware(adapter);
@@ -856,9 +845,14 @@ static int netxen_nic_open(struct net_device *netdev)
                                 netxen_post_rx_buffers(adapter, ctx, ring);
                 }
                 adapter->irq = adapter->ahw.pdev->irq;
-                err = request_irq(adapter->ahw.pdev->irq, netxen_intr,
-                                  IRQF_SHARED|IRQF_SAMPLE_RANDOM, netdev->name,
-                                  adapter);
+                if (adapter->flags & NETXEN_NIC_MSI_ENABLED)
+                        handler = netxen_msi_intr;
+                else {
+                        flags |= IRQF_SHARED;
+                        handler = netxen_intr;
+                }
+                err = request_irq(adapter->irq, handler,
+                                  flags, netdev->name, adapter);
                 if (err) {
                         printk(KERN_ERR "request_irq failed with: %d\n", err);
                         netxen_free_hw_resources(adapter);
@@ -867,21 +861,12 @@ static int netxen_nic_open(struct net_device *netdev)
 
                 adapter->is_up = NETXEN_ADAPTER_UP_MAGIC;
         }
-        if (!adapter->driver_mismatch)
-                mod_timer(&adapter->watchdog_timer, jiffies);
-
-        napi_enable(&adapter->napi);
-
-        netxen_nic_enable_int(adapter);
-
         /* Done here again so that even if phantom sw overwrote it,
          * we set it */
         if (adapter->init_port
             && adapter->init_port(adapter, adapter->portnum) != 0) {
-            del_timer_sync(&adapter->watchdog_timer);
                 printk(KERN_ERR "%s: Failed to initialize port %d\n",
                                 netxen_nic_driver_name, adapter->portnum);
-                napi_disable(&adapter->napi);
                 return -EIO;
         }
         if (adapter->macaddr_set)
@@ -894,6 +879,12 @@ static int netxen_nic_open(struct net_device *netdev)
                 adapter->set_mtu(adapter, netdev->mtu);
 
         if (!adapter->driver_mismatch)
+                mod_timer(&adapter->watchdog_timer, jiffies);
+
+        napi_enable(&adapter->napi);
+        netxen_nic_enable_int(adapter);
+
+        if (!adapter->driver_mismatch)
                 netif_start_queue(netdev);
 
         return 0;
@@ -958,41 +949,17 @@ static int netxen_nic_xmit_frame(struct sk_buff *skb, struct net_device *netdev)
         struct netxen_skb_frag *buffrag;
         unsigned int i;
 
-        u32 producer = 0;
+        u32 producer, consumer;
         u32 saved_producer = 0;
         struct cmd_desc_type0 *hwdesc;
         int k;
         struct netxen_cmd_buffer *pbuf = NULL;
-        static int dropped_packet = 0;
         int frag_count;
-        u32 local_producer = 0;
-        u32 max_tx_desc_count = 0;
-        u32 last_cmd_consumer = 0;
         int no_of_desc;
+        u32 num_txd = adapter->max_tx_desc_count;
 
-        adapter->stats.xmitcalled++;
         frag_count = skb_shinfo(skb)->nr_frags + 1;
 
-        if (unlikely(skb->len <= 0)) {
-                dev_kfree_skb_any(skb);
-                adapter->stats.badskblen++;
-                return NETDEV_TX_OK;
-        }
-
-        if (frag_count > MAX_BUFFERS_PER_CMD) {
-                printk("%s: %s netxen_nic_xmit_frame: frag_count (%d) "
-                       "too large, can handle only %d frags\n",
-                       netxen_nic_driver_name, netdev->name,
-                       frag_count, MAX_BUFFERS_PER_CMD);
-                adapter->stats.txdropped++;
-                if ((++dropped_packet & 0xff) == 0xff)
-                        printk("%s: %s droppped packets = %d\n",
-                               netxen_nic_driver_name, netdev->name,
-                               dropped_packet);
-
-                return NETDEV_TX_OK;
-        }
-
         /* There 4 fragments per descriptor */
         no_of_desc = (frag_count + 3) >> 2;
         if (netdev->features & NETIF_F_TSO) {
@@ -1007,27 +974,16 @@ static int netxen_nic_xmit_frame(struct sk_buff *skb, struct net_device *netdev)
                 }
         }
 
-        spin_lock_bh(&adapter->tx_lock);
-        if (adapter->total_threads >= MAX_XMIT_PRODUCERS) {
-                goto out_requeue;
-        }
-        local_producer = adapter->cmd_producer;
-        k = adapter->cmd_producer;
-        max_tx_desc_count = adapter->max_tx_desc_count;
-        last_cmd_consumer = adapter->last_cmd_consumer;
-        if ((k + no_of_desc) >=
-            ((last_cmd_consumer <= k) ? last_cmd_consumer + max_tx_desc_count :
-             last_cmd_consumer)) {
-                goto out_requeue;
+        producer = adapter->cmd_producer;
+        smp_mb();
+        consumer = adapter->last_cmd_consumer;
+        if ((no_of_desc+2) > find_diff_among(producer, consumer, num_txd)) {
+                netif_stop_queue(netdev);
+                smp_mb();
+                return NETDEV_TX_BUSY;
         }
-        k = get_index_range(k, max_tx_desc_count, no_of_desc);
-        adapter->cmd_producer = k;
-        adapter->total_threads++;
-        adapter->num_threads++;
 
-        spin_unlock_bh(&adapter->tx_lock);
         /* Copy the descriptors into the hardware    */
-        producer = local_producer;
         saved_producer = producer;
         hwdesc = &hw->cmd_desc_head[producer];
         memset(hwdesc, 0, sizeof(struct cmd_desc_type0));
@@ -1067,8 +1023,7 @@ static int netxen_nic_xmit_frame(struct sk_buff *skb, struct net_device *netdev)
                 /* move to next desc. if there is a need */
                 if ((i & 0x3) == 0) {
                         k = 0;
-                        producer = get_next_index(producer,
-                                                  adapter->max_tx_desc_count);
+                        producer = get_next_index(producer, num_txd);
                         hwdesc = &hw->cmd_desc_head[producer];
                         memset(hwdesc, 0, sizeof(struct cmd_desc_type0));
                         pbuf = &adapter->cmd_buf_arr[producer];
@@ -1086,7 +1041,6 @@ static int netxen_nic_xmit_frame(struct sk_buff *skb, struct net_device *netdev)
                 buffrag->dma = temp_dma;
                 buffrag->length = temp_len;
 
-                DPRINTK(INFO, "for loop. i=%d k=%d\n", i, k);
                 switch (k) {
                 case 0:
                         hwdesc->buffer1_length = cpu_to_le16(temp_len);
@@ -1107,7 +1061,7 @@ static int netxen_nic_xmit_frame(struct sk_buff *skb, struct net_device *netdev)
                 }
                 frag++;
         }
-        producer = get_next_index(producer, adapter->max_tx_desc_count);
+        producer = get_next_index(producer, num_txd);
 
         /* might change opcode to TX_TCP_LSO */
         netxen_tso_check(adapter, &hw->cmd_desc_head[saved_producer], skb);
@@ -1134,7 +1088,7 @@ static int netxen_nic_xmit_frame(struct sk_buff *skb, struct net_device *netdev)
                 /* copy the first 64 bytes */
                 memcpy(((void *)hwdesc) + 2,
                        (void *)(skb->data), first_hdr_len);
-                producer = get_next_index(producer, max_tx_desc_count);
+                producer = get_next_index(producer, num_txd);
 
                 if (more_hdr) {
                         hwdesc = &hw->cmd_desc_head[producer];
@@ -1147,35 +1101,19 @@ static int netxen_nic_xmit_frame(struct sk_buff *skb, struct net_device *netdev)
                                                          hwdesc,
                                                          (hdr_len -
                                                           first_hdr_len));
-                        producer = get_next_index(producer, max_tx_desc_count);
+                        producer = get_next_index(producer, num_txd);
                 }
         }
 
-        spin_lock_bh(&adapter->tx_lock);
+        adapter->cmd_producer = producer;
         adapter->stats.txbytes += skb->len;
 
-        /* Code to update the adapter considering how many producer threads
-           are currently working */
-        if ((--adapter->num_threads) == 0) {
-                /* This is the last thread */
-                u32 crb_producer = adapter->cmd_producer;
-                netxen_nic_update_cmd_producer(adapter, crb_producer);
-                wmb();
-                adapter->total_threads = 0;
-        }
+        netxen_nic_update_cmd_producer(adapter, adapter->cmd_producer);
 
-        adapter->stats.xmitfinished++;
+        adapter->stats.xmitcalled++;
         netdev->trans_start = jiffies;
 
-        spin_unlock_bh(&adapter->tx_lock);
         return NETDEV_TX_OK;
-
-out_requeue:
-        netif_stop_queue(netdev);
-        adapter->flags |= NETXEN_NETDEV_STATUS;
-
-        spin_unlock_bh(&adapter->tx_lock);
-        return NETDEV_TX_BUSY;
 }
 
 static void netxen_watchdog(unsigned long v)
@@ -1200,87 +1138,60 @@ static void netxen_tx_timeout_task(struct work_struct *work)
         printk(KERN_ERR "%s %s: transmit timeout, resetting.\n",
                netxen_nic_driver_name, adapter->netdev->name);
 
-        netxen_nic_close(adapter->netdev);
-        netxen_nic_open(adapter->netdev);
+        netxen_nic_disable_int(adapter);
+        napi_disable(&adapter->napi);
+
         adapter->netdev->trans_start = jiffies;
+
+        napi_enable(&adapter->napi);
+        netxen_nic_enable_int(adapter);
         netif_wake_queue(adapter->netdev);
 }
 
-static int
-netxen_handle_int(struct netxen_adapter *adapter, struct net_device *netdev)
+static inline void
+netxen_handle_int(struct netxen_adapter *adapter)
 {
-        u32 ret = 0;
-
-        DPRINTK(INFO, "Entered handle ISR\n");
-        adapter->stats.ints++;
-
         netxen_nic_disable_int(adapter);
-
-        if (netxen_nic_rx_has_work(adapter) || netxen_nic_tx_has_work(adapter)) {
-                if (netif_rx_schedule_prep(netdev, &adapter->napi)) {
-                        /*
-                         * Interrupts are already disabled.
-                         */
-                        __netif_rx_schedule(netdev, &adapter->napi);
-                } else {
-                        static unsigned int intcount = 0;
-                        if ((++intcount & 0xfff) == 0xfff)
-                                DPRINTK(KERN_ERR
-                                       "%s: %s interrupt %d while in poll\n",
-                                       netxen_nic_driver_name, netdev->name,
-                                       intcount);
-                }
-                ret = 1;
-        }
-
-        if (ret == 0) {
-                netxen_nic_enable_int(adapter);
-        }
-
-        return ret;
+        napi_schedule(&adapter->napi);
 }
 
-/*
- * netxen_intr - Interrupt Handler
- * @irq: interrupt number
- * data points to adapter stucture (which may be handling more than 1 port
- */
 irqreturn_t netxen_intr(int irq, void *data)
 {
         struct netxen_adapter *adapter = data;
-        struct net_device *netdev = adapter->netdev;
         u32 our_int = 0;
 
-        if (!(adapter->flags & NETXEN_NIC_MSI_ENABLED)) {
-                our_int = readl(NETXEN_CRB_NORMALIZE(adapter, CRB_INT_VECTOR));
-                /* not our interrupt */
-                if ((our_int & (0x80 << adapter->portnum)) == 0)
-                        return IRQ_NONE;
-        }
+        our_int = readl(NETXEN_CRB_NORMALIZE(adapter, CRB_INT_VECTOR));
+        /* not our interrupt */
+        if ((our_int & (0x80 << adapter->portnum)) == 0)
+                return IRQ_NONE;
 
         if (adapter->intr_scheme == INTR_SCHEME_PERPORT) {
                 /* claim interrupt */
-                if (!(adapter->flags & NETXEN_NIC_MSI_ENABLED)) {
-                        writel(our_int & ~((u32)(0x80 << adapter->portnum)),
+                writel(our_int & ~((u32)(0x80 << adapter->portnum)),
                         NETXEN_CRB_NORMALIZE(adapter, CRB_INT_VECTOR));
-                }
         }
 
-        if (netif_running(netdev))
-                netxen_handle_int(adapter, netdev);
+        netxen_handle_int(adapter);
 
         return IRQ_HANDLED;
 }
 
+irqreturn_t netxen_msi_intr(int irq, void *data)
+{
+        struct netxen_adapter *adapter = data;
+
+        netxen_handle_int(adapter);
+        return IRQ_HANDLED;
+}
+
 static int netxen_nic_poll(struct napi_struct *napi, int budget)
 {
         struct netxen_adapter *adapter = container_of(napi, struct netxen_adapter, napi);
-        struct net_device *netdev = adapter->netdev;
-        int done = 1;
+        int tx_complete;
         int ctx;
         int work_done;
 
-        DPRINTK(INFO, "polling for %d descriptors\n", *budget);
+        tx_complete = netxen_process_cmd_ring(adapter);
 
         work_done = 0;
         for (ctx = 0; ctx < MAX_RCV_CTX; ++ctx) {
@@ -1300,16 +1211,8 @@ static int netxen_nic_poll(struct napi_struct *napi, int budget)
                                                      budget / MAX_RCV_CTX);
         }
 
-        if (work_done >= budget)
-                done = 0;
-
-        if (netxen_process_cmd_ring((unsigned long)adapter) == 0)
-                done = 0;
-
-        DPRINTK(INFO, "new work_done: %d work_to_do: %d\n",
-                work_done, work_to_do);
-        if (done) {
-                netif_rx_complete(netdev, napi);
+        if ((work_done < budget) && tx_complete) {
+                netif_rx_complete(adapter->netdev, &adapter->napi);
                 netxen_nic_enable_int(adapter);
         }
 
diff --git a/drivers/net/netxen/netxen_nic_phan_reg.h b/drivers/net/netxen/netxen_nic_phan_reg.h
index ffa3b7215ce8..a566b50f36f5 100644
--- a/drivers/net/netxen/netxen_nic_phan_reg.h
+++ b/drivers/net/netxen/netxen_nic_phan_reg.h
@@ -126,8 +126,11 @@
  */
 #define CRB_NIC_CAPABILITIES_HOST       NETXEN_NIC_REG(0x1a8)
 #define CRB_NIC_CAPABILITIES_FW         NETXEN_NIC_REG(0x1dc)
+#define CRB_NIC_MSI_MODE_HOST           NETXEN_NIC_REG(0x270)
+#define CRB_NIC_MSI_MODE_FW                     NETXEN_NIC_REG(0x274)
 
 #define INTR_SCHEME_PERPORT             0x1
+#define MSI_MODE_MULTIFUNC              0x1
 
 /* used for ethtool tests */
 #define CRB_SCRATCHPAD_TEST         NETXEN_NIC_REG(0x280)
diff --git a/drivers/net/pcmcia/axnet_cs.c b/drivers/net/pcmcia/axnet_cs.c
index e8a63e483a2b..ce95c5d168fe 100644
--- a/drivers/net/pcmcia/axnet_cs.c
+++ b/drivers/net/pcmcia/axnet_cs.c
@@ -1268,7 +1268,7 @@ static irqreturn_t ax_interrupt(int irq, void *dev_id)
                 }
         }
     
-        if (interrupts && ei_debug) 
+        if (interrupts && ei_debug > 3) 
         {
                 handled = 1;
                 if (nr_serviced >= MAX_SERVICE) 
diff --git a/drivers/net/phy/Kconfig b/drivers/net/phy/Kconfig
index f4ca0591231d..3ac8529bb92c 100644
--- a/drivers/net/phy/Kconfig
+++ b/drivers/net/phy/Kconfig
@@ -67,6 +67,7 @@ config REALTEK_PHY
 
 config FIXED_PHY
         bool "Driver for MDIO Bus/PHY emulation with fixed speed/link PHYs"
+        depends on PHYLIB=y
         ---help---
           Adds the platform "fixed" MDIO Bus to cover the boards that use
           PHYs that are not connected to the real MDIO bus.
diff --git a/drivers/net/phy/davicom.c b/drivers/net/phy/davicom.c
index 7ed632db00d7..d926168bc780 100644
--- a/drivers/net/phy/davicom.c
+++ b/drivers/net/phy/davicom.c
@@ -37,6 +37,7 @@
 
 #define MII_DM9161_SCR          0x10
 #define MII_DM9161_SCR_INIT     0x0610
+#define MII_DM9161_SCR_RMII     0x0100
 
 /* DM9161 Interrupt Register */
 #define MII_DM9161_INTR 0x15
@@ -103,7 +104,7 @@ static int dm9161_config_aneg(struct phy_device *phydev)
 
 static int dm9161_config_init(struct phy_device *phydev)
 {
-        int err;
+        int err, temp;
 
         /* Isolate the PHY */
         err = phy_write(phydev, MII_BMCR, BMCR_ISOLATE);
@@ -111,9 +112,19 @@ static int dm9161_config_init(struct phy_device *phydev)
         if (err < 0)
                 return err;
 
-        /* Do not bypass the scrambler/descrambler */
-        err = phy_write(phydev, MII_DM9161_SCR, MII_DM9161_SCR_INIT);
+        switch (phydev->interface) {
+        case PHY_INTERFACE_MODE_MII:
+                temp = MII_DM9161_SCR_INIT;
+                break;
+        case PHY_INTERFACE_MODE_RMII:
+                temp =  MII_DM9161_SCR_INIT | MII_DM9161_SCR_RMII;
+                break;
+        default:
+                return -EINVAL;
+        }
 
+        /* Do not bypass the scrambler/descrambler */
+        err = phy_write(phydev, MII_DM9161_SCR, temp);
         if (err < 0)
                 return err;
 
diff --git a/drivers/net/phy/marvell.c b/drivers/net/phy/marvell.c
index f0574073a2a3..33539917e9b8 100644
--- a/drivers/net/phy/marvell.c
+++ b/drivers/net/phy/marvell.c
@@ -58,9 +58,25 @@
 #define MII_M1111_RX_DELAY              0x80
 #define MII_M1111_TX_DELAY              0x2
 #define MII_M1111_PHY_EXT_SR            0x1b
-#define MII_M1111_HWCFG_MODE_MASK       0xf
-#define MII_M1111_HWCFG_MODE_RGMII      0xb
+
+#define MII_M1111_HWCFG_MODE_MASK               0xf
+#define MII_M1111_HWCFG_MODE_COPPER_RGMII       0xb
+#define MII_M1111_HWCFG_MODE_FIBER_RGMII        0x3
 #define MII_M1111_HWCFG_MODE_SGMII_NO_CLK       0x4
+#define MII_M1111_HWCFG_FIBER_COPPER_AUTO       0x8000
+#define MII_M1111_HWCFG_FIBER_COPPER_RES        0x2000
+
+#define MII_M1111_COPPER                0
+#define MII_M1111_FIBER                 1
+
+#define MII_M1011_PHY_STATUS            0x11
+#define MII_M1011_PHY_STATUS_1000       0x8000
+#define MII_M1011_PHY_STATUS_100        0x4000
+#define MII_M1011_PHY_STATUS_SPD_MASK   0xc000
+#define MII_M1011_PHY_STATUS_FULLDUPLEX 0x2000
+#define MII_M1011_PHY_STATUS_RESOLVED   0x0800
+#define MII_M1011_PHY_STATUS_LINK       0x0400
+
 
 MODULE_DESCRIPTION("Marvell PHY driver");
 MODULE_AUTHOR("Andy Fleming");
@@ -141,12 +157,22 @@ static int marvell_config_aneg(struct phy_device *phydev)
 static int m88e1111_config_init(struct phy_device *phydev)
 {
         int err;
+        int temp;
+        int mode;
+
+        /* Enable Fiber/Copper auto selection */
+        temp = phy_read(phydev, MII_M1111_PHY_EXT_SR);
+        temp |= MII_M1111_HWCFG_FIBER_COPPER_AUTO;
+        phy_write(phydev, MII_M1111_PHY_EXT_SR, temp);
+
+        temp = phy_read(phydev, MII_BMCR);
+        temp |= BMCR_RESET;
+        phy_write(phydev, MII_BMCR, temp);
 
         if ((phydev->interface == PHY_INTERFACE_MODE_RGMII) ||
             (phydev->interface == PHY_INTERFACE_MODE_RGMII_ID) ||
             (phydev->interface == PHY_INTERFACE_MODE_RGMII_RXID) ||
             (phydev->interface == PHY_INTERFACE_MODE_RGMII_TXID)) {
-                int temp;
 
                 temp = phy_read(phydev, MII_M1111_PHY_EXT_CR);
                 if (temp < 0)
@@ -171,7 +197,13 @@ static int m88e1111_config_init(struct phy_device *phydev)
                         return temp;
 
                 temp &= ~(MII_M1111_HWCFG_MODE_MASK);
-                temp |= MII_M1111_HWCFG_MODE_RGMII;
+
+                mode = phy_read(phydev, MII_M1111_PHY_EXT_CR);
+
+                if (mode & MII_M1111_HWCFG_FIBER_COPPER_RES)
+                        temp |= MII_M1111_HWCFG_MODE_FIBER_RGMII;
+                else
+                        temp |= MII_M1111_HWCFG_MODE_COPPER_RGMII;
 
                 err = phy_write(phydev, MII_M1111_PHY_EXT_SR, temp);
                 if (err < 0)
@@ -262,6 +294,93 @@ static int m88e1145_config_init(struct phy_device *phydev)
         return 0;
 }
 
+/* marvell_read_status
+ *
+ * Generic status code does not detect Fiber correctly!
+ * Description:
+ *   Check the link, then figure out the current state
+ *   by comparing what we advertise with what the link partner
+ *   advertises.  Start by checking the gigabit possibilities,
+ *   then move on to 10/100.
+ */
+static int marvell_read_status(struct phy_device *phydev)
+{
+        int adv;
+        int err;
+        int lpa;
+        int status = 0;
+
+        /* Update the link, but return if there
+         * was an error */
+        err = genphy_update_link(phydev);
+        if (err)
+                return err;
+
+        if (AUTONEG_ENABLE == phydev->autoneg) {
+                status = phy_read(phydev, MII_M1011_PHY_STATUS);
+                if (status < 0)
+                        return status;
+
+                lpa = phy_read(phydev, MII_LPA);
+                if (lpa < 0)
+                        return lpa;
+
+                adv = phy_read(phydev, MII_ADVERTISE);
+                if (adv < 0)
+                        return adv;
+
+                lpa &= adv;
+
+                if (status & MII_M1011_PHY_STATUS_FULLDUPLEX)
+                        phydev->duplex = DUPLEX_FULL;
+                else
+                        phydev->duplex = DUPLEX_HALF;
+
+                status = status & MII_M1011_PHY_STATUS_SPD_MASK;
+                phydev->pause = phydev->asym_pause = 0;
+
+                switch (status) {
+                case MII_M1011_PHY_STATUS_1000:
+                        phydev->speed = SPEED_1000;
+                        break;
+
+                case MII_M1011_PHY_STATUS_100:
+                        phydev->speed = SPEED_100;
+                        break;
+
+                default:
+                        phydev->speed = SPEED_10;
+                        break;
+                }
+
+                if (phydev->duplex == DUPLEX_FULL) {
+                        phydev->pause = lpa & LPA_PAUSE_CAP ? 1 : 0;
+                        phydev->asym_pause = lpa & LPA_PAUSE_ASYM ? 1 : 0;
+                }
+        } else {
+                int bmcr = phy_read(phydev, MII_BMCR);
+
+                if (bmcr < 0)
+                        return bmcr;
+
+                if (bmcr & BMCR_FULLDPLX)
+                        phydev->duplex = DUPLEX_FULL;
+                else
+                        phydev->duplex = DUPLEX_HALF;
+
+                if (bmcr & BMCR_SPEED1000)
+                        phydev->speed = SPEED_1000;
+                else if (bmcr & BMCR_SPEED100)
+                        phydev->speed = SPEED_100;
+                else
+                        phydev->speed = SPEED_10;
+
+                phydev->pause = phydev->asym_pause = 0;
+        }
+
+        return 0;
+}
+
 static struct phy_driver marvell_drivers[] = {
         {
                 .phy_id = 0x01410c60,
@@ -296,7 +415,7 @@ static struct phy_driver marvell_drivers[] = {
                 .flags = PHY_HAS_INTERRUPT,
                 .config_init = &m88e1111_config_init,
                 .config_aneg = &marvell_config_aneg,
-                .read_status = &genphy_read_status,
+                .read_status = &marvell_read_status,
                 .ack_interrupt = &marvell_ack_interrupt,
                 .config_intr = &marvell_config_intr,
                 .driver = { .owner = THIS_MODULE },
diff --git a/drivers/net/pppol2tp.c b/drivers/net/pppol2tp.c
index 86e5dba079fe..3d10ca050b79 100644
--- a/drivers/net/pppol2tp.c
+++ b/drivers/net/pppol2tp.c
@@ -302,14 +302,14 @@ pppol2tp_session_find(struct pppol2tp_tunnel *tunnel, u16 session_id)
         struct pppol2tp_session *session;
         struct hlist_node *walk;
 
-        read_lock(&tunnel->hlist_lock);
+        read_lock_bh(&tunnel->hlist_lock);
         hlist_for_each_entry(session, walk, session_list, hlist) {
                 if (session->tunnel_addr.s_session == session_id) {
-                        read_unlock(&tunnel->hlist_lock);
+                        read_unlock_bh(&tunnel->hlist_lock);
                         return session;
                 }
         }
-        read_unlock(&tunnel->hlist_lock);
+        read_unlock_bh(&tunnel->hlist_lock);
 
         return NULL;
 }
@@ -320,14 +320,14 @@ static struct pppol2tp_tunnel *pppol2tp_tunnel_find(u16 tunnel_id)
 {
         struct pppol2tp_tunnel *tunnel = NULL;
 
-        read_lock(&pppol2tp_tunnel_list_lock);
+        read_lock_bh(&pppol2tp_tunnel_list_lock);
         list_for_each_entry(tunnel, &pppol2tp_tunnel_list, list) {
                 if (tunnel->stats.tunnel_id == tunnel_id) {
-                        read_unlock(&pppol2tp_tunnel_list_lock);
+                        read_unlock_bh(&pppol2tp_tunnel_list_lock);
                         return tunnel;
                 }
         }
-        read_unlock(&pppol2tp_tunnel_list_lock);
+        read_unlock_bh(&pppol2tp_tunnel_list_lock);
 
         return NULL;
 }
@@ -342,10 +342,11 @@ static struct pppol2tp_tunnel *pppol2tp_tunnel_find(u16 tunnel_id)
 static void pppol2tp_recv_queue_skb(struct pppol2tp_session *session, struct sk_buff *skb)
 {
         struct sk_buff *skbp;
+        struct sk_buff *tmp;
         u16 ns = PPPOL2TP_SKB_CB(skb)->ns;
 
-        spin_lock(&session->reorder_q.lock);
-        skb_queue_walk(&session->reorder_q, skbp) {
+        spin_lock_bh(&session->reorder_q.lock);
+        skb_queue_walk_safe(&session->reorder_q, skbp, tmp) {
                 if (PPPOL2TP_SKB_CB(skbp)->ns > ns) {
                         __skb_insert(skb, skbp->prev, skbp, &session->reorder_q);
                         PRINTK(session->debug, PPPOL2TP_MSG_SEQ, KERN_DEBUG,
@@ -360,7 +361,7 @@ static void pppol2tp_recv_queue_skb(struct pppol2tp_session *session, struct sk_
         __skb_queue_tail(&session->reorder_q, skb);
 
 out:
-        spin_unlock(&session->reorder_q.lock);
+        spin_unlock_bh(&session->reorder_q.lock);
 }
 
 /* Dequeue a single skb.
@@ -371,10 +372,9 @@ static void pppol2tp_recv_dequeue_skb(struct pppol2tp_session *session, struct s
         int length = PPPOL2TP_SKB_CB(skb)->length;
         struct sock *session_sock = NULL;
 
-        /* We're about to requeue the skb, so unlink it and return resources
+        /* We're about to requeue the skb, so return resources
          * to its current owner (a socket receive buffer).
          */
-        skb_unlink(skb, &session->reorder_q);
         skb_orphan(skb);
 
         tunnel->stats.rx_packets++;
@@ -442,7 +442,7 @@ static void pppol2tp_recv_dequeue(struct pppol2tp_session *session)
          * expect to send up next, dequeue it and any other
          * in-sequence packets behind it.
          */
-        spin_lock(&session->reorder_q.lock);
+        spin_lock_bh(&session->reorder_q.lock);
         skb_queue_walk_safe(&session->reorder_q, skb, tmp) {
                 if (time_after(jiffies, PPPOL2TP_SKB_CB(skb)->expires)) {
                         session->stats.rx_seq_discards++;
@@ -470,13 +470,18 @@ static void pppol2tp_recv_dequeue(struct pppol2tp_session *session)
                                 goto out;
                         }
                 }
-                spin_unlock(&session->reorder_q.lock);
+                __skb_unlink(skb, &session->reorder_q);
+
+                /* Process the skb. We release the queue lock while we
+                 * do so to let other contexts process the queue.
+                 */
+                spin_unlock_bh(&session->reorder_q.lock);
                 pppol2tp_recv_dequeue_skb(session, skb);
-                spin_lock(&session->reorder_q.lock);
+                spin_lock_bh(&session->reorder_q.lock);
         }
 
 out:
-        spin_unlock(&session->reorder_q.lock);
+        spin_unlock_bh(&session->reorder_q.lock);
 }
 
 /* Internal receive frame. Do the real work of receiving an L2TP data frame
@@ -1059,7 +1064,7 @@ static int pppol2tp_xmit(struct ppp_channel *chan, struct sk_buff *skb)
 
         /* Get routing info from the tunnel socket */
         dst_release(skb->dst);
-        skb->dst = sk_dst_get(sk_tun);
+        skb->dst = dst_clone(__sk_dst_get(sk_tun));
         skb_orphan(skb);
         skb->sk = sk_tun;
 
@@ -1107,7 +1112,7 @@ static void pppol2tp_tunnel_closeall(struct pppol2tp_tunnel *tunnel)
         PRINTK(tunnel->debug, PPPOL2TP_MSG_CONTROL, KERN_INFO,
                "%s: closing all sessions...\n", tunnel->name);
 
-        write_lock(&tunnel->hlist_lock);
+        write_lock_bh(&tunnel->hlist_lock);
         for (hash = 0; hash < PPPOL2TP_HASH_SIZE; hash++) {
 again:
                 hlist_for_each_safe(walk, tmp, &tunnel->session_hlist[hash]) {
@@ -1129,7 +1134,7 @@ again:
                          * disappear as we're jumping between locks.
                          */
                         sock_hold(sk);
-                        write_unlock(&tunnel->hlist_lock);
+                        write_unlock_bh(&tunnel->hlist_lock);
                         lock_sock(sk);
 
                         if (sk->sk_state & (PPPOX_CONNECTED | PPPOX_BOUND)) {
@@ -1154,11 +1159,11 @@ again:
                          * list so we are guaranteed to make forward
                          * progress.
                          */
-                        write_lock(&tunnel->hlist_lock);
+                        write_lock_bh(&tunnel->hlist_lock);
                         goto again;
                 }
         }
-        write_unlock(&tunnel->hlist_lock);
+        write_unlock_bh(&tunnel->hlist_lock);
 }
 
 /* Really kill the tunnel.
@@ -1167,9 +1172,9 @@ again:
 static void pppol2tp_tunnel_free(struct pppol2tp_tunnel *tunnel)
 {
         /* Remove from socket list */
-        write_lock(&pppol2tp_tunnel_list_lock);
+        write_lock_bh(&pppol2tp_tunnel_list_lock);
         list_del_init(&tunnel->list);
-        write_unlock(&pppol2tp_tunnel_list_lock);
+        write_unlock_bh(&pppol2tp_tunnel_list_lock);
 
         atomic_dec(&pppol2tp_tunnel_count);
         kfree(tunnel);
@@ -1245,9 +1250,9 @@ static void pppol2tp_session_destruct(struct sock *sk)
                                 /* Delete the session socket from the
                                  * hash
                                  */
-                                write_lock(&tunnel->hlist_lock);
+                                write_lock_bh(&tunnel->hlist_lock);
                                 hlist_del_init(&session->hlist);
-                                write_unlock(&tunnel->hlist_lock);
+                                write_unlock_bh(&tunnel->hlist_lock);
 
                                 atomic_dec(&pppol2tp_session_count);
                         }
@@ -1392,9 +1397,9 @@ static struct sock *pppol2tp_prepare_tunnel_socket(int fd, u16 tunnel_id,
 
         /* Add tunnel to our list */
         INIT_LIST_HEAD(&tunnel->list);
-        write_lock(&pppol2tp_tunnel_list_lock);
+        write_lock_bh(&pppol2tp_tunnel_list_lock);
         list_add(&tunnel->list, &pppol2tp_tunnel_list);
-        write_unlock(&pppol2tp_tunnel_list_lock);
+        write_unlock_bh(&pppol2tp_tunnel_list_lock);
         atomic_inc(&pppol2tp_tunnel_count);
 
         /* Bump the reference count. The tunnel context is deleted
@@ -1599,11 +1604,11 @@ static int pppol2tp_connect(struct socket *sock, struct sockaddr *uservaddr,
         sk->sk_user_data = session;
 
         /* Add session to the tunnel's hash list */
-        write_lock(&tunnel->hlist_lock);
+        write_lock_bh(&tunnel->hlist_lock);
         hlist_add_head(&session->hlist,
                        pppol2tp_session_id_hash(tunnel,
                                                 session->tunnel_addr.s_session));
-        write_unlock(&tunnel->hlist_lock);
+        write_unlock_bh(&tunnel->hlist_lock);
 
         atomic_inc(&pppol2tp_session_count);
 
@@ -2205,7 +2210,7 @@ static struct pppol2tp_session *next_session(struct pppol2tp_tunnel *tunnel, str
         int next = 0;
         int i;
 
-        read_lock(&tunnel->hlist_lock);
+        read_lock_bh(&tunnel->hlist_lock);
         for (i = 0; i < PPPOL2TP_HASH_SIZE; i++) {
                 hlist_for_each_entry(session, walk, &tunnel->session_hlist[i], hlist) {
                         if (curr == NULL) {
@@ -2223,7 +2228,7 @@ static struct pppol2tp_session *next_session(struct pppol2tp_tunnel *tunnel, str
                 }
         }
 out:
-        read_unlock(&tunnel->hlist_lock);
+        read_unlock_bh(&tunnel->hlist_lock);
         if (!found)
                 session = NULL;
 
@@ -2234,13 +2239,13 @@ static struct pppol2tp_tunnel *next_tunnel(struct pppol2tp_tunnel *curr)
 {
         struct pppol2tp_tunnel *tunnel = NULL;
 
-        read_lock(&pppol2tp_tunnel_list_lock);
+        read_lock_bh(&pppol2tp_tunnel_list_lock);
         if (list_is_last(&curr->list, &pppol2tp_tunnel_list)) {
                 goto out;
         }
         tunnel = list_entry(curr->list.next, struct pppol2tp_tunnel, list);
 out:
-        read_unlock(&pppol2tp_tunnel_list_lock);
+        read_unlock_bh(&pppol2tp_tunnel_list_lock);
 
         return tunnel;
 }
diff --git a/drivers/net/ps3_gelic_wireless.c b/drivers/net/ps3_gelic_wireless.c
index daf5abab9534..ddbc6e475e28 100644
--- a/drivers/net/ps3_gelic_wireless.c
+++ b/drivers/net/ps3_gelic_wireless.c
@@ -1644,13 +1644,24 @@ static void gelic_wl_scan_complete_event(struct gelic_wl_info *wl)
         }
 
         /* put them in the newtork_list */
-        scan_info = wl->buf;
-        scan_info_size = 0;
-        i = 0;
-        while (scan_info_size < data_len) {
+        for (i = 0, scan_info_size = 0, scan_info = wl->buf;
+             scan_info_size < data_len;
+             i++, scan_info_size += be16_to_cpu(scan_info->size),
+             scan_info = (void *)scan_info + be16_to_cpu(scan_info->size)) {
                 pr_debug("%s:size=%d bssid=%s scan_info=%p\n", __func__,
                          be16_to_cpu(scan_info->size),
                          print_mac(mac, &scan_info->bssid[2]), scan_info);
+
+                /*
+                 * The wireless firmware may return invalid channel 0 and/or
+                 * invalid rate if the AP emits zero length SSID ie. As this
+                 * scan information is useless, ignore it
+                 */
+                if (!be16_to_cpu(scan_info->channel) || !scan_info->rate[0]) {
+                        pr_debug("%s: invalid scan info\n", __func__);
+                        continue;
+                }
+
                 found = 0;
                 oldest = NULL;
                 list_for_each_entry(target, &wl->network_list, list) {
@@ -1687,10 +1698,6 @@ static void gelic_wl_scan_complete_event(struct gelic_wl_info *wl)
                                          GFP_KERNEL);
                 if (!target->hwinfo) {
                         pr_info("%s: kzalloc failed\n", __func__);
-                        i++;
-                        scan_info_size += be16_to_cpu(scan_info->size);
-                        scan_info = (void *)scan_info +
-                                be16_to_cpu(scan_info->size);
                         continue;
                 }
                 /* copy hw scan info */
@@ -1709,10 +1716,6 @@ static void gelic_wl_scan_complete_event(struct gelic_wl_info *wl)
                         if (scan_info->ext_rate[r])
                                 target->rate_ext_len++;
                 list_move_tail(&target->list, &wl->network_list);
-                /* bump pointer */
-                i++;
-                scan_info_size += be16_to_cpu(scan_info->size);
-                scan_info = (void *)scan_info + be16_to_cpu(scan_info->size);
         }
         memset(&data, 0, sizeof(data));
         wireless_send_event(port_to_netdev(wl_port(wl)), SIOCGIWSCAN, &data,
@@ -2389,6 +2392,8 @@ static struct net_device *gelic_wl_alloc(struct gelic_card *card)
         if (!netdev)
                 return NULL;
 
+        strcpy(netdev->name, "wlan%d");
+
         port = netdev_priv(netdev);
         port->netdev = netdev;
         port->card = card;
diff --git a/drivers/net/r6040.c b/drivers/net/r6040.c
index 19184e486ae9..169edc154928 100644
--- a/drivers/net/r6040.c
+++ b/drivers/net/r6040.c
@@ -239,7 +239,8 @@ static void r6040_free_txbufs(struct net_device *dev)
 
         for (i = 0; i < TX_DCNT; i++) {
                 if (lp->tx_insert_ptr->skb_ptr) {
-                        pci_unmap_single(lp->pdev, lp->tx_insert_ptr->buf,
+                        pci_unmap_single(lp->pdev,
+                                le32_to_cpu(lp->tx_insert_ptr->buf),
                                 MAX_BUF_SIZE, PCI_DMA_TODEVICE);
                         dev_kfree_skb(lp->tx_insert_ptr->skb_ptr);
                         lp->rx_insert_ptr->skb_ptr = NULL;
@@ -255,7 +256,8 @@ static void r6040_free_rxbufs(struct net_device *dev)
 
         for (i = 0; i < RX_DCNT; i++) {
                 if (lp->rx_insert_ptr->skb_ptr) {
-                        pci_unmap_single(lp->pdev, lp->rx_insert_ptr->buf,
+                        pci_unmap_single(lp->pdev,
+                                le32_to_cpu(lp->rx_insert_ptr->buf),
                                 MAX_BUF_SIZE, PCI_DMA_FROMDEVICE);
                         dev_kfree_skb(lp->rx_insert_ptr->skb_ptr);
                         lp->rx_insert_ptr->skb_ptr = NULL;
@@ -542,7 +544,7 @@ static int r6040_rx(struct net_device *dev, int limit)
                         skb_ptr->dev = priv->dev;
                         /* Do not count the CRC */
                         skb_put(skb_ptr, descptr->len - 4);
-                        pci_unmap_single(priv->pdev, descptr->buf,
+                        pci_unmap_single(priv->pdev, le32_to_cpu(descptr->buf),
                                 MAX_BUF_SIZE, PCI_DMA_FROMDEVICE);
                         skb_ptr->protocol = eth_type_trans(skb_ptr, priv->dev);
                         /* Send to upper layer */
@@ -585,7 +587,7 @@ static void r6040_tx(struct net_device *dev)
                 if (descptr->status & 0x8000)
                         break; /* Not complete */
                 skb_ptr = descptr->skb_ptr;
-                pci_unmap_single(priv->pdev, descptr->buf,
+                pci_unmap_single(priv->pdev, le32_to_cpu(descptr->buf),
                         skb_ptr->len, PCI_DMA_TODEVICE);
                 /* Free buffer */
                 dev_kfree_skb_irq(skb_ptr);
diff --git a/drivers/net/s2io.c b/drivers/net/s2io.c
index 6179a0a2032c..3c915b82e199 100644
--- a/drivers/net/s2io.c
+++ b/drivers/net/s2io.c
@@ -1088,7 +1088,7 @@ static int s2io_print_pci_mode(struct s2io_nic *nic)
  *  '-1' on failure
  */
 
-int init_tti(struct s2io_nic *nic, int link)
+static int init_tti(struct s2io_nic *nic, int link)
 {
         struct XENA_dev_config __iomem *bar0 = nic->bar0;
         register u64 val64 = 0;
@@ -4172,6 +4172,9 @@ static int s2io_xmit(struct sk_buff *skb, struct net_device *dev)
         dev->trans_start = jiffies;
         spin_unlock_irqrestore(&fifo->tx_lock, flags);
 
+        if (sp->config.intr_type == MSI_X)
+                tx_intr_handler(fifo);
+
         return 0;
 pci_map_failed:
         stats->pci_map_fail_cnt++;
diff --git a/drivers/net/skge.c b/drivers/net/skge.c
index 186eb8ebfda6..2e26dced13a1 100644
--- a/drivers/net/skge.c
+++ b/drivers/net/skge.c
@@ -3199,12 +3199,14 @@ static int skge_poll(struct napi_struct *napi, int to_do)
         skge_write8(hw, Q_ADDR(rxqaddr[skge->port], Q_CSR), CSR_START);
 
         if (work_done < to_do) {
-                spin_lock_irq(&hw->hw_lock);
+                unsigned long flags;
+
+                spin_lock_irqsave(&hw->hw_lock, flags);
                 __netif_rx_complete(dev, napi);
                 hw->intr_mask |= napimask[skge->port];
                 skge_write32(hw, B0_IMSK, hw->intr_mask);
                 skge_read32(hw, B0_IMSK);
-                spin_unlock_irq(&hw->hw_lock);
+                spin_unlock_irqrestore(&hw->hw_lock, flags);
         }
 
         return work_done;
diff --git a/drivers/net/smc91x.h b/drivers/net/smc91x.h
index 51d4134b37b1..98a832a75539 100644
--- a/drivers/net/smc91x.h
+++ b/drivers/net/smc91x.h
@@ -92,14 +92,14 @@
 #define SMC_insw(a, r, p, l)    insw ((unsigned long *)((a) + (r)), p, l)
 # endif
 /* check if the mac in reg is valid */
-#define SMC_GET_MAC_ADDR(addr)                                  \
+#define SMC_GET_MAC_ADDR(lp, addr)                              \
         do {                                                    \
                 unsigned int __v;                               \
-                __v = SMC_inw(ioaddr, ADDR0_REG);               \
+                __v = SMC_inw(ioaddr, ADDR0_REG(lp));           \
                 addr[0] = __v; addr[1] = __v >> 8;              \
-                __v = SMC_inw(ioaddr, ADDR1_REG);               \
+                __v = SMC_inw(ioaddr, ADDR1_REG(lp));           \
                 addr[2] = __v; addr[3] = __v >> 8;              \
-                __v = SMC_inw(ioaddr, ADDR2_REG);               \
+                __v = SMC_inw(ioaddr, ADDR2_REG(lp));           \
                 addr[4] = __v; addr[5] = __v >> 8;              \
                 if (*(u32 *)(&addr[0]) == 0xFFFFFFFF) {         \
                         random_ether_addr(addr);                \
diff --git a/drivers/net/sungem.c b/drivers/net/sungem.c
index 97212799c513..4291458955ef 100644
--- a/drivers/net/sungem.c
+++ b/drivers/net/sungem.c
@@ -912,7 +912,7 @@ static int gem_poll(struct napi_struct *napi, int budget)
                  * rx ring - must call napi_disable(), which
                  * schedule_timeout()'s if polling is already disabled.
                  */
-                work_done += gem_rx(gp, budget);
+                work_done += gem_rx(gp, budget - work_done);
 
                 if (work_done >= budget)
                         return work_done;
diff --git a/drivers/net/tg3.c b/drivers/net/tg3.c
index 26ffb67f1da2..f9ef8bd8b11e 100644
--- a/drivers/net/tg3.c
+++ b/drivers/net/tg3.c
@@ -64,8 +64,8 @@
 
 #define DRV_MODULE_NAME         "tg3"
 #define PFX DRV_MODULE_NAME     ": "
-#define DRV_MODULE_VERSION      "3.87"
-#define DRV_MODULE_RELDATE      "December 20, 2007"
+#define DRV_MODULE_VERSION      "3.88"
+#define DRV_MODULE_RELDATE      "March 20, 2008"
 
 #define TG3_DEF_MAC_MODE        0
 #define TG3_DEF_RX_MODE         0
@@ -11841,7 +11841,7 @@ static int __devinit tg3_get_device_address(struct tg3 *tp)
         }
 
         if (!is_valid_ether_addr(&dev->dev_addr[0])) {
-#ifdef CONFIG_SPARC64
+#ifdef CONFIG_SPARC
                 if (!tg3_get_default_macaddr_sparc(tp))
                         return 0;
 #endif
diff --git a/drivers/net/tokenring/smctr.c b/drivers/net/tokenring/smctr.c
index 8909050b8ea7..5f1c5072b96f 100644
--- a/drivers/net/tokenring/smctr.c
+++ b/drivers/net/tokenring/smctr.c
@@ -3413,7 +3413,7 @@ static int smctr_make_tx_status_code(struct net_device *dev,
         tsv->svi = TRANSMIT_STATUS_CODE;
         tsv->svl = S_TRANSMIT_STATUS_CODE;
 
-        tsv->svv[0] = ((tx_fstatus & 0x0100 >> 6) || IBM_PASS_SOURCE_ADDR);
+        tsv->svv[0] = ((tx_fstatus & 0x0100 >> 6) | IBM_PASS_SOURCE_ADDR);
 
         /* Stripped frame status of Transmitted Frame */
         tsv->svv[1] = tx_fstatus & 0xff;
diff --git a/drivers/net/tulip/de2104x.c b/drivers/net/tulip/de2104x.c
index 77d9dd7ea34f..1b5edd646a8c 100644
--- a/drivers/net/tulip/de2104x.c
+++ b/drivers/net/tulip/de2104x.c
@@ -842,7 +842,7 @@ static inline int de_is_running (struct de_private *de)
 static void de_stop_rxtx (struct de_private *de)
 {
         u32 macmode;
-        unsigned int work = 1000;
+        unsigned int i = 1300/100;
 
         macmode = dr32(MacMode);
         if (macmode & RxTx) {
@@ -850,10 +850,14 @@ static void de_stop_rxtx (struct de_private *de)
                 dr32(MacMode);
         }
 
-        while (--work > 0) {
+        /* wait until in-flight frame completes.
+         * Max time @ 10BT: 1500*8b/10Mbps == 1200us (+ 100us margin)
+         * Typically expect this loop to end in < 50 us on 100BT.
+         */
+        while (--i) {
                 if (!de_is_running(de))
                         return;
-                cpu_relax();
+                udelay(100);
         }
 
         printk(KERN_WARNING "%s: timeout expired stopping DMA\n", de->dev->name);
@@ -910,7 +914,8 @@ static void de_set_media (struct de_private *de)
         unsigned media = de->media_type;
         u32 macmode = dr32(MacMode);
 
-        BUG_ON(de_is_running(de));
+        if (de_is_running(de))
+                printk(KERN_WARNING "%s: chip is running while changing media!\n", de->dev->name);
 
         if (de->de21040)
                 dw32(CSR11, FULL_DUPLEX_MAGIC);
diff --git a/drivers/net/ucc_geth.c b/drivers/net/ucc_geth.c
index fba0811d2608..8cc316653a39 100644
--- a/drivers/net/ucc_geth.c
+++ b/drivers/net/ucc_geth.c
@@ -154,8 +154,8 @@ static struct ucc_geth_info ugeth_primary_info = {
         .rxQoSMode = UCC_GETH_QOS_MODE_DEFAULT,
         .aufc = UPSMR_AUTOMATIC_FLOW_CONTROL_MODE_NONE,
         .padAndCrc = MACCFG2_PAD_AND_CRC_MODE_PAD_AND_CRC,
-        .numThreadsTx = UCC_GETH_NUM_OF_THREADS_4,
-        .numThreadsRx = UCC_GETH_NUM_OF_THREADS_4,
+        .numThreadsTx = UCC_GETH_NUM_OF_THREADS_1,
+        .numThreadsRx = UCC_GETH_NUM_OF_THREADS_1,
         .riscTx = QE_RISC_ALLOCATION_RISC1_AND_RISC2,
         .riscRx = QE_RISC_ALLOCATION_RISC1_AND_RISC2,
 };
@@ -3975,6 +3975,8 @@ static int ucc_geth_probe(struct of_device* ofdev, const struct of_device_id *ma
                 ug_info->uf_info.utfs = UCC_GETH_UTFS_GIGA_INIT;
                 ug_info->uf_info.utfet = UCC_GETH_UTFET_GIGA_INIT;
                 ug_info->uf_info.utftt = UCC_GETH_UTFTT_GIGA_INIT;
+                ug_info->numThreadsTx = UCC_GETH_NUM_OF_THREADS_4;
+                ug_info->numThreadsRx = UCC_GETH_NUM_OF_THREADS_4;
         }
 
         /* Set the bus id */
diff --git a/drivers/net/usb/dm9601.c b/drivers/net/usb/dm9601.c
index 4b131a6c6b70..0343b00cf1fd 100644
--- a/drivers/net/usb/dm9601.c
+++ b/drivers/net/usb/dm9601.c
@@ -341,7 +341,7 @@ static void dm9601_set_multicast(struct net_device *net)
         /* We use the 20 byte dev->data for our 8 byte filter buffer
          * to avoid allocating memory that is tricky to free later */
         u8 *hashes = (u8 *) & dev->data;
-        u8 rx_ctl = 0x01;
+        u8 rx_ctl = 0x31;
 
         memset(hashes, 0x00, DM_MCAST_SIZE);
         hashes[DM_MCAST_SIZE - 1] |= 0x80;      /* broadcast address */
@@ -562,6 +562,10 @@ static const struct usb_device_id products[] = {
          USB_DEVICE(0x0a46, 0x8515),    /* ADMtek ADM8515 USB NIC */
          .driver_info = (unsigned long)&dm9601_info,
          },
+        {
+        USB_DEVICE(0x0a47, 0x9601),     /* Hirose USB-100 */
+        .driver_info = (unsigned long)&dm9601_info,
+         },
         {},                     // END
 };
 
diff --git a/drivers/net/usb/rndis_host.c b/drivers/net/usb/rndis_host.c
index a61324757b17..369c731114b3 100644
--- a/drivers/net/usb/rndis_host.c
+++ b/drivers/net/usb/rndis_host.c
@@ -16,10 +16,6 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
-
-// #define      DEBUG                   // error path messages, extra info
-// #define      VERBOSE                 // more; success messages
-
 #include <linux/module.h>
 #include <linux/init.h>
 #include <linux/netdevice.h>
@@ -287,7 +283,7 @@ generic_rndis_bind(struct usbnet *dev, struct usb_interface *intf, int flags)
                 struct rndis_set_c      *set_c;
                 struct rndis_halt       *halt;
         } u;
-        u32                     tmp, *phym;
+        u32                     tmp, phym_unspec, *phym;
         int                     reply_len;
         unsigned char           *bp;
 
@@ -318,6 +314,14 @@ generic_rndis_bind(struct usbnet *dev, struct usb_interface *intf, int flags)
         net->hard_header_len += sizeof (struct rndis_data_hdr);
         dev->hard_mtu = net->mtu + net->hard_header_len;
 
+        dev->maxpacket = usb_maxpacket(dev->udev, dev->out, 1);
+        if (dev->maxpacket == 0) {
+                if (netif_msg_probe(dev))
+                        dev_dbg(&intf->dev, "dev->maxpacket can't be 0\n");
+                retval = -EINVAL;
+                goto fail_and_release;
+        }
+
         dev->rx_urb_size = dev->hard_mtu + (dev->maxpacket + 1);
         dev->rx_urb_size &= ~(dev->maxpacket - 1);
         u.init->max_transfer_size = cpu_to_le32(dev->rx_urb_size);
@@ -359,12 +363,15 @@ generic_rndis_bind(struct usbnet *dev, struct usb_interface *intf, int flags)
                 goto halt_fail_and_release;
 
         /* Check physical medium */
+        phym = NULL;
         reply_len = sizeof *phym;
         retval = rndis_query(dev, intf, u.buf, OID_GEN_PHYSICAL_MEDIUM,
                         0, (void **) &phym, &reply_len);
-        if (retval != 0)
+        if (retval != 0 || !phym) {
                 /* OID is optional so don't fail here. */
-                *phym = RNDIS_PHYSICAL_MEDIUM_UNSPECIFIED;
+                phym_unspec = RNDIS_PHYSICAL_MEDIUM_UNSPECIFIED;
+                phym = &phym_unspec;
+        }
         if ((flags & FLAG_RNDIS_PHYM_WIRELESS) &&
                         *phym != RNDIS_PHYSICAL_MEDIUM_WIRELESS_LAN) {
                 if (netif_msg_probe(dev))
diff --git a/drivers/net/usb/rtl8150.c b/drivers/net/usb/rtl8150.c
index 7e1f00131f91..df56a518691c 100644
--- a/drivers/net/usb/rtl8150.c
+++ b/drivers/net/usb/rtl8150.c
@@ -376,7 +376,7 @@ static int alloc_all_urbs(rtl8150_t * dev)
                 return 0;
         }
         dev->ctrl_urb = usb_alloc_urb(0, GFP_KERNEL);
-        if (!dev->intr_urb) {
+        if (!dev->ctrl_urb) {
                 usb_free_urb(dev->rx_urb);
                 usb_free_urb(dev->tx_urb);
                 usb_free_urb(dev->intr_urb);
diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c
index 19fd4cb0ddf8..b58472cf76f8 100644
--- a/drivers/net/virtio_net.c
+++ b/drivers/net/virtio_net.c
@@ -203,8 +203,11 @@ again:
         if (received < budget) {
                 netif_rx_complete(vi->dev, napi);
                 if (unlikely(!vi->rvq->vq_ops->enable_cb(vi->rvq))
-                    && netif_rx_reschedule(vi->dev, napi))
+                    && napi_schedule_prep(napi)) {
+                        vi->rvq->vq_ops->disable_cb(vi->rvq);
+                        __netif_rx_schedule(vi->dev, napi);
                         goto again;
+                }
         }
 
         return received;
@@ -278,10 +281,11 @@ again:
                 pr_debug("%s: virtio not prepared to send\n", dev->name);
                 netif_stop_queue(dev);
 
-                /* Activate callback for using skbs: if this fails it
+                /* Activate callback for using skbs: if this returns false it
                  * means some were used in the meantime. */
                 if (unlikely(!vi->svq->vq_ops->enable_cb(vi->svq))) {
-                        printk("Unlikely: restart svq failed\n");
+                        printk("Unlikely: restart svq race\n");
+                        vi->svq->vq_ops->disable_cb(vi->svq);
                         netif_start_queue(dev);
                         goto again;
                 }
@@ -294,6 +298,15 @@ again:
         return 0;
 }
 
+#ifdef CONFIG_NET_POLL_CONTROLLER
+static void virtnet_netpoll(struct net_device *dev)
+{
+        struct virtnet_info *vi = netdev_priv(dev);
+
+        napi_schedule(&vi->napi);
+}
+#endif
+
 static int virtnet_open(struct net_device *dev)
 {
         struct virtnet_info *vi = netdev_priv(dev);
@@ -336,6 +349,9 @@ static int virtnet_probe(struct virtio_device *vdev)
         dev->stop = virtnet_close;
         dev->hard_start_xmit = start_xmit;
         dev->features = NETIF_F_HIGHDMA;
+#ifdef CONFIG_NET_POLL_CONTROLLER
+        dev->poll_controller = virtnet_netpoll;
+#endif
         SET_NETDEV_DEV(dev, &vdev->dev);
 
         /* Do we support "hardware" checksums? */
diff --git a/drivers/net/wan/farsync.c b/drivers/net/wan/farsync.c
index cf27bf40d36e..547368e9633d 100644
--- a/drivers/net/wan/farsync.c
+++ b/drivers/net/wan/farsync.c
@@ -2024,6 +2024,7 @@ fst_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
         struct fstioc_write wrthdr;
         struct fstioc_info info;
         unsigned long flags;
+        void *buf;
 
         dbg(DBG_IOCTL, "ioctl: %x, %p\n", cmd, ifr->ifr_data);
 
@@ -2065,16 +2066,22 @@ fst_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
                         return -ENXIO;
                 }
 
-                /* Now copy the data to the card.
-                 * This will probably break on some architectures.
-                 * I'll fix it when I have something to test on.
-                 */
-                if (copy_from_user(card->mem + wrthdr.offset,
+                /* Now copy the data to the card. */
+
+                buf = kmalloc(wrthdr.size, GFP_KERNEL);
+                if (!buf)
+                        return -ENOMEM;
+
+                if (copy_from_user(buf,
                                    ifr->ifr_data + sizeof (struct fstioc_write),
                                    wrthdr.size)) {
+                        kfree(buf);
                         return -EFAULT;
                 }
 
+                memcpy_toio(card->mem + wrthdr.offset, buf, wrthdr.size);
+                kfree(buf);
+
                 /* Writes to the memory of a card in the reset state constitute
                  * a download
                  */
diff --git a/drivers/net/wan/sbni.c b/drivers/net/wan/sbni.c
index 15d5c58e57bc..e59255a155a9 100644
--- a/drivers/net/wan/sbni.c
+++ b/drivers/net/wan/sbni.c
@@ -751,7 +751,7 @@ upload_data( struct net_device  *dev,  unsigned  framelen,  unsigned  frameno,
 }
 
 
-static __inline void
+static inline void
 send_complete( struct net_local  *nl )
 {
 #ifdef CONFIG_SBNI_MULTILINE
diff --git a/drivers/net/wireless/arlan-proc.c b/drivers/net/wireless/arlan-proc.c
index c6e70dbc5de8..2ab1d59870f4 100644
--- a/drivers/net/wireless/arlan-proc.c
+++ b/drivers/net/wireless/arlan-proc.c
@@ -1202,13 +1202,6 @@ static ctl_table arlan_table[MAX_ARLANS + 1] =
         { .ctl_name = 0 }
 };
 #endif
-#else
-
-static ctl_table arlan_table[MAX_ARLANS + 1] =
-{
-        { .ctl_name = 0 }
-};
-#endif
 
 
 // static int mmtu = 1234;
@@ -1233,7 +1226,6 @@ static ctl_table arlan_root_table[] =
 //};
 
 
-#ifdef CONFIG_PROC_FS
 static struct ctl_table_header *arlan_device_sysctl_header;
 
 int __init init_arlan_proc(void)
diff --git a/drivers/net/wireless/ath5k/hw.c b/drivers/net/wireless/ath5k/hw.c
index c2de2d958e8e..01757436353d 100644
--- a/drivers/net/wireless/ath5k/hw.c
+++ b/drivers/net/wireless/ath5k/hw.c
@@ -427,6 +427,8 @@ void ath5k_hw_detach(struct ath5k_hw *ah)
 {
         ATH5K_TRACE(ah->ah_sc);
 
+        __set_bit(ATH_STAT_INVALID, ah->ah_sc->status);
+
         if (ah->ah_rf_banks != NULL)
                 kfree(ah->ah_rf_banks);
 
diff --git a/drivers/net/wireless/b43/debugfs.c b/drivers/net/wireless/b43/debugfs.c
index e38ed0fe72e9..7fca2ebc747f 100644
--- a/drivers/net/wireless/b43/debugfs.c
+++ b/drivers/net/wireless/b43/debugfs.c
@@ -618,6 +618,7 @@ void b43_debugfs_remove_device(struct b43_wldev *dev)
         kfree(e);
 }
 
+/* Called with IRQs disabled. */
 void b43_debugfs_log_txstat(struct b43_wldev *dev,
                             const struct b43_txstatus *status)
 {
@@ -629,8 +630,7 @@ void b43_debugfs_log_txstat(struct b43_wldev *dev,
         if (!e)
                 return;
         log = &e->txstatlog;
-        B43_WARN_ON(!irqs_disabled());
-        spin_lock(&log->lock);
+        spin_lock(&log->lock); /* IRQs are already disabled. */
         i = log->end + 1;
         if (i == B43_NR_LOGGED_TXSTATUS)
                 i = 0;
diff --git a/drivers/net/wireless/b43/dma.c b/drivers/net/wireless/b43/dma.c
index 3dfb28a34be9..cfbc1a26f601 100644
--- a/drivers/net/wireless/b43/dma.c
+++ b/drivers/net/wireless/b43/dma.c
@@ -560,7 +560,7 @@ static int b43_dmacontroller_tx_reset(struct b43_wldev *dev, u16 mmio_base,
 /* Check if a DMA mapping address is invalid. */
 static bool b43_dma_mapping_error(struct b43_dmaring *ring,
                                   dma_addr_t addr,
-                                  size_t buffersize)
+                                  size_t buffersize, bool dma_to_device)
 {
         if (unlikely(dma_mapping_error(addr)))
                 return 1;
@@ -568,11 +568,11 @@ static bool b43_dma_mapping_error(struct b43_dmaring *ring,
         switch (ring->type) {
         case B43_DMA_30BIT:
                 if ((u64)addr + buffersize > (1ULL << 30))
-                        return 1;
+                        goto address_error;
                 break;
         case B43_DMA_32BIT:
                 if ((u64)addr + buffersize > (1ULL << 32))
-                        return 1;
+                        goto address_error;
                 break;
         case B43_DMA_64BIT:
                 /* Currently we can't have addresses beyond
@@ -582,6 +582,12 @@ static bool b43_dma_mapping_error(struct b43_dmaring *ring,
 
         /* The address is OK. */
         return 0;
+
+address_error:
+        /* We can't support this address. Unmap it again. */
+        unmap_descbuffer(ring, addr, buffersize, dma_to_device);
+
+        return 1;
 }
 
 static int setup_rx_descbuffer(struct b43_dmaring *ring,
@@ -599,7 +605,7 @@ static int setup_rx_descbuffer(struct b43_dmaring *ring,
         if (unlikely(!skb))
                 return -ENOMEM;
         dmaaddr = map_descbuffer(ring, skb->data, ring->rx_buffersize, 0);
-        if (b43_dma_mapping_error(ring, dmaaddr, ring->rx_buffersize)) {
+        if (b43_dma_mapping_error(ring, dmaaddr, ring->rx_buffersize, 0)) {
                 /* ugh. try to realloc in zone_dma */
                 gfp_flags |= GFP_DMA;
 
@@ -612,7 +618,7 @@ static int setup_rx_descbuffer(struct b43_dmaring *ring,
                                          ring->rx_buffersize, 0);
         }
 
-        if (b43_dma_mapping_error(ring, dmaaddr, ring->rx_buffersize)) {
+        if (b43_dma_mapping_error(ring, dmaaddr, ring->rx_buffersize, 0)) {
                 dev_kfree_skb_any(skb);
                 return -EIO;
         }
@@ -852,7 +858,8 @@ struct b43_dmaring *b43_setup_dmaring(struct b43_wldev *dev,
                                           b43_txhdr_size(dev),
                                           DMA_TO_DEVICE);
 
-                if (b43_dma_mapping_error(ring, dma_test, b43_txhdr_size(dev))) {
+                if (b43_dma_mapping_error(ring, dma_test,
+                                          b43_txhdr_size(dev), 1)) {
                         /* ugh realloc */
                         kfree(ring->txhdr_cache);
                         ring->txhdr_cache = kcalloc(nr_slots,
@@ -867,7 +874,7 @@ struct b43_dmaring *b43_setup_dmaring(struct b43_wldev *dev,
                                                   DMA_TO_DEVICE);
 
                         if (b43_dma_mapping_error(ring, dma_test,
-                                                  b43_txhdr_size(dev)))
+                                                  b43_txhdr_size(dev), 1))
                                 goto err_kfree_txhdr_cache;
                 }
 
@@ -1189,7 +1196,7 @@ static int dma_tx_fragment(struct b43_dmaring *ring,
 
         meta_hdr->dmaaddr = map_descbuffer(ring, (unsigned char *)header,
                                            hdrsize, 1);
-        if (b43_dma_mapping_error(ring, meta_hdr->dmaaddr, hdrsize)) {
+        if (b43_dma_mapping_error(ring, meta_hdr->dmaaddr, hdrsize, 1)) {
                 ring->current_slot = old_top_slot;
                 ring->used_slots = old_used_slots;
                 return -EIO;
@@ -1208,7 +1215,7 @@ static int dma_tx_fragment(struct b43_dmaring *ring,
 
         meta->dmaaddr = map_descbuffer(ring, skb->data, skb->len, 1);
         /* create a bounce buffer in zone_dma on mapping failure. */
-        if (b43_dma_mapping_error(ring, meta->dmaaddr, skb->len)) {
+        if (b43_dma_mapping_error(ring, meta->dmaaddr, skb->len, 1)) {
                 bounce_skb = __dev_alloc_skb(skb->len, GFP_ATOMIC | GFP_DMA);
                 if (!bounce_skb) {
                         ring->current_slot = old_top_slot;
@@ -1222,7 +1229,7 @@ static int dma_tx_fragment(struct b43_dmaring *ring,
                 skb = bounce_skb;
                 meta->skb = skb;
                 meta->dmaaddr = map_descbuffer(ring, skb->data, skb->len, 1);
-                if (b43_dma_mapping_error(ring, meta->dmaaddr, skb->len)) {
+                if (b43_dma_mapping_error(ring, meta->dmaaddr, skb->len, 1)) {
                         ring->current_slot = old_top_slot;
                         ring->used_slots = old_used_slots;
                         err = -EIO;
@@ -1337,6 +1344,7 @@ out_unlock:
         return err;
 }
 
+/* Called with IRQs disabled. */
 void b43_dma_handle_txstatus(struct b43_wldev *dev,
                              const struct b43_txstatus *status)
 {
@@ -1349,8 +1357,8 @@ void b43_dma_handle_txstatus(struct b43_wldev *dev,
         ring = parse_cookie(dev, status->cookie, &slot);
         if (unlikely(!ring))
                 return;
-        B43_WARN_ON(!irqs_disabled());
-        spin_lock(&ring->lock);
+
+        spin_lock(&ring->lock); /* IRQs are already disabled. */
 
         B43_WARN_ON(!ring->tx);
         ops = ring->ops;
diff --git a/drivers/net/wireless/b43/main.c b/drivers/net/wireless/b43/main.c
index 51dfce16178a..c73a75b24cd6 100644
--- a/drivers/net/wireless/b43/main.c
+++ b/drivers/net/wireless/b43/main.c
@@ -2049,7 +2049,6 @@ void b43_mac_enable(struct b43_wldev *dev)
 {
         dev->mac_suspended--;
         B43_WARN_ON(dev->mac_suspended < 0);
-        B43_WARN_ON(irqs_disabled());
         if (dev->mac_suspended == 0) {
                 b43_write32(dev, B43_MMIO_MACCTL,
                             b43_read32(dev, B43_MMIO_MACCTL)
@@ -2075,7 +2074,6 @@ void b43_mac_suspend(struct b43_wldev *dev)
         u32 tmp;
 
         might_sleep();
-        B43_WARN_ON(irqs_disabled());
         B43_WARN_ON(dev->mac_suspended < 0);
 
         if (dev->mac_suspended == 0) {
diff --git a/drivers/net/wireless/b43/phy.c b/drivers/net/wireless/b43/phy.c
index 71507b260b6d..575c5436ebdf 100644
--- a/drivers/net/wireless/b43/phy.c
+++ b/drivers/net/wireless/b43/phy.c
@@ -860,7 +860,7 @@ static void b43_phy_ww(struct b43_wldev *dev)
         b43_phy_write(dev, B43_PHY_OFDM(0xBB),
                 (b43_phy_read(dev, B43_PHY_OFDM(0xBB)) & 0xF000) | 0x0053);
         b43_phy_write(dev, B43_PHY_OFDM61,
-                (b43_phy_read(dev, B43_PHY_OFDM61 & 0xFE1F)) | 0x0120);
+                (b43_phy_read(dev, B43_PHY_OFDM61) & 0xFE1F) | 0x0120);
         b43_phy_write(dev, B43_PHY_OFDM(0x13),
                 (b43_phy_read(dev, B43_PHY_OFDM(0x13)) & 0x0FFF) | 0x3000);
         b43_phy_write(dev, B43_PHY_OFDM(0x14),
diff --git a/drivers/net/wireless/iwlwifi/Kconfig b/drivers/net/wireless/iwlwifi/Kconfig
index d1af938b9aa6..b79a35a40ab6 100644
--- a/drivers/net/wireless/iwlwifi/Kconfig
+++ b/drivers/net/wireless/iwlwifi/Kconfig
@@ -20,7 +20,7 @@ config IWL4965
           runs.
 
           If you want to compile the driver as a module ( = code which can be
-          inserted in and remvoed from the running kernel whenever you want),
+          inserted in and removed from the running kernel whenever you want),
           say M here and read <file:Documentation/kbuild/modules.txt>.  The
           module will be called iwl4965.ko.
 
@@ -101,7 +101,7 @@ config IWL3945
           runs.
 
           If you want to compile the driver as a module ( = code which can be
-          inserted in and remvoed from the running kernel whenever you want),
+          inserted in and removed from the running kernel whenever you want),
           say M here and read <file:Documentation/kbuild/modules.txt>.  The
           module will be called iwl3945.ko.
 
diff --git a/drivers/net/wireless/iwlwifi/iwl3945-base.c b/drivers/net/wireless/iwlwifi/iwl3945-base.c
index 40b71bc2c4a4..cbaeaf186494 100644
--- a/drivers/net/wireless/iwlwifi/iwl3945-base.c
+++ b/drivers/net/wireless/iwlwifi/iwl3945-base.c
@@ -6206,11 +6206,11 @@ static void iwl3945_alive_start(struct iwl3945_priv *priv)
 
         /* At this point, the NIC is initialized and operational */
         priv->notif_missed_beacons = 0;
-        set_bit(STATUS_READY, &priv->status);
 
         iwl3945_reg_txpower_periodic(priv);
 
         IWL_DEBUG_INFO("ALIVE processing complete.\n");
+        set_bit(STATUS_READY, &priv->status);
         wake_up_interruptible(&priv->wait_command_queue);
 
         if (priv->error_recovering)
@@ -8706,7 +8706,7 @@ static int iwl3945_pci_probe(struct pci_dev *pdev, const struct pci_device_id *e
         return err;
 }
 
-static void iwl3945_pci_remove(struct pci_dev *pdev)
+static void __devexit iwl3945_pci_remove(struct pci_dev *pdev)
 {
         struct iwl3945_priv *priv = pci_get_drvdata(pdev);
         struct list_head *p, *q;
diff --git a/drivers/net/wireless/iwlwifi/iwl4965-base.c b/drivers/net/wireless/iwlwifi/iwl4965-base.c
index a23d4798653b..60ec29eab85a 100644
--- a/drivers/net/wireless/iwlwifi/iwl4965-base.c
+++ b/drivers/net/wireless/iwlwifi/iwl4965-base.c
@@ -6628,11 +6628,11 @@ static void iwl4965_alive_start(struct iwl4965_priv *priv)
 
         /* At this point, the NIC is initialized and operational */
         priv->notif_missed_beacons = 0;
-        set_bit(STATUS_READY, &priv->status);
 
         iwl4965_rf_kill_ct_config(priv);
 
         IWL_DEBUG_INFO("ALIVE processing complete.\n");
+        set_bit(STATUS_READY, &priv->status);
         wake_up_interruptible(&priv->wait_command_queue);
 
         if (priv->error_recovering)
@@ -9282,7 +9282,7 @@ static int iwl4965_pci_probe(struct pci_dev *pdev, const struct pci_device_id *e
         return err;
 }
 
-static void iwl4965_pci_remove(struct pci_dev *pdev)
+static void __devexit iwl4965_pci_remove(struct pci_dev *pdev)
 {
         struct iwl4965_priv *priv = pci_get_drvdata(pdev);
         struct list_head *p, *q;
diff --git a/drivers/net/wireless/libertas/cmdresp.c b/drivers/net/wireless/libertas/cmdresp.c
index bdc6a1cc2103..f0ef7081bdeb 100644
--- a/drivers/net/wireless/libertas/cmdresp.c
+++ b/drivers/net/wireless/libertas/cmdresp.c
@@ -578,7 +578,7 @@ int lbs_process_rx_command(struct lbs_private *priv)
                 goto done;
         }
         if (respcmd != CMD_RET(curcmd) &&
-            respcmd != CMD_802_11_ASSOCIATE && curcmd != CMD_RET_802_11_ASSOCIATE) {
+            respcmd != CMD_RET_802_11_ASSOCIATE && curcmd != CMD_802_11_ASSOCIATE) {
                 lbs_pr_info("Invalid CMD_RESP %x to command %x!\n", respcmd, curcmd);
                 spin_unlock_irqrestore(&priv->driver_lock, flags);
                 ret = -1;
diff --git a/drivers/net/wireless/p54usb.c b/drivers/net/wireless/p54usb.c
index e7d4aee8799e..98ddbb3b3273 100644
--- a/drivers/net/wireless/p54usb.c
+++ b/drivers/net/wireless/p54usb.c
@@ -63,6 +63,7 @@ static struct usb_device_id p54u_table[] __devinitdata = {
         {USB_DEVICE(0x0cde, 0x0008)},   /* Sagem XG703A */
         {USB_DEVICE(0x0d8e, 0x3762)},   /* DLink DWL-G120 Cohiba */
         {USB_DEVICE(0x09aa, 0x1000)},   /* Spinnaker Proto board */
+        {USB_DEVICE(0x124a, 0x4025)},   /* IOGear GWU513 (GW3887IK chip) */
         {USB_DEVICE(0x13b1, 0x000a)},   /* Linksys WUSB54G ver 2 */
         {USB_DEVICE(0x13B1, 0x000C)},   /* Linksys WUSB54AG */
         {USB_DEVICE(0x1435, 0x0427)},   /* Inventel UR054G */
diff --git a/drivers/net/wireless/rt2x00/rt2x00.h b/drivers/net/wireless/rt2x00/rt2x00.h
index 05927b908f80..6c725422af5a 100644
--- a/drivers/net/wireless/rt2x00/rt2x00.h
+++ b/drivers/net/wireless/rt2x00/rt2x00.h
@@ -620,6 +620,9 @@ struct rt2x00_dev {
          * This will only be compiled in when required.
          */
 #ifdef CONFIG_RT2X00_LIB_RFKILL
+unsigned long rfkill_state;
+#define RFKILL_STATE_ALLOCATED          1
+#define RFKILL_STATE_REGISTERED         2
         struct rfkill *rfkill;
         struct input_polled_dev *poll_dev;
 #endif /* CONFIG_RT2X00_LIB_RFKILL */
diff --git a/drivers/net/wireless/rt2x00/rt2x00dev.c b/drivers/net/wireless/rt2x00/rt2x00dev.c
index 0d51f478bcdf..bd305f7f3efd 100644
--- a/drivers/net/wireless/rt2x00/rt2x00dev.c
+++ b/drivers/net/wireless/rt2x00/rt2x00dev.c
@@ -1098,7 +1098,7 @@ static void rt2x00lib_uninitialize(struct rt2x00_dev *rt2x00dev)
                 return;
 
         /*
-         * Unregister rfkill.
+         * Unregister extra components.
          */
         rt2x00rfkill_unregister(rt2x00dev);
 
@@ -1139,17 +1139,12 @@ static int rt2x00lib_initialize(struct rt2x00_dev *rt2x00dev)
         __set_bit(DEVICE_INITIALIZED, &rt2x00dev->flags);
 
         /*
-         * Register the rfkill handler.
+         * Register the extra components.
          */
-        status = rt2x00rfkill_register(rt2x00dev);
-        if (status)
-                goto exit_unitialize;
+        rt2x00rfkill_register(rt2x00dev);
 
         return 0;
 
-exit_unitialize:
-        rt2x00lib_uninitialize(rt2x00dev);
-
 exit:
         rt2x00lib_free_ring_entries(rt2x00dev);
 
@@ -1313,15 +1308,9 @@ int rt2x00lib_probe_dev(struct rt2x00_dev *rt2x00dev)
         }
 
         /*
-         * Allocatie rfkill.
-         */
-        retval = rt2x00rfkill_allocate(rt2x00dev);
-        if (retval)
-                goto exit;
-
-        /*
-         * Open the debugfs entry.
+         * Register extra components.
          */
+        rt2x00rfkill_allocate(rt2x00dev);
         rt2x00debug_register(rt2x00dev);
 
         __set_bit(DEVICE_PRESENT, &rt2x00dev->flags);
@@ -1350,13 +1339,9 @@ void rt2x00lib_remove_dev(struct rt2x00_dev *rt2x00dev)
         rt2x00lib_uninitialize(rt2x00dev);
 
         /*
-         * Close debugfs entry.
+         * Free extra components
          */
         rt2x00debug_deregister(rt2x00dev);
-
-        /*
-         * Free rfkill
-         */
         rt2x00rfkill_free(rt2x00dev);
 
         /*
@@ -1395,11 +1380,15 @@ int rt2x00lib_suspend(struct rt2x00_dev *rt2x00dev, pm_message_t state)
         __set_bit(DEVICE_STARTED_SUSPEND, &rt2x00dev->flags);
 
         /*
-         * Disable radio and unitialize all items
-         * that must be recreated on resume.
+         * Disable radio.
          */
         rt2x00lib_stop(rt2x00dev);
         rt2x00lib_uninitialize(rt2x00dev);
+
+        /*
+         * Suspend/disable extra components.
+         */
+        rt2x00rfkill_suspend(rt2x00dev);
         rt2x00debug_deregister(rt2x00dev);
 
 exit:
@@ -1422,9 +1411,10 @@ int rt2x00lib_resume(struct rt2x00_dev *rt2x00dev)
         NOTICE(rt2x00dev, "Waking up.\n");
 
         /*
-         * Open the debugfs entry.
+         * Restore/enable extra components.
          */
         rt2x00debug_register(rt2x00dev);
+        rt2x00rfkill_resume(rt2x00dev);
 
         /*
          * Only continue if mac80211 had open interfaces.
diff --git a/drivers/net/wireless/rt2x00/rt2x00lib.h b/drivers/net/wireless/rt2x00/rt2x00lib.h
index 1adbd28e0973..ce58c654ade1 100644
--- a/drivers/net/wireless/rt2x00/rt2x00lib.h
+++ b/drivers/net/wireless/rt2x00/rt2x00lib.h
@@ -100,28 +100,36 @@ static inline void rt2x00debug_dump_frame(struct rt2x00_dev *rt2x00dev,
  * RFkill handlers.
  */
 #ifdef CONFIG_RT2X00_LIB_RFKILL
-int rt2x00rfkill_register(struct rt2x00_dev *rt2x00dev);
+void rt2x00rfkill_register(struct rt2x00_dev *rt2x00dev);
 void rt2x00rfkill_unregister(struct rt2x00_dev *rt2x00dev);
-int rt2x00rfkill_allocate(struct rt2x00_dev *rt2x00dev);
+void rt2x00rfkill_allocate(struct rt2x00_dev *rt2x00dev);
 void rt2x00rfkill_free(struct rt2x00_dev *rt2x00dev);
+void rt2x00rfkill_suspend(struct rt2x00_dev *rt2x00dev);
+void rt2x00rfkill_resume(struct rt2x00_dev *rt2x00dev);
 #else
-static inline int rt2x00rfkill_register(struct rt2x00_dev *rt2x00dev)
+static inline void rt2x00rfkill_register(struct rt2x00_dev *rt2x00dev)
 {
-        return 0;
 }
 
 static inline void rt2x00rfkill_unregister(struct rt2x00_dev *rt2x00dev)
 {
 }
 
-static inline int rt2x00rfkill_allocate(struct rt2x00_dev *rt2x00dev)
+static inline void rt2x00rfkill_allocate(struct rt2x00_dev *rt2x00dev)
 {
-        return 0;
 }
 
 static inline void rt2x00rfkill_free(struct rt2x00_dev *rt2x00dev)
 {
 }
+
+static inline void rt2x00rfkill_suspend(struct rt2x00_dev *rt2x00dev)
+{
+}
+
+static inline void rt2x00rfkill_resume(struct rt2x00_dev *rt2x00dev)
+{
+}
 #endif /* CONFIG_RT2X00_LIB_RFKILL */
 
 #endif /* RT2X00LIB_H */
diff --git a/drivers/net/wireless/rt2x00/rt2x00rfkill.c b/drivers/net/wireless/rt2x00/rt2x00rfkill.c
index 34a96d44e306..f95577596206 100644
--- a/drivers/net/wireless/rt2x00/rt2x00rfkill.c
+++ b/drivers/net/wireless/rt2x00/rt2x00rfkill.c
@@ -69,56 +69,81 @@ static void rt2x00rfkill_poll(struct input_polled_dev *poll_dev)
         }
 }
 
-int rt2x00rfkill_register(struct rt2x00_dev *rt2x00dev)
+void rt2x00rfkill_register(struct rt2x00_dev *rt2x00dev)
 {
-        int retval;
-
-        if (!test_bit(CONFIG_SUPPORT_HW_BUTTON, &rt2x00dev->flags))
-                return 0;
+        if (!test_bit(CONFIG_SUPPORT_HW_BUTTON, &rt2x00dev->flags) ||
+            !test_bit(RFKILL_STATE_ALLOCATED, &rt2x00dev->rfkill_state))
+                return;
 
-        retval = rfkill_register(rt2x00dev->rfkill);
-        if (retval) {
+        if (rfkill_register(rt2x00dev->rfkill)) {
                 ERROR(rt2x00dev, "Failed to register rfkill handler.\n");
-                return retval;
+                return;
         }
 
-        retval = input_register_polled_device(rt2x00dev->poll_dev);
-        if (retval) {
+        if (input_register_polled_device(rt2x00dev->poll_dev)) {
                 ERROR(rt2x00dev, "Failed to register polled device.\n");
                 rfkill_unregister(rt2x00dev->rfkill);
-                return retval;
+                return;
         }
 
+        __set_bit(RFKILL_STATE_REGISTERED, &rt2x00dev->rfkill_state);
+
         /*
          * Force initial poll which will detect the initial device state,
          * and correctly sends the signal to the rfkill layer about this
          * state.
          */
         rt2x00rfkill_poll(rt2x00dev->poll_dev);
-
-        return 0;
 }
 
 void rt2x00rfkill_unregister(struct rt2x00_dev *rt2x00dev)
 {
-        if (!test_bit(CONFIG_SUPPORT_HW_BUTTON, &rt2x00dev->flags))
+        if (!test_bit(CONFIG_SUPPORT_HW_BUTTON, &rt2x00dev->flags) ||
+            !test_bit(RFKILL_STATE_REGISTERED, &rt2x00dev->rfkill_state))
                 return;
 
         input_unregister_polled_device(rt2x00dev->poll_dev);
         rfkill_unregister(rt2x00dev->rfkill);
+
+        __clear_bit(RFKILL_STATE_REGISTERED, &rt2x00dev->rfkill_state);
 }
 
-int rt2x00rfkill_allocate(struct rt2x00_dev *rt2x00dev)
+static struct input_polled_dev *
+rt2x00rfkill_allocate_polldev(struct rt2x00_dev *rt2x00dev)
 {
-        struct device *device = wiphy_dev(rt2x00dev->hw->wiphy);
+        struct input_polled_dev *poll_dev;
+
+        poll_dev = input_allocate_polled_device();
+        if (!poll_dev)
+                return NULL;
+
+        poll_dev->private = rt2x00dev;
+        poll_dev->poll = rt2x00rfkill_poll;
+        poll_dev->poll_interval = RFKILL_POLL_INTERVAL;
+
+        poll_dev->input->name = rt2x00dev->ops->name;
+        poll_dev->input->phys = wiphy_name(rt2x00dev->hw->wiphy);
+        poll_dev->input->id.bustype = BUS_HOST;
+        poll_dev->input->id.vendor = 0x1814;
+        poll_dev->input->id.product = rt2x00dev->chip.rt;
+        poll_dev->input->id.version = rt2x00dev->chip.rev;
+        poll_dev->input->dev.parent = wiphy_dev(rt2x00dev->hw->wiphy);
+        poll_dev->input->evbit[0] = BIT(EV_KEY);
+        set_bit(KEY_WLAN, poll_dev->input->keybit);
+
+        return poll_dev;
+}
 
+void rt2x00rfkill_allocate(struct rt2x00_dev *rt2x00dev)
+{
         if (!test_bit(CONFIG_SUPPORT_HW_BUTTON, &rt2x00dev->flags))
-                return 0;
+                return;
 
-        rt2x00dev->rfkill = rfkill_allocate(device, RFKILL_TYPE_WLAN);
+        rt2x00dev->rfkill =
+            rfkill_allocate(wiphy_dev(rt2x00dev->hw->wiphy), RFKILL_TYPE_WLAN);
         if (!rt2x00dev->rfkill) {
                 ERROR(rt2x00dev, "Failed to allocate rfkill handler.\n");
-                goto exit;
+                return;
         }
 
         rt2x00dev->rfkill->name = rt2x00dev->ops->name;
@@ -126,40 +151,49 @@ int rt2x00rfkill_allocate(struct rt2x00_dev *rt2x00dev)
         rt2x00dev->rfkill->state = -1;
         rt2x00dev->rfkill->toggle_radio = rt2x00rfkill_toggle_radio;
 
-        rt2x00dev->poll_dev = input_allocate_polled_device();
+        rt2x00dev->poll_dev = rt2x00rfkill_allocate_polldev(rt2x00dev);
         if (!rt2x00dev->poll_dev) {
                 ERROR(rt2x00dev, "Failed to allocate polled device.\n");
-                goto exit_free_rfkill;
+                rfkill_free(rt2x00dev->rfkill);
+                rt2x00dev->rfkill = NULL;
+                return;
         }
 
-        rt2x00dev->poll_dev->private = rt2x00dev;
-        rt2x00dev->poll_dev->poll = rt2x00rfkill_poll;
-        rt2x00dev->poll_dev->poll_interval = RFKILL_POLL_INTERVAL;
+        return;
+}
 
-        rt2x00dev->poll_dev->input->name = rt2x00dev->ops->name;
-        rt2x00dev->poll_dev->input->phys = wiphy_name(rt2x00dev->hw->wiphy);
-        rt2x00dev->poll_dev->input->id.bustype = BUS_HOST;
-        rt2x00dev->poll_dev->input->id.vendor = 0x1814;
-        rt2x00dev->poll_dev->input->id.product = rt2x00dev->chip.rt;
-        rt2x00dev->poll_dev->input->id.version = rt2x00dev->chip.rev;
-        rt2x00dev->poll_dev->input->dev.parent = device;
-        rt2x00dev->poll_dev->input->evbit[0] = BIT(EV_KEY);
-        set_bit(KEY_WLAN, rt2x00dev->poll_dev->input->keybit);
+void rt2x00rfkill_free(struct rt2x00_dev *rt2x00dev)
+{
+        if (!test_bit(CONFIG_SUPPORT_HW_BUTTON, &rt2x00dev->flags) ||
+            !test_bit(RFKILL_STATE_ALLOCATED, &rt2x00dev->rfkill_state))
+                return;
 
-        return 0;
+        input_free_polled_device(rt2x00dev->poll_dev);
+        rt2x00dev->poll_dev = NULL;
 
-exit_free_rfkill:
         rfkill_free(rt2x00dev->rfkill);
-
-exit:
-        return -ENOMEM;
+        rt2x00dev->rfkill = NULL;
 }
 
-void rt2x00rfkill_free(struct rt2x00_dev *rt2x00dev)
+void rt2x00rfkill_suspend(struct rt2x00_dev *rt2x00dev)
 {
-        if (!test_bit(CONFIG_SUPPORT_HW_BUTTON, &rt2x00dev->flags))
+        if (!test_bit(CONFIG_SUPPORT_HW_BUTTON, &rt2x00dev->flags) ||
+            !test_bit(RFKILL_STATE_ALLOCATED, &rt2x00dev->rfkill_state))
                 return;
 
         input_free_polled_device(rt2x00dev->poll_dev);
-        rfkill_free(rt2x00dev->rfkill);
+        rt2x00dev->poll_dev = NULL;
+}
+
+void rt2x00rfkill_resume(struct rt2x00_dev *rt2x00dev)
+{
+        if (!test_bit(CONFIG_SUPPORT_HW_BUTTON, &rt2x00dev->flags) ||
+            !test_bit(RFKILL_STATE_ALLOCATED, &rt2x00dev->rfkill_state))
+                return;
+
+        rt2x00dev->poll_dev = rt2x00rfkill_allocate_polldev(rt2x00dev);
+        if (!rt2x00dev->poll_dev) {
+                ERROR(rt2x00dev, "Failed to allocate polled device.\n");
+                return;
+        }
 }
diff --git a/drivers/net/wireless/rt2x00/rt61pci.c b/drivers/net/wireless/rt2x00/rt61pci.c
index e808db98f2f5..93ea212fedd5 100644
--- a/drivers/net/wireless/rt2x00/rt61pci.c
+++ b/drivers/net/wireless/rt2x00/rt61pci.c
@@ -2302,9 +2302,9 @@ static void rt61pci_configure_filter(struct ieee80211_hw *hw,
          * Apply some rules to the filters:
          * - Some filters imply different filters to be set.
          * - Some things we can't filter out at all.
+         * - Multicast filter seems to kill broadcast traffic so never use it.
          */
-        if (mc_count)
-                *total_flags |= FIF_ALLMULTI;
+        *total_flags |= FIF_ALLMULTI;
         if (*total_flags & FIF_OTHER_BSS ||
             *total_flags & FIF_PROMISC_IN_BSS)
                 *total_flags |= FIF_PROMISC_IN_BSS | FIF_OTHER_BSS;
diff --git a/drivers/net/wireless/rt2x00/rt73usb.c b/drivers/net/wireless/rt2x00/rt73usb.c
index 4fac2d414d84..3909cf42f472 100644
--- a/drivers/net/wireless/rt2x00/rt73usb.c
+++ b/drivers/net/wireless/rt2x00/rt73usb.c
@@ -1869,9 +1869,9 @@ static void rt73usb_configure_filter(struct ieee80211_hw *hw,
          * Apply some rules to the filters:
          * - Some filters imply different filters to be set.
          * - Some things we can't filter out at all.
+         * - Multicast filter seems to kill broadcast traffic so never use it.
          */
-        if (mc_count)
-                *total_flags |= FIF_ALLMULTI;
+        *total_flags |= FIF_ALLMULTI;
         if (*total_flags & FIF_OTHER_BSS ||
             *total_flags & FIF_PROMISC_IN_BSS)
                 *total_flags |= FIF_PROMISC_IN_BSS | FIF_OTHER_BSS;
@@ -2095,9 +2095,12 @@ static struct usb_device_id rt73usb_device_table[] = {
         { USB_DEVICE(0x1371, 0x9032), USB_DEVICE_DATA(&rt73usb_ops) },
         /* Conceptronic */
         { USB_DEVICE(0x14b2, 0x3c22), USB_DEVICE_DATA(&rt73usb_ops) },
+        /* Corega */
+        { USB_DEVICE(0x07aa, 0x002e), USB_DEVICE_DATA(&rt73usb_ops) },
         /* D-Link */
         { USB_DEVICE(0x07d1, 0x3c03), USB_DEVICE_DATA(&rt73usb_ops) },
         { USB_DEVICE(0x07d1, 0x3c04), USB_DEVICE_DATA(&rt73usb_ops) },
+        { USB_DEVICE(0x07d1, 0x3c07), USB_DEVICE_DATA(&rt73usb_ops) },
         /* Gemtek */
         { USB_DEVICE(0x15a9, 0x0004), USB_DEVICE_DATA(&rt73usb_ops) },
         /* Gigabyte */
diff --git a/drivers/net/wireless/wavelan_cs.h b/drivers/net/wireless/wavelan_cs.h
index fabc63ee153c..2e4bfe4147c6 100644
--- a/drivers/net/wireless/wavelan_cs.h
+++ b/drivers/net/wireless/wavelan_cs.h
@@ -309,7 +309,7 @@ struct mmw_t
 #define MMW_EXT_ANT_INTERNAL    0x00    /* Internal antenna */
 #define MMW_EXT_ANT_EXTERNAL    0x03    /* External antenna */
 #define MMW_EXT_ANT_IQ_TEST     0x1C    /* IQ test pattern (set to 0) */
-};
+} __attribute__((packed));
 
 /* Size for structure checking (if padding is correct) */
 #define MMW_SIZE        37
diff --git a/drivers/parisc/pdc_stable.c b/drivers/parisc/pdc_stable.c
index de34aa9d3136..f9f9a5f1bbd0 100644
--- a/drivers/parisc/pdc_stable.c
+++ b/drivers/parisc/pdc_stable.c
@@ -829,7 +829,7 @@ static ssize_t pdcs_autoboot_write(struct kobject *kobj,
                                    struct kobj_attribute *attr,
                                    const char *buf, size_t count)
 {
-        return pdcs_auto_write(kset, attr, buf, count, PF_AUTOBOOT);
+        return pdcs_auto_write(kobj, attr, buf, count, PF_AUTOBOOT);
 }
 
 /**
@@ -845,7 +845,7 @@ static ssize_t pdcs_autosearch_write(struct kobject *kobj,
                                      struct kobj_attribute *attr,
                                      const char *buf, size_t count)
 {
-        return pdcs_auto_write(kset, attr, buf, count, PF_AUTOSEARCH);
+        return pdcs_auto_write(kobj, attr, buf, count, PF_AUTOSEARCH);
 }
 
 /**
@@ -1066,7 +1066,7 @@ pdc_stable_init(void)
         }
 
         /* Don't forget the root entries */
-        error = sysfs_create_group(stable_kobj, pdcs_attr_group);
+        error = sysfs_create_group(stable_kobj, &pdcs_attr_group);
 
         /* register the paths kset as a child of the stable kset */
         paths_kset = kset_create_and_add("paths", NULL, stable_kobj);
diff --git a/drivers/parisc/sba_iommu.c b/drivers/parisc/sba_iommu.c
index bdbe780e21c5..8c4d2c13d5f2 100644
--- a/drivers/parisc/sba_iommu.c
+++ b/drivers/parisc/sba_iommu.c
@@ -314,8 +314,8 @@ sba_dump_sg( struct ioc *ioc, struct scatterlist *startsg, int nents)
 #define RESMAP_MASK(n)    (~0UL << (BITS_PER_LONG - (n)))
 #define RESMAP_IDX_MASK   (sizeof(unsigned long) - 1)
 
-unsigned long ptr_to_pide(struct ioc *ioc, unsigned long *res_ptr,
-                          unsigned int bitshiftcnt)
+static unsigned long ptr_to_pide(struct ioc *ioc, unsigned long *res_ptr,
+                                 unsigned int bitshiftcnt)
 {
         return (((unsigned long)res_ptr - (unsigned long)ioc->res_map) << 3)
                 + bitshiftcnt;
diff --git a/drivers/pci/bus.c b/drivers/pci/bus.c
index 6a9403d79e0c..d708358326e5 100644
--- a/drivers/pci/bus.c
+++ b/drivers/pci/bus.c
@@ -143,14 +143,18 @@ void pci_bus_add_devices(struct pci_bus *bus)
                         /* register the bus with sysfs as the parent is now
                          * properly registered. */
                         child_bus = dev->subordinate;
+                        if (child_bus->is_added)
+                                continue;
                         child_bus->dev.parent = child_bus->bridge;
                         retval = device_register(&child_bus->dev);
                         if (retval)
                                 dev_err(&dev->dev, "Error registering pci_bus,"
                                         " continuing...\n");
-                        else
+                        else {
+                                child_bus->is_added = 1;
                                 retval = device_create_file(&child_bus->dev,
                                                         &dev_attr_cpuaffinity);
+                        }
                         if (retval)
                                 dev_err(&dev->dev, "Error creating cpuaffinity"
                                         " file, continuing...\n");
diff --git a/drivers/pci/hotplug/pciehp_core.c b/drivers/pci/hotplug/pciehp_core.c
index 7f4836b8e71e..5fa4ba0d9934 100644
--- a/drivers/pci/hotplug/pciehp_core.c
+++ b/drivers/pci/hotplug/pciehp_core.c
@@ -467,7 +467,7 @@ static int pciehp_probe(struct pcie_device *dev, const struct pcie_port_service_
         t_slot = pciehp_find_slot(ctrl, ctrl->slot_device_offset);
 
         t_slot->hpc_ops->get_adapter_status(t_slot, &value); /* Check if slot is occupied */
-        if (value) {
+        if (value && pciehp_force) {
                 rc = pciehp_enable_slot(t_slot);
                 if (rc) /* -ENODEV: shouldn't happen, but deal with it */
                         value = 0;
diff --git a/drivers/pci/intel-iommu.c b/drivers/pci/intel-iommu.c
index 977d29b32295..4cb949f0ebd9 100644
--- a/drivers/pci/intel-iommu.c
+++ b/drivers/pci/intel-iommu.c
@@ -1097,6 +1097,8 @@ static void iommu_free_domain(struct dmar_domain *domain)
 }
 
 static struct iova_domain reserved_iova_list;
+static struct lock_class_key reserved_alloc_key;
+static struct lock_class_key reserved_rbtree_key;
 
 static void dmar_init_reserved_ranges(void)
 {
@@ -1107,6 +1109,11 @@ static void dmar_init_reserved_ranges(void)
 
         init_iova_domain(&reserved_iova_list, DMA_32BIT_PFN);
 
+        lockdep_set_class(&reserved_iova_list.iova_alloc_lock,
+                &reserved_alloc_key);
+        lockdep_set_class(&reserved_iova_list.iova_rbtree_lock,
+                &reserved_rbtree_key);
+
         /* IOAPIC ranges shouldn't be accessed by DMA */
         iova = reserve_iova(&reserved_iova_list, IOVA_PFN(IOAPIC_RANGE_START),
                 IOVA_PFN(IOAPIC_RANGE_END));
diff --git a/drivers/pci/pci-acpi.c b/drivers/pci/pci-acpi.c
index 4a23654184fc..72f7476930c8 100644
--- a/drivers/pci/pci-acpi.c
+++ b/drivers/pci/pci-acpi.c
@@ -272,21 +272,29 @@ static int acpi_pci_set_power_state(struct pci_dev *dev, pci_power_t state)
 {
         acpi_handle handle = DEVICE_ACPI_HANDLE(&dev->dev);
         acpi_handle tmp;
-        static int state_conv[] = {
-                [0] = 0,
-                [1] = 1,
-                [2] = 2,
-                [3] = 3,
-                [4] = 3
+        static const u8 state_conv[] = {
+                [PCI_D0] = ACPI_STATE_D0,
+                [PCI_D1] = ACPI_STATE_D1,
+                [PCI_D2] = ACPI_STATE_D2,
+                [PCI_D3hot] = ACPI_STATE_D3,
+                [PCI_D3cold] = ACPI_STATE_D3
         };
-        int acpi_state = state_conv[(int __force) state];
 
         if (!handle)
                 return -ENODEV;
         /* If the ACPI device has _EJ0, ignore the device */
         if (ACPI_SUCCESS(acpi_get_handle(handle, "_EJ0", &tmp)))
                 return 0;
-        return acpi_bus_set_power(handle, acpi_state);
+
+        switch (state) {
+        case PCI_D0:
+        case PCI_D1:
+        case PCI_D2:
+        case PCI_D3hot:
+        case PCI_D3cold:
+                return acpi_bus_set_power(handle, state_conv[state]);
+        }
+        return -EINVAL;
 }
 
 
diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c
index 183fddaa38b7..a4445b7210bf 100644
--- a/drivers/pci/pci.c
+++ b/drivers/pci/pci.c
@@ -314,24 +314,6 @@ int pci_find_ht_capability(struct pci_dev *dev, int ht_cap)
 }
 EXPORT_SYMBOL_GPL(pci_find_ht_capability);
 
-void pcie_wait_pending_transaction(struct pci_dev *dev)
-{
-        int pos;
-        u16 reg16;
-
-        pos = pci_find_capability(dev, PCI_CAP_ID_EXP);
-        if (!pos)
-                return;
-        while (1) {
-                pci_read_config_word(dev, pos + PCI_EXP_DEVSTA, &reg16);
-                if (!(reg16 & PCI_EXP_DEVSTA_TRPND))
-                        break;
-                cpu_relax();
-        }
-
-}
-EXPORT_SYMBOL_GPL(pcie_wait_pending_transaction);
-
 /**
  * pci_find_parent_resource - return resource region of parent bus of given region
  * @dev: PCI device structure contains resources to be searched
@@ -936,9 +918,6 @@ pci_disable_device(struct pci_dev *dev)
         if (atomic_sub_return(1, &dev->enable_cnt) != 0)
                 return;
 
-        /* Wait for all transactions are finished before disabling the device */
-        pcie_wait_pending_transaction(dev);
-
         pci_read_config_word(dev, PCI_COMMAND, &pci_command);
         if (pci_command & PCI_COMMAND_MASTER) {
                 pci_command &= ~PCI_COMMAND_MASTER;
diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c
index e9a333d98552..e887aa45c9cd 100644
--- a/drivers/pci/quirks.c
+++ b/drivers/pci/quirks.c
@@ -951,6 +951,12 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL,	PCI_DEVICE_ID_INTEL_82375,	quirk_e
  * accesses to the SMBus registers, with potentially bad effects. Thus you
  * should be very careful when adding new entries: if SMM is accessing the
  * Intel SMBus, this is a very good reason to leave it hidden.
+ *
+ * Likewise, many recent laptops use ACPI for thermal management. If the
+ * ACPI DSDT code accesses the SMBus, then Linux should not access it
+ * natively, and keeping the SMBus hidden is the right thing to do. If you
+ * are about to add an entry in the table below, please first disassemble
+ * the DSDT and double-check that there is no code accessing the SMBus.
  */
 static int asus_hides_smbus;
 
@@ -1028,11 +1034,6 @@ static void __init asus_hides_smbus_hostbridge(struct pci_dev *dev)
                         case 0x12bf: /* HP xw4100 */
                                 asus_hides_smbus = 1;
                         }
-                else if (dev->device == PCI_DEVICE_ID_INTEL_82915GM_HB)
-                        switch (dev->subsystem_device) {
-                        case 0x099c: /* HP Compaq nx6110 */
-                                asus_hides_smbus = 1;
-                        }
        } else if (unlikely(dev->subsystem_vendor == PCI_VENDOR_ID_SAMSUNG)) {
                if (dev->device ==  PCI_DEVICE_ID_INTEL_82855PM_HB)
                        switch(dev->subsystem_device) {
diff --git a/drivers/pci/setup-bus.c b/drivers/pci/setup-bus.c
index 125e7b7f34ff..f7cb8e0758b4 100644
--- a/drivers/pci/setup-bus.c
+++ b/drivers/pci/setup-bus.c
@@ -486,12 +486,7 @@ void __ref pci_bus_size_bridges(struct pci_bus *bus)
                 break;
 
         case PCI_CLASS_BRIDGE_PCI:
-                /* don't size subtractive decoding (transparent)
-                 * PCI-to-PCI bridges */
-                if (bus->self->transparent)
-                        break;
                 pci_bridge_check_ranges(bus);
-                /* fall through */
         default:
                 pbus_size_io(bus);
                 /* If the bridge supports prefetchable range, size it
diff --git a/drivers/pnp/isapnp/core.c b/drivers/pnp/isapnp/core.c
index 2c925b7cd93e..257f5d827d83 100644
--- a/drivers/pnp/isapnp/core.c
+++ b/drivers/pnp/isapnp/core.c
@@ -88,6 +88,15 @@ MODULE_LICENSE("GPL");
 #define _LTAG_MEM32RANGE        0x85
 #define _LTAG_FIXEDMEM32RANGE   0x86
 
+/*
+ * Sizes of ISAPNP logical device configuration register sets.
+ * See PNP-ISA-v1.0a.pdf, Appendix A.
+ */
+#define ISAPNP_MAX_MEM          4
+#define ISAPNP_MAX_PORT         8
+#define ISAPNP_MAX_IRQ          2
+#define ISAPNP_MAX_DMA          2
+
 static unsigned char isapnp_checksum_value;
 static DEFINE_MUTEX(isapnp_cfg_mutex);
 static int isapnp_csn_count;
@@ -945,14 +954,14 @@ static int isapnp_read_resources(struct pnp_dev *dev,
 
         dev->active = isapnp_read_byte(ISAPNP_CFG_ACTIVATE);
         if (dev->active) {
-                for (tmp = 0; tmp < PNP_MAX_PORT; tmp++) {
+                for (tmp = 0; tmp < ISAPNP_MAX_PORT; tmp++) {
                         ret = isapnp_read_word(ISAPNP_CFG_PORT + (tmp << 1));
                         if (!ret)
                                 continue;
                         res->port_resource[tmp].start = ret;
                         res->port_resource[tmp].flags = IORESOURCE_IO;
                 }
-                for (tmp = 0; tmp < PNP_MAX_MEM; tmp++) {
+                for (tmp = 0; tmp < ISAPNP_MAX_MEM; tmp++) {
                         ret =
                             isapnp_read_word(ISAPNP_CFG_MEM + (tmp << 3)) << 8;
                         if (!ret)
@@ -960,7 +969,7 @@ static int isapnp_read_resources(struct pnp_dev *dev,
                         res->mem_resource[tmp].start = ret;
                         res->mem_resource[tmp].flags = IORESOURCE_MEM;
                 }
-                for (tmp = 0; tmp < PNP_MAX_IRQ; tmp++) {
+                for (tmp = 0; tmp < ISAPNP_MAX_IRQ; tmp++) {
                         ret =
                             (isapnp_read_word(ISAPNP_CFG_IRQ + (tmp << 1)) >>
                              8);
@@ -970,7 +979,7 @@ static int isapnp_read_resources(struct pnp_dev *dev,
                             res->irq_resource[tmp].end = ret;
                         res->irq_resource[tmp].flags = IORESOURCE_IRQ;
                 }
-                for (tmp = 0; tmp < PNP_MAX_DMA; tmp++) {
+                for (tmp = 0; tmp < ISAPNP_MAX_DMA; tmp++) {
                         ret = isapnp_read_byte(ISAPNP_CFG_DMA + tmp);
                         if (ret == 4)
                                 continue;
@@ -1002,14 +1011,14 @@ static int isapnp_set_resources(struct pnp_dev *dev,
         isapnp_cfg_begin(dev->card->number, dev->number);
         dev->active = 1;
         for (tmp = 0;
-             tmp < PNP_MAX_PORT
+             tmp < ISAPNP_MAX_PORT
              && (res->port_resource[tmp].
                  flags & (IORESOURCE_IO | IORESOURCE_UNSET)) == IORESOURCE_IO;
              tmp++)
                 isapnp_write_word(ISAPNP_CFG_PORT + (tmp << 1),
                                   res->port_resource[tmp].start);
         for (tmp = 0;
-             tmp < PNP_MAX_IRQ
+             tmp < ISAPNP_MAX_IRQ
              && (res->irq_resource[tmp].
                  flags & (IORESOURCE_IRQ | IORESOURCE_UNSET)) == IORESOURCE_IRQ;
              tmp++) {
@@ -1019,14 +1028,14 @@ static int isapnp_set_resources(struct pnp_dev *dev,
                 isapnp_write_byte(ISAPNP_CFG_IRQ + (tmp << 1), irq);
         }
         for (tmp = 0;
-             tmp < PNP_MAX_DMA
+             tmp < ISAPNP_MAX_DMA
              && (res->dma_resource[tmp].
                  flags & (IORESOURCE_DMA | IORESOURCE_UNSET)) == IORESOURCE_DMA;
              tmp++)
                 isapnp_write_byte(ISAPNP_CFG_DMA + tmp,
                                   res->dma_resource[tmp].start);
         for (tmp = 0;
-             tmp < PNP_MAX_MEM
+             tmp < ISAPNP_MAX_MEM
              && (res->mem_resource[tmp].
                  flags & (IORESOURCE_MEM | IORESOURCE_UNSET)) == IORESOURCE_MEM;
              tmp++)
diff --git a/drivers/pnp/pnpacpi/rsparser.c b/drivers/pnp/pnpacpi/rsparser.c
index 6aa231ef642d..2dcd1960aca8 100644
--- a/drivers/pnp/pnpacpi/rsparser.c
+++ b/drivers/pnp/pnpacpi/rsparser.c
@@ -85,7 +85,7 @@ static void pnpacpi_parse_allocated_irqresource(struct pnp_resource_table *res,
                i < PNP_MAX_IRQ)
                 i++;
         if (i >= PNP_MAX_IRQ && !warned) {
-                printk(KERN_ERR "pnpacpi: exceeded the max number of IRQ "
+                printk(KERN_WARNING "pnpacpi: exceeded the max number of IRQ "
                                 "resources: %d \n", PNP_MAX_IRQ);
                 warned = 1;
                 return;
@@ -187,7 +187,7 @@ static void pnpacpi_parse_allocated_dmaresource(struct pnp_resource_table *res,
                 res->dma_resource[i].start = dma;
                 res->dma_resource[i].end = dma;
         } else if (!warned) {
-                printk(KERN_ERR "pnpacpi: exceeded the max number of DMA "
+                printk(KERN_WARNING "pnpacpi: exceeded the max number of DMA "
                                 "resources: %d \n", PNP_MAX_DMA);
                 warned = 1;
         }
@@ -213,7 +213,7 @@ static void pnpacpi_parse_allocated_ioresource(struct pnp_resource_table *res,
                 res->port_resource[i].start = io;
                 res->port_resource[i].end = io + len - 1;
         } else if (!warned) {
-                printk(KERN_ERR "pnpacpi: exceeded the max number of IO "
+                printk(KERN_WARNING "pnpacpi: exceeded the max number of IO "
                                 "resources: %d \n", PNP_MAX_PORT);
                 warned = 1;
         }
@@ -241,7 +241,7 @@ static void pnpacpi_parse_allocated_memresource(struct pnp_resource_table *res,
                 res->mem_resource[i].start = mem;
                 res->mem_resource[i].end = mem + len - 1;
         } else if (!warned) {
-                printk(KERN_ERR "pnpacpi: exceeded the max number of mem "
+                printk(KERN_WARNING "pnpacpi: exceeded the max number of mem "
                                 "resources: %d\n", PNP_MAX_MEM);
                 warned = 1;
         }
diff --git a/drivers/pnp/quirks.c b/drivers/pnp/quirks.c
index 4065139753b6..37993206ae5d 100644
--- a/drivers/pnp/quirks.c
+++ b/drivers/pnp/quirks.c
@@ -17,7 +17,6 @@
 #include <linux/slab.h>
 #include <linux/pnp.h>
 #include <linux/io.h>
-#include <linux/dmi.h>
 #include <linux/kallsyms.h>
 #include "base.h"
 
@@ -109,42 +108,73 @@ static void quirk_sb16audio_resources(struct pnp_dev *dev)
                        "pnp: SB audio device quirk - increasing port range\n");
 }
 
-static void quirk_supermicro_h8dce_system(struct pnp_dev *dev)
+
+#include <linux/pci.h>
+
+static void quirk_system_pci_resources(struct pnp_dev *dev)
 {
-        int i;
-        static struct dmi_system_id supermicro_h8dce[] = {
-                {
-                        .ident = "Supermicro H8DCE",
-                        .matches = {
-                                DMI_MATCH(DMI_SYS_VENDOR, "Supermicro"),
-                                DMI_MATCH(DMI_PRODUCT_NAME, "H8DCE"),
-                        },
-                },
-                { }
-        };
-
-        if (!dmi_check_system(supermicro_h8dce))
-                return;
+        struct pci_dev *pdev = NULL;
+        resource_size_t pnp_start, pnp_end, pci_start, pci_end;
+        int i, j;
 
         /*
-         * On the Supermicro H8DCE, there's a system device with resources
-         * that overlap BAR 6 of the built-in SATA PCI adapter.  If the PNP
-         * system device claims them, the sata_nv driver won't be able to.
-         * More details at:
-         *     https://bugzilla.redhat.com/show_bug.cgi?id=280641
-         *     https://bugzilla.redhat.com/show_bug.cgi?id=313491
-         *     http://lkml.org/lkml/2008/1/9/449
-         *     http://thread.gmane.org/gmane.linux.acpi.devel/27312
+         * Some BIOSes have PNP motherboard devices with resources that
+         * partially overlap PCI BARs.  The PNP system driver claims these
+         * motherboard resources, which prevents the normal PCI driver from
+         * requesting them later.
+         *
+         * This patch disables the PNP resources that conflict with PCI BARs
+         * so they won't be claimed by the PNP system driver.
          */
-        for (i = 0; i < PNP_MAX_MEM; i++) {
-                if (pnp_mem_valid(dev, i) && pnp_mem_len(dev, i) &&
-                    (pnp_mem_start(dev, i) & 0xdfef0000) == 0xdfef0000) {
-                        dev_warn(&dev->dev, "disabling 0x%llx-0x%llx to prevent"
-                                " conflict with sata_nv PCI device\n",
-                                (unsigned long long) pnp_mem_start(dev, i),
-                                (unsigned long long) (pnp_mem_start(dev, i) +
-                                        pnp_mem_len(dev, i) - 1));
-                        pnp_mem_flags(dev, i) = 0;
+        for_each_pci_dev(pdev) {
+                for (i = 0; i < DEVICE_COUNT_RESOURCE; i++) {
+                        if (!(pci_resource_flags(pdev, i) & IORESOURCE_MEM) ||
+                            pci_resource_len(pdev, i) == 0)
+                                continue;
+
+                        pci_start = pci_resource_start(pdev, i);
+                        pci_end = pci_resource_end(pdev, i);
+                        for (j = 0; j < PNP_MAX_MEM; j++) {
+                                if (!pnp_mem_valid(dev, j) ||
+                                    pnp_mem_len(dev, j) == 0)
+                                        continue;
+
+                                pnp_start = pnp_mem_start(dev, j);
+                                pnp_end = pnp_mem_end(dev, j);
+
+                                /*
+                                 * If the PNP region doesn't overlap the PCI
+                                 * region at all, there's no problem.
+                                 */
+                                if (pnp_end < pci_start || pnp_start > pci_end)
+                                        continue;
+
+                                /*
+                                 * If the PNP region completely encloses (or is
+                                 * at least as large as) the PCI region, that's
+                                 * also OK.  For example, this happens when the
+                                 * PNP device describes a bridge with PCI
+                                 * behind it.
+                                 */
+                                if (pnp_start <= pci_start &&
+                                    pnp_end >= pci_end)
+                                        continue;
+
+                                /*
+                                 * Otherwise, the PNP region overlaps *part* of
+                                 * the PCI region, and that might prevent a PCI
+                                 * driver from requesting its resources.
+                                 */
+                                dev_warn(&dev->dev, "mem resource "
+                                        "(0x%llx-0x%llx) overlaps %s BAR %d "
+                                        "(0x%llx-0x%llx), disabling\n",
+                                        (unsigned long long) pnp_start,
+                                        (unsigned long long) pnp_end,
+                                        pci_name(pdev), i,
+                                        (unsigned long long) pci_start,
+                                        (unsigned long long) pci_end);
+                                pnp_mem_flags(dev, j) = 0;
+                        }
                 }
         }
 }
@@ -169,8 +199,8 @@ static struct pnp_fixup pnp_fixups[] = {
         {"CTL0043", quirk_sb16audio_resources},
         {"CTL0044", quirk_sb16audio_resources},
         {"CTL0045", quirk_sb16audio_resources},
-        {"PNP0c01", quirk_supermicro_h8dce_system},
-        {"PNP0c02", quirk_supermicro_h8dce_system},
+        {"PNP0c01", quirk_system_pci_resources},
+        {"PNP0c02", quirk_system_pci_resources},
         {""}
 };
 
diff --git a/drivers/rtc/Kconfig b/drivers/rtc/Kconfig
index 82f5ad9c3af4..9e7de63b26ef 100644
--- a/drivers/rtc/Kconfig
+++ b/drivers/rtc/Kconfig
@@ -16,7 +16,7 @@ menuconfig RTC_CLASS
           probably want to enable one or more of the interfaces below.
 
           This driver can also be built as a module. If so, the module
-          will be called rtc-class.
+          will be called rtc-core.
 
 if RTC_CLASS
 
diff --git a/drivers/rtc/rtc-at91sam9.c b/drivers/rtc/rtc-at91sam9.c
index bbf10ecf416c..56728a2a3385 100644
--- a/drivers/rtc/rtc-at91sam9.c
+++ b/drivers/rtc/rtc-at91sam9.c
@@ -274,7 +274,7 @@ static irqreturn_t at91_rtc_interrupt(int irq, void *_rtc)
          * SR clears it, so we must only read it in this irq handler!
          */
         mr = rtt_readl(rtc, MR) & (AT91_RTT_ALMIEN | AT91_RTT_RTTINCIEN);
-        sr = rtt_readl(rtc, SR) & mr;
+        sr = rtt_readl(rtc, SR) & (mr >> 16);
         if (!sr)
                 return IRQ_NONE;
 
@@ -321,6 +321,10 @@ static int __init at91_rtc_probe(struct platform_device *pdev)
         if (!rtc)
                 return -ENOMEM;
 
+        /* platform setup code should have handled this; sigh */
+        if (!device_can_wakeup(&pdev->dev))
+                device_init_wakeup(&pdev->dev, 1);
+
         platform_set_drvdata(pdev, rtc);
         rtc->rtt = (void __force __iomem *) (AT91_VA_BASE_SYS - AT91_BASE_SYS);
         rtc->rtt += r->start;
diff --git a/drivers/scsi/Kconfig b/drivers/scsi/Kconfig
index c46666a24809..b9d374082b65 100644
--- a/drivers/scsi/Kconfig
+++ b/drivers/scsi/Kconfig
@@ -325,7 +325,7 @@ menuconfig SCSI_LOWLEVEL
         depends on SCSI!=n
         default y
 
-if SCSI_LOWLEVEL
+if SCSI_LOWLEVEL && SCSI
 
 config ISCSI_TCP
         tristate "iSCSI Initiator over TCP/IP"
diff --git a/drivers/scsi/a100u2w.c b/drivers/scsi/a100u2w.c
index f608d4a1d6da..792b2e807bf3 100644
--- a/drivers/scsi/a100u2w.c
+++ b/drivers/scsi/a100u2w.c
@@ -674,12 +674,13 @@ static struct orc_scb *__orc_alloc_scb(struct orc_host * host)
                 for (index = 0; index < 32; index++) {
                         if ((host->allocation_map[channel][i] >> index) & 0x01) {
                                 host->allocation_map[channel][i] &= ~(1 << index);
-                                break;
+                                idx = index + 32 * i;
+                                /*
+                                 * Translate the index to a structure instance
+                                 */
+                                return host->scb_virt + idx;
                         }
                 }
-                idx = index + 32 * i;
-                /* Translate the index to a structure instance */
-                return (struct orc_scb *) ((unsigned long) host->scb_virt + (idx * sizeof(struct orc_scb)));
         }
         return NULL;
 }
diff --git a/drivers/scsi/advansys.c b/drivers/scsi/advansys.c
index 3c2d6888bb8c..8591585e5cc5 100644
--- a/drivers/scsi/advansys.c
+++ b/drivers/scsi/advansys.c
@@ -6439,7 +6439,7 @@ static int AdvLoadMicrocode(AdvPortAddr iop_base, unsigned char *buf, int size,
                         i += 2;
                         len += 2;
                 } else {
-                        unsigned char off = buf[i] * 2;
+                        unsigned int off = buf[i] * 2;
                         unsigned short word = (buf[off + 1] << 8) | buf[off];
                         AdvWriteWordAutoIncLram(iop_base, word);
                         len += 2;
diff --git a/drivers/scsi/arcmsr/arcmsr.h b/drivers/scsi/arcmsr/arcmsr.h
index 0393707bdfce..3288be2e49f8 100644
--- a/drivers/scsi/arcmsr/arcmsr.h
+++ b/drivers/scsi/arcmsr/arcmsr.h
@@ -341,13 +341,13 @@ struct MessageUnit_B
         uint32_t        done_qbuffer[ARCMSR_MAX_HBB_POSTQUEUE];
         uint32_t        postq_index;
         uint32_t        doneq_index;
-        uint32_t        __iomem *drv2iop_doorbell_reg;
-        uint32_t        __iomem *drv2iop_doorbell_mask_reg;
-        uint32_t        __iomem *iop2drv_doorbell_reg;
-        uint32_t        __iomem *iop2drv_doorbell_mask_reg;
-        uint32_t        __iomem *msgcode_rwbuffer_reg;
-        uint32_t        __iomem *ioctl_wbuffer_reg;
-        uint32_t        __iomem *ioctl_rbuffer_reg;
+        void            __iomem *drv2iop_doorbell_reg;
+        void            __iomem *drv2iop_doorbell_mask_reg;
+        void            __iomem *iop2drv_doorbell_reg;
+        void            __iomem *iop2drv_doorbell_mask_reg;
+        void            __iomem *msgcode_rwbuffer_reg;
+        void            __iomem *ioctl_wbuffer_reg;
+        void            __iomem *ioctl_rbuffer_reg;
 };
 
 /*
diff --git a/drivers/scsi/gdth.c b/drivers/scsi/gdth.c
index 27ebd336409b..0b2080d33575 100644
--- a/drivers/scsi/gdth.c
+++ b/drivers/scsi/gdth.c
@@ -493,6 +493,12 @@ int __gdth_execute(struct scsi_device *sdev, gdth_cmd_str *gdtcmd, char *cmnd,
     if (!scp)
         return -ENOMEM;
 
+    scp->sense_buffer = kzalloc(SCSI_SENSE_BUFFERSIZE, GFP_KERNEL);
+    if (!scp->sense_buffer) {
+        kfree(scp);
+        return -ENOMEM;
+    }
+
     scp->device = sdev;
     memset(&cmndinfo, 0, sizeof(cmndinfo));
 
@@ -513,6 +519,7 @@ int __gdth_execute(struct scsi_device *sdev, gdth_cmd_str *gdtcmd, char *cmnd,
     rval = cmndinfo.status;
     if (info)
         *info = cmndinfo.info;
+    kfree(scp->sense_buffer);
     kfree(scp);
     return rval;
 }
diff --git a/drivers/scsi/scsi_lib.c b/drivers/scsi/scsi_lib.c
index ba21d97d1855..f40898dc2d14 100644
--- a/drivers/scsi/scsi_lib.c
+++ b/drivers/scsi/scsi_lib.c
@@ -2162,10 +2162,15 @@ void sdev_evt_send(struct scsi_device *sdev, struct scsi_event *evt)
 {
         unsigned long flags;
 
+#if 0
+        /* FIXME: currently this check eliminates all media change events
+         * for polled devices.  Need to update to discriminate between AN
+         * and polled events */
         if (!test_bit(evt->evt_type, sdev->supported_events)) {
                 kfree(evt);
                 return;
         }
+#endif
 
         spin_lock_irqsave(&sdev->list_lock, flags);
         list_add_tail(&evt->node, &sdev->event_list);
diff --git a/drivers/scsi/scsi_sysfs.c b/drivers/scsi/scsi_sysfs.c
index ed83cdb6e67d..b9b09a704584 100644
--- a/drivers/scsi/scsi_sysfs.c
+++ b/drivers/scsi/scsi_sysfs.c
@@ -294,6 +294,7 @@ static void scsi_device_dev_release_usercontext(struct work_struct *work)
         }
 
         if (sdev->request_queue) {
+                bsg_unregister_queue(sdev->request_queue);
                 sdev->request_queue->queuedata = NULL;
                 /* user context needed to free queue */
                 scsi_free_queue(sdev->request_queue);
@@ -857,7 +858,6 @@ void __scsi_remove_device(struct scsi_device *sdev)
         if (scsi_device_set_state(sdev, SDEV_CANCEL) != 0)
                 return;
 
-        bsg_unregister_queue(sdev->request_queue);
         class_device_unregister(&sdev->sdev_classdev);
         transport_remove_device(dev);
         device_del(dev);
diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c
index 7aee64dbfbeb..5fe7aaed904c 100644
--- a/drivers/scsi/sd.c
+++ b/drivers/scsi/sd.c
@@ -1654,6 +1654,7 @@ static int sd_probe(struct device *dev)
         sdkp->disk = gd;
         sdkp->index = index;
         sdkp->openers = 0;
+        sdkp->previous_state = 1;
 
         if (!sdp->timeout) {
                 if (sdp->type != TYPE_MOD)
diff --git a/drivers/scsi/sr.c b/drivers/scsi/sr.c
index 208565bdbe8e..7ee86d4a7618 100644
--- a/drivers/scsi/sr.c
+++ b/drivers/scsi/sr.c
@@ -623,6 +623,7 @@ static int sr_probe(struct device *dev)
         cd->disk = disk;
         cd->capacity = 0x1fffff;
         cd->device->changed = 1;        /* force recheck CD type */
+        cd->previous_state = 1;
         cd->use = 1;
         cd->readcd_known = 0;
         cd->readcd_cdda = 0;
diff --git a/drivers/serial/8250_pci.c b/drivers/serial/8250_pci.c
index a8bec498cad6..f97224ce59da 100644
--- a/drivers/serial/8250_pci.c
+++ b/drivers/serial/8250_pci.c
@@ -1214,13 +1214,6 @@ static struct pciserial_board pci_boards[] __devinitdata = {
                 .base_baud      = 115200,
                 .uart_offset    = 8,
         },
-        [pbn_b0_8_115200] = {
-                .flags          = FL_BASE0,
-                .num_ports      = 8,
-                .base_baud      = 115200,
-                .uart_offset    = 8,
-        },
-
         [pbn_b0_1_921600] = {
                 .flags          = FL_BASE0,
                 .num_ports      = 1,
diff --git a/drivers/serial/sh-sci.c b/drivers/serial/sh-sci.c
index a8c116b80bff..9d244d1644e1 100644
--- a/drivers/serial/sh-sci.c
+++ b/drivers/serial/sh-sci.c
@@ -414,12 +414,12 @@ static void sci_init_pins_scif(struct uart_port *port, unsigned int cflag)
     defined(CONFIG_CPU_SUBTYPE_SH7785)
 static inline int scif_txroom(struct uart_port *port)
 {
-        return SCIF_TXROOM_MAX - (sci_in(port, SCTFDR) & 0x7f);
+        return SCIF_TXROOM_MAX - (sci_in(port, SCTFDR) & 0xff);
 }
 
 static inline int scif_rxroom(struct uart_port *port)
 {
-        return sci_in(port, SCRFDR) & 0x7f;
+        return sci_in(port, SCRFDR) & 0xff;
 }
 #else
 static inline int scif_txroom(struct uart_port *port)
diff --git a/drivers/sn/ioc3.c b/drivers/sn/ioc3.c
index 29fcd6d0301d..a0aa33dde0a4 100644
--- a/drivers/sn/ioc3.c
+++ b/drivers/sn/ioc3.c
@@ -561,7 +561,7 @@ void ioc3_unregister_submodule(struct ioc3_submodule *is)
                                         printk(KERN_WARNING
                                                "%s: IOC3 submodule %s remove failed "
                                                "for pci_dev %s.\n",
-                                               __FUNCTION__, module_name(is->owner),
+                                               __func__, module_name(is->owner),
                                                pci_name(idd->pdev));
                         idd->active[is->id] = 0;
                         if(is->irq_mask)
@@ -611,7 +611,7 @@ static int ioc3_probe(struct pci_dev *pdev, const struct pci_device_id *pci_id)
         if ((ret = pci_enable_device(pdev))) {
                 printk(KERN_WARNING
                        "%s: Failed to enable IOC3 device for pci_dev %s.\n",
-                       __FUNCTION__, pci_name(pdev));
+                       __func__, pci_name(pdev));
                 goto out;
         }
         pci_set_master(pdev);
@@ -623,7 +623,7 @@ static int ioc3_probe(struct pci_dev *pdev, const struct pci_device_id *pci_id)
                 if (ret < 0) {
                         printk(KERN_WARNING "%s: Unable to obtain 64 bit DMA "
                                "for consistent allocations\n",
-                                __FUNCTION__);
+                                __func__);
                 }
         }
 #endif
@@ -633,7 +633,7 @@ static int ioc3_probe(struct pci_dev *pdev, const struct pci_device_id *pci_id)
         if (!idd) {
                 printk(KERN_WARNING
                        "%s: Failed to allocate IOC3 data for pci_dev %s.\n",
-                       __FUNCTION__, pci_name(pdev));
+                       __func__, pci_name(pdev));
                 ret = -ENODEV;
                 goto out_idd;
         }
@@ -649,7 +649,7 @@ static int ioc3_probe(struct pci_dev *pdev, const struct pci_device_id *pci_id)
                 printk(KERN_WARNING
                        "%s: Unable to find IOC3 resource "
                        "for pci_dev %s.\n",
-                       __FUNCTION__, pci_name(pdev));
+                       __func__, pci_name(pdev));
                 ret = -ENODEV;
                 goto out_pci;
         }
@@ -657,7 +657,7 @@ static int ioc3_probe(struct pci_dev *pdev, const struct pci_device_id *pci_id)
                 printk(KERN_WARNING
                        "%s: Unable to request IOC3 region "
                        "for pci_dev %s.\n",
-                       __FUNCTION__, pci_name(pdev));
+                       __func__, pci_name(pdev));
                 ret = -ENODEV;
                 goto out_pci;
         }
@@ -666,7 +666,7 @@ static int ioc3_probe(struct pci_dev *pdev, const struct pci_device_id *pci_id)
                 printk(KERN_WARNING
                        "%s: Unable to remap IOC3 region "
                        "for pci_dev %s.\n",
-                       __FUNCTION__, pci_name(pdev));
+                       __func__, pci_name(pdev));
                 ret = -ENODEV;
                 goto out_misc_region;
         }
@@ -709,7 +709,7 @@ static int ioc3_probe(struct pci_dev *pdev, const struct pci_device_id *pci_id)
                 } else {
                         printk(KERN_WARNING
                                "%s : request_irq fails for IRQ 0x%x\n ",
-                               __FUNCTION__, pdev->irq);
+                               __func__, pdev->irq);
                 }
                 if (!request_irq(pdev->irq+2, ioc3_intr_io, IRQF_SHARED,
                                  "ioc3-io", (void *)idd)) {
@@ -717,7 +717,7 @@ static int ioc3_probe(struct pci_dev *pdev, const struct pci_device_id *pci_id)
                 } else {
                         printk(KERN_WARNING
                                "%s : request_irq fails for IRQ 0x%x\n ",
-                               __FUNCTION__, pdev->irq+2);
+                               __func__, pdev->irq+2);
                 }
         } else {
                 if (!request_irq(pdev->irq, ioc3_intr_io, IRQF_SHARED,
@@ -726,7 +726,7 @@ static int ioc3_probe(struct pci_dev *pdev, const struct pci_device_id *pci_id)
                 } else {
                         printk(KERN_WARNING
                                "%s : request_irq fails for IRQ 0x%x\n ",
-                               __FUNCTION__, pdev->irq);
+                               __func__, pdev->irq);
                 }
         }
 
@@ -769,7 +769,7 @@ static void ioc3_remove(struct pci_dev *pdev)
                                         printk(KERN_WARNING
                                                "%s: IOC3 submodule 0x%s remove failed "
                                                "for pci_dev %s.\n",
-                                                __FUNCTION__,
+                                                __func__,
                                                 module_name(ioc3_submodules[id]->owner),
                                                 pci_name(pdev));
                         idd->active[id] = 0;
diff --git a/drivers/spi/au1550_spi.c b/drivers/spi/au1550_spi.c
index c47a650183a1..41a3d00c4515 100644
--- a/drivers/spi/au1550_spi.c
+++ b/drivers/spi/au1550_spi.c
@@ -99,7 +99,7 @@ static dbdev_tab_t au1550_spi_mem_dbdev =
 static void au1550_spi_bits_handlers_set(struct au1550_spi *hw, int bpw);
 
 
-/**
+/*
  *  compute BRG and DIV bits to setup spi clock based on main input clock rate
  *  that was specified in platform data structure
  *  according to au1550 datasheet:
@@ -650,7 +650,7 @@ static int au1550_spi_txrx_bufs(struct spi_device *spi, struct spi_transfer *t)
         return hw->txrx_bufs(spi, t);
 }
 
-static irqreturn_t au1550_spi_irq(int irq, void *dev, struct pt_regs *regs)
+static irqreturn_t au1550_spi_irq(int irq, void *dev)
 {
         struct au1550_spi *hw = dev;
         return hw->irq_callback(hw);
diff --git a/drivers/spi/spi_bitbang.c b/drivers/spi/spi_bitbang.c
index f7f8580edad8..71e881419cdd 100644
--- a/drivers/spi/spi_bitbang.c
+++ b/drivers/spi/spi_bitbang.c
@@ -344,12 +344,14 @@ static void bitbang_work(struct work_struct *work)
                                         t->rx_dma = t->tx_dma = 0;
                                 status = bitbang->txrx_bufs(spi, t);
                         }
+                        if (status > 0)
+                                m->actual_length += status;
                         if (status != t->len) {
-                                if (status > 0)
-                                        status = -EMSGSIZE;
+                                /* always report some kind of error */
+                                if (status >= 0)
+                                        status = -EREMOTEIO;
                                 break;
                         }
-                        m->actual_length += status;
                         status = 0;
 
                         /* protocol tweaks before next transfer */
diff --git a/drivers/thermal/Kconfig b/drivers/thermal/Kconfig
index 69f19f224875..17e71d56f31e 100644
--- a/drivers/thermal/Kconfig
+++ b/drivers/thermal/Kconfig
@@ -4,7 +4,6 @@
 
 menuconfig THERMAL
         bool "Generic Thermal sysfs driver"
-        default y
         help
           Generic Thermal Sysfs driver offers a generic mechanism for
           thermal management. Usually it's made up of one or more thermal
diff --git a/drivers/uio/uio.c b/drivers/uio/uio.c
index e8a01f264540..11759080ca54 100644
--- a/drivers/uio/uio.c
+++ b/drivers/uio/uio.c
@@ -470,6 +470,8 @@ static int uio_mmap_physical(struct vm_area_struct *vma)
 
         vma->vm_flags |= VM_IO | VM_RESERVED;
 
+        vma->vm_page_prot = pgprot_noncached(vma->vm_page_prot);
+
         return remap_pfn_range(vma,
                                vma->vm_start,
                                idev->info->mem[mi].addr >> PAGE_SHIFT,
diff --git a/drivers/usb/core/message.c b/drivers/usb/core/message.c
index fefb92296e8f..c311f67b7f08 100644
--- a/drivers/usb/core/message.c
+++ b/drivers/usb/core/message.c
@@ -1206,7 +1206,10 @@ int usb_set_interface(struct usb_device *dev, int interface, int alternate)
                 return -EINVAL;
         }
 
-        ret = usb_control_msg(dev, usb_sndctrlpipe(dev, 0),
+        if (dev->quirks & USB_QUIRK_NO_SET_INTF)
+                ret = -EPIPE;
+        else
+                ret = usb_control_msg(dev, usb_sndctrlpipe(dev, 0),
                                    USB_REQ_SET_INTERFACE, USB_RECIP_INTERFACE,
                                    alternate, interface, NULL, 0, 5000);
 
diff --git a/drivers/usb/core/quirks.c b/drivers/usb/core/quirks.c
index d9d1eb19f2a1..dfc5418ea10c 100644
--- a/drivers/usb/core/quirks.c
+++ b/drivers/usb/core/quirks.c
@@ -50,6 +50,9 @@ static const struct usb_device_id usb_quirk_list[] = {
         /* M-Systems Flash Disk Pioneers */
         { USB_DEVICE(0x08ec, 0x1000), .driver_info = USB_QUIRK_RESET_RESUME },
 
+        /* X-Rite/Gretag-Macbeth Eye-One Pro display colorimeter */
+        { USB_DEVICE(0x0971, 0x2000), .driver_info = USB_QUIRK_NO_SET_INTF },
+
         /* Action Semiconductor flash disk */
         { USB_DEVICE(0x10d6, 0x2200), .driver_info =
                         USB_QUIRK_STRING_FETCH_255 },
diff --git a/drivers/usb/gadget/inode.c b/drivers/usb/gadget/inode.c
index 805602a687cb..0a6feafc8d28 100644
--- a/drivers/usb/gadget/inode.c
+++ b/drivers/usb/gadget/inode.c
@@ -1458,7 +1458,7 @@ gadgetfs_setup (struct usb_gadget *gadget, const struct usb_ctrlrequest *ctrl)
         /* currently one config, two speeds */
         case USB_REQ_SET_CONFIGURATION:
                 if (ctrl->bRequestType != 0)
-                        break;
+                        goto unrecognized;
                 if (0 == (u8) w_value) {
                         value = 0;
                         dev->current_config = 0;
@@ -1505,7 +1505,7 @@ gadgetfs_setup (struct usb_gadget *gadget, const struct usb_ctrlrequest *ctrl)
         /* PXA automagically handles this request too */
         case USB_REQ_GET_CONFIGURATION:
                 if (ctrl->bRequestType != 0x80)
-                        break;
+                        goto unrecognized;
                 *(u8 *)req->buf = dev->current_config;
                 value = min (w_length, (u16) 1);
                 break;
diff --git a/drivers/usb/host/ehci-pci.c b/drivers/usb/host/ehci-pci.c
index 3ba01664f821..72ccd56e36dd 100644
--- a/drivers/usb/host/ehci-pci.c
+++ b/drivers/usb/host/ehci-pci.c
@@ -152,6 +152,20 @@ static int ehci_pci_setup(struct usb_hcd *hcd)
                         break;
                 }
                 break;
+        case PCI_VENDOR_ID_VIA:
+                if (pdev->device == 0x3104 && (pdev->revision & 0xf0) == 0x60) {
+                        u8 tmp;
+
+                        /* The VT6212 defaults to a 1 usec EHCI sleep time which
+                         * hogs the PCI bus *badly*. Setting bit 5 of 0x4B makes
+                         * that sleep time use the conventional 10 usec.
+                         */
+                        pci_read_config_byte(pdev, 0x4b, &tmp);
+                        if (tmp & 0x20)
+                                break;
+                        pci_write_config_byte(pdev, 0x4b, tmp | 0x20);
+                }
+                break;
         }
 
         ehci_reset(ehci);
diff --git a/drivers/usb/serial/pl2303.c b/drivers/usb/serial/pl2303.c
index ae3ec1a64008..2af778555bdc 100644
--- a/drivers/usb/serial/pl2303.c
+++ b/drivers/usb/serial/pl2303.c
@@ -55,6 +55,7 @@ static struct usb_device_id id_table [] = {
         { USB_DEVICE(PL2303_VENDOR_ID, PL2303_PRODUCT_ID_DCU11) },
         { USB_DEVICE(PL2303_VENDOR_ID, PL2303_PRODUCT_ID_RSAQ3) },
         { USB_DEVICE(PL2303_VENDOR_ID, PL2303_PRODUCT_ID_PHAROS) },
+        { USB_DEVICE(PL2303_VENDOR_ID, PL2303_PRODUCT_ID_ALDIGA) },
         { USB_DEVICE(IODATA_VENDOR_ID, IODATA_PRODUCT_ID) },
         { USB_DEVICE(IODATA_VENDOR_ID, IODATA_PRODUCT_ID_RSAQ5) },
         { USB_DEVICE(ATEN_VENDOR_ID, ATEN_PRODUCT_ID) },
diff --git a/drivers/usb/serial/pl2303.h b/drivers/usb/serial/pl2303.h
index 237a41f6638a..10cf872e5ecb 100644
--- a/drivers/usb/serial/pl2303.h
+++ b/drivers/usb/serial/pl2303.h
@@ -13,6 +13,7 @@
 #define PL2303_PRODUCT_ID_DCU11         0x1234
 #define PL2303_PRODUCT_ID_PHAROS        0xaaa0
 #define PL2303_PRODUCT_ID_RSAQ3         0xaaa2
+#define PL2303_PRODUCT_ID_ALDIGA        0x0611
 
 #define ATEN_VENDOR_ID          0x0557
 #define ATEN_VENDOR_ID2         0x0547
diff --git a/drivers/usb/serial/sierra.c b/drivers/usb/serial/sierra.c
index e3d44ae8d448..ed678811e6a6 100644
--- a/drivers/usb/serial/sierra.c
+++ b/drivers/usb/serial/sierra.c
@@ -14,7 +14,7 @@
   Whom based his on the Keyspan driver by Hugh Blemings <hugh@blemings.org>
 */
 
-#define DRIVER_VERSION "v.1.2.7"
+#define DRIVER_VERSION "v.1.2.8"
 #define DRIVER_AUTHOR "Kevin Lloyd <linux@sierrawireless.com>"
 #define DRIVER_DESC "USB Driver for Sierra Wireless USB modems"
 
@@ -163,6 +163,7 @@ static struct usb_device_id id_table [] = {
         { USB_DEVICE(0x1199, 0x6803) }, /* Sierra Wireless MC8765 */
         { USB_DEVICE(0x1199, 0x6812) }, /* Sierra Wireless MC8775 & AC 875U */
         { USB_DEVICE(0x1199, 0x6813) }, /* Sierra Wireless MC8775 (Thinkpad internal) */
+        { USB_DEVICE(0x1199, 0x6815) }, /* Sierra Wireless MC8775 */
         { USB_DEVICE(0x1199, 0x6820) }, /* Sierra Wireless AirCard 875 */
         { USB_DEVICE(0x1199, 0x6832) }, /* Sierra Wireless MC8780*/
         { USB_DEVICE(0x1199, 0x6833) }, /* Sierra Wireless MC8781*/
@@ -196,9 +197,9 @@ struct sierra_port_private {
         spinlock_t lock;        /* lock the structure */
         int outstanding_urbs;   /* number of out urbs in flight */
 
-        /* Input endpoints and buffer for this port */
+        /* Input endpoints and buffers for this port */
         struct urb *in_urbs[N_IN_URB];
-        char in_buffer[N_IN_URB][IN_BUFLEN];
+        char *in_buffer[N_IN_URB];
 
         /* Settings for the port */
         int rts_state;  /* Handshaking pins (outputs) */
@@ -638,6 +639,15 @@ static int sierra_startup(struct usb_serial *serial)
                         return -ENOMEM;
                 }
                 spin_lock_init(&portdata->lock);
+                for (j = 0; j < N_IN_URB; j++) {
+                        portdata->in_buffer[j] = kmalloc(IN_BUFLEN, GFP_KERNEL);
+                        if (!portdata->in_buffer[j]) {
+                                for (--j; j >= 0; j--)
+                                        kfree(portdata->in_buffer[j]);
+                                kfree(portdata);
+                                return -ENOMEM;
+                        }
+                }
 
                 usb_set_serial_port_data(port, portdata);
 
@@ -681,7 +691,7 @@ static void sierra_shutdown(struct usb_serial *serial)
                 for (j = 0; j < N_IN_URB; j++) {
                         usb_kill_urb(portdata->in_urbs[j]);
                         usb_free_urb(portdata->in_urbs[j]);
-                        portdata->in_urbs[j] = NULL;
+                        kfree(portdata->in_buffer[j]);
                 }
                 kfree(portdata);
                 usb_set_serial_port_data(port, NULL);
diff --git a/drivers/usb/storage/isd200.c b/drivers/usb/storage/isd200.c
index 2ae1e8673b19..971d13dd5e65 100644
--- a/drivers/usb/storage/isd200.c
+++ b/drivers/usb/storage/isd200.c
@@ -1230,6 +1230,7 @@ static int isd200_get_inquiry_data( struct us_data *us )
             
                         /* Free driver structure */         
                         us->extra_destructor(info);
+                        kfree(info);
                         us->extra = NULL;
                         us->extra_destructor = NULL;
                 }
@@ -1469,6 +1470,7 @@ static void isd200_free_info_ptrs(void *info_)
         if (info) {
                 kfree(info->id);
                 kfree(info->RegsBuf);
+                kfree(info->srb.sense_buffer);
         }
 }
 
@@ -1494,7 +1496,9 @@ static int isd200_init_info(struct us_data *us)
                                 kzalloc(sizeof(struct hd_driveid), GFP_KERNEL);
                 info->RegsBuf = (unsigned char *)
                                 kmalloc(sizeof(info->ATARegs), GFP_KERNEL);
-                if (!info->id || !info->RegsBuf) {
+                info->srb.sense_buffer =
+                                kmalloc(SCSI_SENSE_BUFFERSIZE, GFP_KERNEL);
+                if (!info->id || !info->RegsBuf || !info->srb.sense_buffer) {
                         isd200_free_info_ptrs(info);
                         kfree(info);
                         retStatus = ISD200_ERROR;
diff --git a/drivers/usb/storage/transport.c b/drivers/usb/storage/transport.c
index 5780ed15f1ad..bdd4334bed5a 100644
--- a/drivers/usb/storage/transport.c
+++ b/drivers/usb/storage/transport.c
@@ -1009,7 +1009,8 @@ int usb_stor_Bulk_transport(struct scsi_cmnd *srb, struct us_data *us)
         US_DEBUGP("Bulk Status S 0x%x T 0x%x R %u Stat 0x%x\n",
                         le32_to_cpu(bcs->Signature), bcs->Tag, 
                         residue, bcs->Status);
-        if (bcs->Tag != us->tag || bcs->Status > US_BULK_STAT_PHASE) {
+        if (!(bcs->Tag == us->tag || (us->flags & US_FL_BULK_IGNORE_TAG)) ||
+                bcs->Status > US_BULK_STAT_PHASE) {
                 US_DEBUGP("Bulk logical error\n");
                 return USB_STOR_TRANSPORT_ERROR;
         }
diff --git a/drivers/usb/storage/unusual_devs.h b/drivers/usb/storage/unusual_devs.h
index 99679a8cfa02..e5219a56947c 100644
--- a/drivers/usb/storage/unusual_devs.h
+++ b/drivers/usb/storage/unusual_devs.h
@@ -1589,6 +1589,17 @@ UNUSUAL_DEV(  0x22b8, 0x4810, 0x0001, 0x0001,
                 US_SC_DEVICE, US_PR_DEVICE, NULL,
                 US_FL_FIX_CAPACITY),
 
+/*
+ * Patch by Constantin Baranov <const@tltsu.ru>
+ * Report by Andreas Koenecke.
+ * Motorola ROKR Z6.
+ */
+UNUSUAL_DEV(  0x22b8, 0x6426, 0x0101, 0x0101,
+                "Motorola",
+                "MSnc.",
+                US_SC_DEVICE, US_PR_DEVICE, NULL,
+                US_FL_FIX_INQUIRY | US_FL_FIX_CAPACITY | US_FL_BULK_IGNORE_TAG),
+
 /* Reported by Radovan Garabik <garabik@kassiopeia.juls.savba.sk> */
 UNUSUAL_DEV(  0x2735, 0x100b, 0x0000, 0x9999,
                 "MPIO",
diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig
index e0b0580705e4..1bd5fb30237d 100644
--- a/drivers/video/Kconfig
+++ b/drivers/video/Kconfig
@@ -1893,6 +1893,20 @@ config FB_XILINX
           framebuffer. ML300 carries a 640*480 LCD display on the board,
           ML403 uses a standard DB15 VGA connector.
 
+config FB_METRONOME
+       tristate "Metronome display controller support"
+       depends on FB && ARCH_PXA && MMU
+       select FB_SYS_FILLRECT
+       select FB_SYS_COPYAREA
+       select FB_SYS_IMAGEBLIT
+       select FB_SYS_FOPS
+       select FB_DEFERRED_IO
+       help
+         This enables support for the Metronome display controller. Tested
+         with an E-Ink 800x600 display and Gumstix Connex through an AMLCD
+         interface. Please read <file:Documentation/fb/metronomefb.txt>
+         for more information.
+
 config FB_VIRTUAL
         tristate "Virtual Frame Buffer support (ONLY FOR TESTING!)"
         depends on FB
diff --git a/drivers/video/Makefile b/drivers/video/Makefile
index 03371c789039..11c0e5e05f21 100644
--- a/drivers/video/Makefile
+++ b/drivers/video/Makefile
@@ -103,6 +103,7 @@ obj-$(CONFIG_FB_PMAG_AA)	  += pmag-aa-fb.o
 obj-$(CONFIG_FB_PMAG_BA)          += pmag-ba-fb.o
 obj-$(CONFIG_FB_PMAGB_B)          += pmagb-b-fb.o
 obj-$(CONFIG_FB_MAXINE)           += maxinefb.o
+obj-$(CONFIG_FB_METRONOME)        += metronomefb.o
 obj-$(CONFIG_FB_S1D13XXX)         += s1d13xxxfb.o
 obj-$(CONFIG_FB_IMX)              += imxfb.o
 obj-$(CONFIG_FB_S3C2410)          += s3c2410fb.o
diff --git a/drivers/video/bf54x-lq043fb.c b/drivers/video/bf54x-lq043fb.c
index 986a550c0439..eefba3d0e4b9 100644
--- a/drivers/video/bf54x-lq043fb.c
+++ b/drivers/video/bf54x-lq043fb.c
@@ -384,7 +384,7 @@ static int bfin_bf54x_fb_mmap(struct fb_info *info, struct vm_area_struct *vma)
          *   Other flags can be set, and are documented in
          *   include/linux/mm.h
          */
-        vma->vm_flags |= VM_MAYSHARE;
+        vma->vm_flags |=  VM_MAYSHARE | VM_SHARED;
 
         return 0;
 }
diff --git a/drivers/video/bfin-t350mcqb-fb.c b/drivers/video/bfin-t350mcqb-fb.c
index a2bb2de9e020..135d6dd7e672 100644
--- a/drivers/video/bfin-t350mcqb-fb.c
+++ b/drivers/video/bfin-t350mcqb-fb.c
@@ -91,6 +91,7 @@ struct bfin_t350mcqbfb_info {
         int lq043_open_cnt;
         int irq;
         spinlock_t lock;        /* lock */
+        u32 pseudo_pal[16];
 };
 
 static int nocursor;
@@ -182,13 +183,13 @@ static void bfin_t350mcqb_config_dma(struct bfin_t350mcqbfb_info *fbi)
 
 }
 
-static int bfin_t350mcqb_request_ports(int action)
-{
-        u16 ppi0_req_8[] = {P_PPI0_CLK, P_PPI0_FS1, P_PPI0_FS2,
+static  u16 ppi0_req_8[] = {P_PPI0_CLK, P_PPI0_FS1, P_PPI0_FS2,
                             P_PPI0_D0, P_PPI0_D1, P_PPI0_D2,
                             P_PPI0_D3, P_PPI0_D4, P_PPI0_D5,
                             P_PPI0_D6, P_PPI0_D7, 0};
 
+static int bfin_t350mcqb_request_ports(int action)
+{
         if (action) {
                 if (peripheral_request_list(ppi0_req_8, DRIVER_NAME)) {
                         printk(KERN_ERR "Requesting Peripherals faild\n");
@@ -301,7 +302,7 @@ static int bfin_t350mcqb_fb_mmap(struct fb_info *info, struct vm_area_struct *vm
          *   Other flags can be set, and are documented in
          *   include/linux/mm.h
          */
-        vma->vm_flags |= VM_MAYSHARE;
+        vma->vm_flags |= VM_MAYSHARE | VM_SHARED;
 
         return 0;
 }
@@ -520,16 +521,7 @@ static int __init bfin_t350mcqb_probe(struct platform_device *pdev)
 
         fbinfo->fbops = &bfin_t350mcqb_fb_ops;
 
-        fbinfo->pseudo_palette = kmalloc(sizeof(u32) * 16, GFP_KERNEL);
-        if (!fbinfo->pseudo_palette) {
-                printk(KERN_ERR DRIVER_NAME
-                       "Fail to allocate pseudo_palette\n");
-
-                ret = -ENOMEM;
-                goto out4;
-        }
-
-        memset(fbinfo->pseudo_palette, 0, sizeof(u32) * 16);
+        fbinfo->pseudo_palette = &info->pseudo_pal;
 
         if (fb_alloc_cmap(&fbinfo->cmap, BFIN_LCD_NBR_PALETTE_ENTRIES, 0)
             < 0) {
@@ -537,7 +529,7 @@ static int __init bfin_t350mcqb_probe(struct platform_device *pdev)
                        "Fail to allocate colormap (%d entries)\n",
                        BFIN_LCD_NBR_PALETTE_ENTRIES);
                 ret = -EFAULT;
-                goto out5;
+                goto out4;
         }
 
         if (bfin_t350mcqb_request_ports(1)) {
@@ -552,11 +544,11 @@ static int __init bfin_t350mcqb_probe(struct platform_device *pdev)
                 goto out7;
         }
 
-        if (request_irq(info->irq, (void *)bfin_t350mcqb_irq_error, IRQF_DISABLED,
-                        "PPI ERROR", info) < 0) {
+        ret = request_irq(info->irq, bfin_t350mcqb_irq_error, IRQF_DISABLED,
+                        "PPI ERROR", info);
+        if (ret < 0) {
                 printk(KERN_ERR DRIVER_NAME
                        ": unable to request PPI ERROR IRQ\n");
-                ret = -EFAULT;
                 goto out7;
         }
 
@@ -584,8 +576,6 @@ out7:
         bfin_t350mcqb_request_ports(0);
 out6:
         fb_dealloc_cmap(&fbinfo->cmap);
-out5:
-        kfree(fbinfo->pseudo_palette);
 out4:
         dma_free_coherent(NULL, fbinfo->fix.smem_len, info->fb_buffer,
                           info->dma_handle);
@@ -605,6 +595,8 @@ static int bfin_t350mcqb_remove(struct platform_device *pdev)
         struct fb_info *fbinfo = platform_get_drvdata(pdev);
         struct bfin_t350mcqbfb_info *info = fbinfo->par;
 
+        unregister_framebuffer(fbinfo);
+
         free_dma(CH_PPI);
         free_irq(info->irq, info);
 
@@ -612,7 +604,6 @@ static int bfin_t350mcqb_remove(struct platform_device *pdev)
                 dma_free_coherent(NULL, fbinfo->fix.smem_len, info->fb_buffer,
                                   info->dma_handle);
 
-        kfree(fbinfo->pseudo_palette);
         fb_dealloc_cmap(&fbinfo->cmap);
 
 #ifndef NO_BL_SUPPORT
@@ -620,10 +611,11 @@ static int bfin_t350mcqb_remove(struct platform_device *pdev)
         backlight_device_unregister(bl_dev);
 #endif
 
-        unregister_framebuffer(fbinfo);
-
         bfin_t350mcqb_request_ports(0);
 
+        platform_set_drvdata(pdev, NULL);
+        framebuffer_release(fbinfo);
+
         printk(KERN_INFO DRIVER_NAME ": Unregister LCD driver.\n");
 
         return 0;
diff --git a/drivers/video/fb_defio.c b/drivers/video/fb_defio.c
index 0f8cfb988c90..24843fdd5395 100644
--- a/drivers/video/fb_defio.c
+++ b/drivers/video/fb_defio.c
@@ -4,7 +4,7 @@
  *  Copyright (C) 2006 Jaya Kumar
  *
  * This file is subject to the terms and conditions of the GNU General Public
- * License.  See the file COPYING in the main directory of this archive
+ * License. See the file COPYING in the main directory of this archive
  * for more details.
  */
 
@@ -31,7 +31,7 @@ static int fb_deferred_io_fault(struct vm_area_struct *vma,
         unsigned long offset;
         struct page *page;
         struct fb_info *info = vma->vm_private_data;
-        /* info->screen_base is in System RAM */
+        /* info->screen_base is virtual memory */
         void *screen_base = (void __force *) info->screen_base;
 
         offset = vmf->pgoff << PAGE_SHIFT;
@@ -43,6 +43,15 @@ static int fb_deferred_io_fault(struct vm_area_struct *vma,
                 return VM_FAULT_SIGBUS;
 
         get_page(page);
+
+        if (vma->vm_file)
+                page->mapping = vma->vm_file->f_mapping;
+        else
+                printk(KERN_ERR "no mapping available\n");
+
+        BUG_ON(!page->mapping);
+        page->index = vmf->pgoff;
+
         vmf->page = page;
         return 0;
 }
@@ -138,11 +147,20 @@ EXPORT_SYMBOL_GPL(fb_deferred_io_init);
 
 void fb_deferred_io_cleanup(struct fb_info *info)
 {
+        void *screen_base = (void __force *) info->screen_base;
         struct fb_deferred_io *fbdefio = info->fbdefio;
+        struct page *page;
+        int i;
 
         BUG_ON(!fbdefio);
         cancel_delayed_work(&info->deferred_work);
         flush_scheduled_work();
+
+        /* clear out the mapping that we setup */
+        for (i = 0 ; i < info->fix.smem_len; i += PAGE_SIZE) {
+                page = vmalloc_to_page(screen_base + i);
+                page->mapping = NULL;
+        }
 }
 EXPORT_SYMBOL_GPL(fb_deferred_io_cleanup);
 
diff --git a/drivers/video/i810/i810_main.c b/drivers/video/i810/i810_main.c
index 1d13dd099af8..a24e680d2b9c 100644
--- a/drivers/video/i810/i810_main.c
+++ b/drivers/video/i810/i810_main.c
@@ -1476,7 +1476,7 @@ static int i810fb_cursor(struct fb_info *info, struct fb_cursor *cursor)
         struct i810fb_par *par = info->par;
         u8 __iomem *mmio = par->mmio_start_virtual;
 
-        if (!(par->dev_flags & LOCKUP))
+        if (par->dev_flags & LOCKUP)
                 return -ENXIO;
 
         if (cursor->image.width > 64 || cursor->image.height > 64)
diff --git a/drivers/video/metronomefb.c b/drivers/video/metronomefb.c
new file mode 100644
index 000000000000..e9a89fd82757
--- /dev/null
+++ b/drivers/video/metronomefb.c
@@ -0,0 +1,999 @@
+/*
+ * linux/drivers/video/metronomefb.c -- FB driver for Metronome controller
+ *
+ * Copyright (C) 2008, Jaya Kumar
+ *
+ * This file is subject to the terms and conditions of the GNU General Public
+ * License. See the file COPYING in the main directory of this archive for
+ * more details.
+ *
+ * Layout is based on skeletonfb.c by James Simmons and Geert Uytterhoeven.
+ *
+ * This work was made possible by help and equipment support from E-Ink
+ * Corporation. http://support.eink.com/community
+ *
+ * This driver is written to be used with the Metronome display controller.
+ * It was tested with an E-Ink 800x600 Vizplex EPD on a Gumstix Connex board
+ * using the Lyre interface board.
+ *
+ * General notes:
+ * - User must set metronomefb_enable=1 to enable it.
+ * - See Documentation/fb/metronomefb.txt for how metronome works.
+ */
+#include <linux/module.h>
+#include <linux/kernel.h>
+#include <linux/errno.h>
+#include <linux/string.h>
+#include <linux/mm.h>
+#include <linux/slab.h>
+#include <linux/vmalloc.h>
+#include <linux/delay.h>
+#include <linux/interrupt.h>
+#include <linux/fb.h>
+#include <linux/init.h>
+#include <linux/platform_device.h>
+#include <linux/list.h>
+#include <linux/firmware.h>
+#include <linux/dma-mapping.h>
+#include <linux/uaccess.h>
+#include <linux/irq.h>
+
+#include <asm/arch/pxa-regs.h>
+#include <asm/unaligned.h>
+
+#define DEBUG 1
+#ifdef DEBUG
+#define DPRINTK(f, a...) printk(KERN_DEBUG "%s: " f, __func__ , ## a)
+#else
+#define DPRINTK(f, a...)
+#endif
+
+
+/* Display specific information */
+#define DPY_W 832
+#define DPY_H 622
+
+struct metromem_desc {
+        u32 mFDADR0;
+        u32 mFSADR0;
+        u32 mFIDR0;
+        u32 mLDCMD0;
+};
+
+struct metromem_cmd {
+        u16 opcode;
+        u16 args[((64-2)/2)];
+        u16 csum;
+};
+
+struct metronomefb_par {
+        unsigned char *metromem;
+        struct metromem_desc *metromem_desc;
+        struct metromem_cmd *metromem_cmd;
+        unsigned char *metromem_wfm;
+        unsigned char *metromem_img;
+        u16 *metromem_img_csum;
+        u16 *csum_table;
+        int metromemsize;
+        dma_addr_t metromem_dma;
+        dma_addr_t metromem_desc_dma;
+        struct fb_info *info;
+        wait_queue_head_t waitq;
+        u8 frame_count;
+};
+
+/* frame differs from image. frame includes non-visible pixels */
+struct epd_frame {
+        int fw; /* frame width */
+        int fh; /* frame height */
+};
+
+static struct epd_frame epd_frame_table[] = {
+        {
+        .fw = 832,
+        .fh = 622
+        },
+};
+
+static struct fb_fix_screeninfo metronomefb_fix __devinitdata = {
+        .id =           "metronomefb",
+        .type =         FB_TYPE_PACKED_PIXELS,
+        .visual =       FB_VISUAL_STATIC_PSEUDOCOLOR,
+        .xpanstep =     0,
+        .ypanstep =     0,
+        .ywrapstep =    0,
+        .line_length =  DPY_W,
+        .accel =        FB_ACCEL_NONE,
+};
+
+static struct fb_var_screeninfo metronomefb_var __devinitdata = {
+        .xres           = DPY_W,
+        .yres           = DPY_H,
+        .xres_virtual   = DPY_W,
+        .yres_virtual   = DPY_H,
+        .bits_per_pixel = 8,
+        .grayscale      = 1,
+        .nonstd         = 1,
+        .red =          { 4, 3, 0 },
+        .green =        { 0, 0, 0 },
+        .blue =         { 0, 0, 0 },
+        .transp =       { 0, 0, 0 },
+};
+
+static unsigned int metronomefb_enable;
+
+struct waveform_hdr {
+        u8 stuff[32];
+
+        u8 wmta[3];
+        u8 fvsn;
+
+        u8 luts;
+        u8 mc;
+        u8 trc;
+        u8 stuff3;
+
+        u8 endb;
+        u8 swtb;
+        u8 stuff2a[2];
+
+        u8 stuff2b[3];
+        u8 wfm_cs;
+} __attribute__ ((packed));
+
+/* main metronomefb functions */
+static u8 calc_cksum(int start, int end, u8 *mem)
+{
+        u8 tmp = 0;
+        int i;
+
+        for (i = start; i < end; i++)
+                tmp += mem[i];
+
+        return tmp;
+}
+
+static u16 calc_img_cksum(u16 *start, int length)
+{
+        u16 tmp = 0;
+
+        while (length--)
+                tmp += *start++;
+
+        return tmp;
+}
+
+/* here we decode the incoming waveform file and populate metromem */
+#define EXP_WFORM_SIZE 47001
+static int load_waveform(u8 *mem, size_t size, u8 *metromem, int m, int t,
+                                u8 *frame_count)
+{
+        int tta;
+        int wmta;
+        int trn = 0;
+        int i;
+        unsigned char v;
+        u8 cksum;
+        int cksum_idx;
+        int wfm_idx, owfm_idx;
+        int mem_idx = 0;
+        struct waveform_hdr *wfm_hdr;
+
+        if (size != EXP_WFORM_SIZE) {
+                printk(KERN_ERR "Error: unexpected size %d != %d\n", size,
+                                        EXP_WFORM_SIZE);
+                return -EINVAL;
+        }
+
+        wfm_hdr = (struct waveform_hdr *) mem;
+
+        if (wfm_hdr->fvsn != 1) {
+                printk(KERN_ERR "Error: bad fvsn %x\n", wfm_hdr->fvsn);
+                return -EINVAL;
+        }
+        if (wfm_hdr->luts != 0) {
+                printk(KERN_ERR "Error: bad luts %x\n", wfm_hdr->luts);
+                return -EINVAL;
+        }
+        cksum = calc_cksum(32, 47, mem);
+        if (cksum != wfm_hdr->wfm_cs) {
+                printk(KERN_ERR "Error: bad cksum %x != %x\n", cksum,
+                                        wfm_hdr->wfm_cs);
+                return -EINVAL;
+        }
+        wfm_hdr->mc += 1;
+        wfm_hdr->trc += 1;
+        for (i = 0; i < 5; i++) {
+                if (*(wfm_hdr->stuff2a + i) != 0) {
+                        printk(KERN_ERR "Error: unexpected value in padding\n");
+                        return -EINVAL;
+                }
+        }
+
+        /* calculating trn. trn is something used to index into
+        the waveform. presumably selecting the right one for the
+        desired temperature. it works out the offset of the first
+        v that exceeds the specified temperature */
+        if ((sizeof(*wfm_hdr) + wfm_hdr->trc) > size)
+                return -EINVAL;
+
+        for (i = sizeof(*wfm_hdr); i <= sizeof(*wfm_hdr) + wfm_hdr->trc; i++) {
+                if (mem[i] > t) {
+                        trn = i - sizeof(*wfm_hdr) - 1;
+                        break;
+                }
+        }
+
+        /* check temperature range table checksum */
+        cksum_idx = sizeof(*wfm_hdr) + wfm_hdr->trc + 1;
+        if (cksum_idx > size)
+                return -EINVAL;
+        cksum = calc_cksum(sizeof(*wfm_hdr), cksum_idx, mem);
+        if (cksum != mem[cksum_idx]) {
+                printk(KERN_ERR "Error: bad temperature range table cksum"
+                                " %x != %x\n", cksum, mem[cksum_idx]);
+                return -EINVAL;
+        }
+
+        /* check waveform mode table address checksum */
+        wmta = le32_to_cpu(get_unaligned((__le32 *) wfm_hdr->wmta));
+        wmta &= 0x00FFFFFF;
+        cksum_idx = wmta + m*4 + 3;
+        if (cksum_idx > size)
+                return -EINVAL;
+        cksum = calc_cksum(cksum_idx - 3, cksum_idx, mem);
+        if (cksum != mem[cksum_idx]) {
+                printk(KERN_ERR "Error: bad mode table address cksum"
+                                " %x != %x\n", cksum, mem[cksum_idx]);
+                return -EINVAL;
+        }
+
+        /* check waveform temperature table address checksum */
+        tta = le32_to_cpu(get_unaligned((int *) (mem + wmta + m*4)));
+        tta &= 0x00FFFFFF;
+        cksum_idx = tta + trn*4 + 3;
+        if (cksum_idx > size)
+                return -EINVAL;
+        cksum = calc_cksum(cksum_idx - 3, cksum_idx, mem);
+        if (cksum != mem[cksum_idx]) {
+                printk(KERN_ERR "Error: bad temperature table address cksum"
+                        " %x != %x\n", cksum, mem[cksum_idx]);
+                return -EINVAL;
+        }
+
+        /* here we do the real work of putting the waveform into the
+        metromem buffer. this does runlength decoding of the waveform */
+        wfm_idx = le32_to_cpu(get_unaligned((__le32 *) (mem + tta + trn*4)));
+        wfm_idx &= 0x00FFFFFF;
+        owfm_idx = wfm_idx;
+        if (wfm_idx > size)
+                return -EINVAL;
+        while (wfm_idx < size) {
+                unsigned char rl;
+                v = mem[wfm_idx++];
+                if (v == wfm_hdr->swtb) {
+                        while (((v = mem[wfm_idx++]) != wfm_hdr->swtb) &&
+                                wfm_idx < size)
+                                metromem[mem_idx++] = v;
+
+                        continue;
+                }
+
+                if (v == wfm_hdr->endb)
+                        break;
+
+                rl = mem[wfm_idx++];
+                for (i = 0; i <= rl; i++)
+                        metromem[mem_idx++] = v;
+        }
+
+        cksum_idx = wfm_idx;
+        if (cksum_idx > size)
+                return -EINVAL;
+        cksum = calc_cksum(owfm_idx, cksum_idx, mem);
+        if (cksum != mem[cksum_idx]) {
+                printk(KERN_ERR "Error: bad waveform data cksum"
+                                " %x != %x\n", cksum, mem[cksum_idx]);
+                return -EINVAL;
+        }
+        *frame_count = (mem_idx/64);
+
+        return 0;
+}
+
+/* register offsets for gpio control */
+#define LED_GPIO_PIN 51
+#define STDBY_GPIO_PIN 48
+#define RST_GPIO_PIN 49
+#define RDY_GPIO_PIN 32
+#define ERR_GPIO_PIN 17
+#define PCBPWR_GPIO_PIN 16
+
+#define AF_SEL_GPIO_N 0x3
+#define GAFR0_U_OFFSET(pin) ((pin - 16) * 2)
+#define GAFR1_L_OFFSET(pin) ((pin - 32) * 2)
+#define GAFR1_U_OFFSET(pin) ((pin - 48) * 2)
+#define GPDR1_OFFSET(pin) (pin - 32)
+#define GPCR1_OFFSET(pin) (pin - 32)
+#define GPSR1_OFFSET(pin) (pin - 32)
+#define GPCR0_OFFSET(pin) (pin)
+#define GPSR0_OFFSET(pin) (pin)
+
+static void metronome_set_gpio_output(int pin, int val)
+{
+        u8 index;
+
+        index = pin >> 4;
+
+        switch (index) {
+        case 1:
+                if (val)
+                        GPSR0 |= (1 << GPSR0_OFFSET(pin));
+                else
+                        GPCR0 |= (1 << GPCR0_OFFSET(pin));
+                break;
+        case 2:
+                break;
+        case 3:
+                if (val)
+                        GPSR1 |= (1 << GPSR1_OFFSET(pin));
+                else
+                        GPCR1 |= (1 << GPCR1_OFFSET(pin));
+                break;
+        default:
+                printk(KERN_ERR "unimplemented\n");
+        }
+}
+
+static void __devinit metronome_init_gpio_pin(int pin, int dir)
+{
+        u8 index;
+        /* dir 0 is output, 1 is input
+        - do 2 things here:
+        - set gpio alternate function to standard gpio
+        - set gpio direction to input or output  */
+
+        index = pin >> 4;
+        switch (index) {
+        case 1:
+                GAFR0_U &= ~(AF_SEL_GPIO_N << GAFR0_U_OFFSET(pin));
+
+                if (dir)
+                        GPDR0 &= ~(1 << pin);
+                else
+                        GPDR0 |= (1 << pin);
+                break;
+        case 2:
+                GAFR1_L &= ~(AF_SEL_GPIO_N << GAFR1_L_OFFSET(pin));
+
+                if (dir)
+                        GPDR1 &= ~(1 << GPDR1_OFFSET(pin));
+                else
+                        GPDR1 |= (1 << GPDR1_OFFSET(pin));
+                break;
+        case 3:
+                GAFR1_U &= ~(AF_SEL_GPIO_N << GAFR1_U_OFFSET(pin));
+
+                if (dir)
+                        GPDR1 &= ~(1 << GPDR1_OFFSET(pin));
+                else
+                        GPDR1 |= (1 << GPDR1_OFFSET(pin));
+                break;
+        default:
+                printk(KERN_ERR "unimplemented\n");
+        }
+}
+
+static void __devinit metronome_init_gpio_regs(void)
+{
+        metronome_init_gpio_pin(LED_GPIO_PIN, 0);
+        metronome_set_gpio_output(LED_GPIO_PIN, 0);
+
+        metronome_init_gpio_pin(STDBY_GPIO_PIN, 0);
+        metronome_set_gpio_output(STDBY_GPIO_PIN, 0);
+
+        metronome_init_gpio_pin(RST_GPIO_PIN, 0);
+        metronome_set_gpio_output(RST_GPIO_PIN, 0);
+
+        metronome_init_gpio_pin(RDY_GPIO_PIN, 1);
+
+        metronome_init_gpio_pin(ERR_GPIO_PIN, 1);
+
+        metronome_init_gpio_pin(PCBPWR_GPIO_PIN, 0);
+        metronome_set_gpio_output(PCBPWR_GPIO_PIN, 0);
+}
+
+static void metronome_disable_lcd_controller(struct metronomefb_par *par)
+{
+        LCSR = 0xffffffff;      /* Clear LCD Status Register */
+        LCCR0 |= LCCR0_DIS;     /* Disable LCD Controller */
+
+        /* we reset and just wait for things to settle */
+        msleep(200);
+}
+
+static void metronome_enable_lcd_controller(struct metronomefb_par *par)
+{
+        LCSR = 0xffffffff;
+        FDADR0 = par->metromem_desc_dma;
+        LCCR0 |= LCCR0_ENB;
+}
+
+static void __devinit metronome_init_lcdc_regs(struct metronomefb_par *par)
+{
+        /* here we do:
+        - disable the lcd controller
+        - setup lcd control registers
+        - setup dma descriptor
+        - reenable lcd controller
+        */
+
+        /* disable the lcd controller */
+        metronome_disable_lcd_controller(par);
+
+        /* setup lcd control registers */
+        LCCR0 = LCCR0_LDM | LCCR0_SFM | LCCR0_IUM | LCCR0_EFM | LCCR0_PAS
+                | LCCR0_QDM | LCCR0_BM | LCCR0_OUM;
+
+        LCCR1 = (epd_frame_table[0].fw/2 - 1) /* pixels per line */
+                | (27 << 10) /* hsync pulse width - 1 */
+                | (33 << 16) /* eol pixel count */
+                | (33 << 24); /* bol pixel count */
+
+        LCCR2 = (epd_frame_table[0].fh - 1) /* lines per panel */
+                | (24 << 10) /* vsync pulse width - 1 */
+                | (2 << 16) /* eof pixel count */
+                | (0 << 24); /* bof pixel count */
+
+        LCCR3 = 2 /* pixel clock divisor */
+                | (24 << 8) /* AC Bias pin freq */
+                | LCCR3_16BPP /* BPP */
+                | LCCR3_PCP;  /* PCP falling edge */
+
+        /* setup dma descriptor */
+        par->metromem_desc->mFDADR0 = par->metromem_desc_dma;
+        par->metromem_desc->mFSADR0 = par->metromem_dma;
+        par->metromem_desc->mFIDR0 = 0;
+        par->metromem_desc->mLDCMD0 = epd_frame_table[0].fw
+                                        * epd_frame_table[0].fh;
+        /* reenable lcd controller */
+        metronome_enable_lcd_controller(par);
+}
+
+static int metronome_display_cmd(struct metronomefb_par *par)
+{
+        int i;
+        u16 cs;
+        u16 opcode;
+        static u8 borderval;
+        u8 *ptr;
+
+        /* setup display command
+        we can't immediately set the opcode since the controller
+        will try parse the command before we've set it all up
+        so we just set cs here and set the opcode at the end */
+
+        ptr = par->metromem;
+
+        if (par->metromem_cmd->opcode == 0xCC40)
+                opcode = cs = 0xCC41;
+        else
+                opcode = cs = 0xCC40;
+
+        /* set the args ( 2 bytes ) for display */
+        i = 0;
+        par->metromem_cmd->args[i] =    1 << 3 /* border update */
+                                        | ((borderval++ % 4) & 0x0F) << 4
+                                        | (par->frame_count - 1) << 8;
+        cs += par->metromem_cmd->args[i++];
+
+        /* the rest are 0 */
+        memset((u8 *) (par->metromem_cmd->args + i), 0, (32-i)*2);
+
+        par->metromem_cmd->csum = cs;
+        par->metromem_cmd->opcode = opcode; /* display cmd */
+
+        i = wait_event_interruptible_timeout(par->waitq, (GPLR1 & 0x01), HZ);
+        return i;
+}
+
+static int __devinit metronome_powerup_cmd(struct metronomefb_par *par)
+{
+        int i;
+        u16 cs;
+
+        /* setup power up command */
+        par->metromem_cmd->opcode = 0x1234; /* pwr up pseudo cmd */
+        cs = par->metromem_cmd->opcode;
+
+        /* set pwr1,2,3 to 1024 */
+        for (i = 0; i < 3; i++) {
+                par->metromem_cmd->args[i] = 1024;
+                cs += par->metromem_cmd->args[i];
+        }
+
+        /* the rest are 0 */
+        memset((u8 *) (par->metromem_cmd->args + i), 0, (32-i)*2);
+
+        par->metromem_cmd->csum = cs;
+
+        msleep(1);
+        metronome_set_gpio_output(RST_GPIO_PIN, 1);
+
+        msleep(1);
+        metronome_set_gpio_output(STDBY_GPIO_PIN, 1);
+
+        i = wait_event_timeout(par->waitq, (GPLR1 & 0x01), HZ);
+        return i;
+}
+
+static int __devinit metronome_config_cmd(struct metronomefb_par *par)
+{
+        int i;
+        u16 cs;
+
+        /* setup config command
+        we can't immediately set the opcode since the controller
+        will try parse the command before we've set it all up
+        so we just set cs here and set the opcode at the end */
+
+        cs = 0xCC10;
+
+        /* set the 12 args ( 8 bytes ) for config. see spec for meanings */
+        i = 0;
+        par->metromem_cmd->args[i] =    15 /* sdlew */
+                                        | 2 << 8 /* sdosz */
+                                        | 0 << 11 /* sdor */
+                                        | 0 << 12 /* sdces */
+                                        | 0 << 15; /* sdcer */
+        cs += par->metromem_cmd->args[i++];
+
+        par->metromem_cmd->args[i] =    42 /* gdspl */
+                                        | 1 << 8 /* gdr1 */
+                                        | 1 << 9 /* sdshr */
+                                        | 0 << 15; /* gdspp */
+        cs += par->metromem_cmd->args[i++];
+
+        par->metromem_cmd->args[i] =    18 /* gdspw */
+                                        | 0 << 15; /* dispc */
+        cs += par->metromem_cmd->args[i++];
+
+        par->metromem_cmd->args[i] =    599 /* vdlc */
+                                        | 0 << 11 /* dsi */
+                                        | 0 << 12; /* dsic */
+        cs += par->metromem_cmd->args[i++];
+
+        /* the rest are 0 */
+        memset((u8 *) (par->metromem_cmd->args + i), 0, (32-i)*2);
+
+        par->metromem_cmd->csum = cs;
+        par->metromem_cmd->opcode = 0xCC10; /* config cmd */
+
+        i = wait_event_timeout(par->waitq, (GPLR1 & 0x01), HZ);
+        return i;
+}
+
+static int __devinit metronome_init_cmd(struct metronomefb_par *par)
+{
+        int i;
+        u16 cs;
+
+        /* setup init command
+        we can't immediately set the opcode since the controller
+        will try parse the command before we've set it all up
+        so we just set cs here and set the opcode at the end */
+
+        cs = 0xCC20;
+
+        /* set the args ( 2 bytes ) for init */
+        i = 0;
+        par->metromem_cmd->args[i] = 0;
+        cs += par->metromem_cmd->args[i++];
+
+        /* the rest are 0 */
+        memset((u8 *) (par->metromem_cmd->args + i), 0, (32-i)*2);
+
+        par->metromem_cmd->csum = cs;
+        par->metromem_cmd->opcode = 0xCC20; /* init cmd */
+
+        i = wait_event_timeout(par->waitq, (GPLR1 & 0x01), HZ);
+        return i;
+}
+
+static int __devinit metronome_init_regs(struct metronomefb_par *par)
+{
+        int res;
+
+        metronome_init_gpio_regs();
+        metronome_init_lcdc_regs(par);
+
+        res = metronome_powerup_cmd(par);
+        if (res)
+                return res;
+
+        res = metronome_config_cmd(par);
+        if (res)
+                return res;
+
+        res = metronome_init_cmd(par);
+        if (res)
+                return res;
+
+        return res;
+}
+
+static void metronomefb_dpy_update(struct metronomefb_par *par)
+{
+        u16 cksum;
+        unsigned char *buf = (unsigned char __force *)par->info->screen_base;
+
+        /* copy from vm to metromem */
+        memcpy(par->metromem_img, buf, DPY_W*DPY_H);
+
+        cksum = calc_img_cksum((u16 *) par->metromem_img,
+                                (epd_frame_table[0].fw * DPY_H)/2);
+        *((u16 *) (par->metromem_img) +
+                        (epd_frame_table[0].fw * DPY_H)/2) = cksum;
+        metronome_display_cmd(par);
+}
+
+static u16 metronomefb_dpy_update_page(struct metronomefb_par *par, int index)
+{
+        int i;
+        u16 csum = 0;
+        u16 *buf = (u16 __force *) (par->info->screen_base + index);
+        u16 *img = (u16 *) (par->metromem_img + index);
+
+        /* swizzle from vm to metromem and recalc cksum at the same time*/
+        for (i = 0; i < PAGE_SIZE/2; i++) {
+                *(img + i) = (buf[i] << 5) & 0xE0E0;
+                csum += *(img + i);
+        }
+        return csum;
+}
+
+/* this is called back from the deferred io workqueue */
+static void metronomefb_dpy_deferred_io(struct fb_info *info,
+                                struct list_head *pagelist)
+{
+        u16 cksum;
+        struct page *cur;
+        struct fb_deferred_io *fbdefio = info->fbdefio;
+        struct metronomefb_par *par = info->par;
+
+        /* walk the written page list and swizzle the data */
+        list_for_each_entry(cur, &fbdefio->pagelist, lru) {
+                cksum = metronomefb_dpy_update_page(par,
+                                        (cur->index << PAGE_SHIFT));
+                par->metromem_img_csum -= par->csum_table[cur->index];
+                par->csum_table[cur->index] = cksum;
+                par->metromem_img_csum += cksum;
+        }
+
+        metronome_display_cmd(par);
+}
+
+static void metronomefb_fillrect(struct fb_info *info,
+                                   const struct fb_fillrect *rect)
+{
+        struct metronomefb_par *par = info->par;
+
+        cfb_fillrect(info, rect);
+        metronomefb_dpy_update(par);
+}
+
+static void metronomefb_copyarea(struct fb_info *info,
+                                   const struct fb_copyarea *area)
+{
+        struct metronomefb_par *par = info->par;
+
+        cfb_copyarea(info, area);
+        metronomefb_dpy_update(par);
+}
+
+static void metronomefb_imageblit(struct fb_info *info,
+                                const struct fb_image *image)
+{
+        struct metronomefb_par *par = info->par;
+
+        cfb_imageblit(info, image);
+        metronomefb_dpy_update(par);
+}
+
+/*
+ * this is the slow path from userspace. they can seek and write to
+ * the fb. it is based on fb_sys_write
+ */
+static ssize_t metronomefb_write(struct fb_info *info, const char __user *buf,
+                                size_t count, loff_t *ppos)
+{
+        struct metronomefb_par *par = info->par;
+        unsigned long p = *ppos;
+        void *dst;
+        int err = 0;
+        unsigned long total_size;
+
+        if (info->state != FBINFO_STATE_RUNNING)
+                return -EPERM;
+
+        total_size = info->fix.smem_len;
+
+        if (p > total_size)
+                return -EFBIG;
+
+        if (count > total_size) {
+                err = -EFBIG;
+                count = total_size;
+        }
+
+        if (count + p > total_size) {
+                if (!err)
+                        err = -ENOSPC;
+
+                count = total_size - p;
+        }
+
+        dst = (void __force *) (info->screen_base + p);
+
+        if (copy_from_user(dst, buf, count))
+                err = -EFAULT;
+
+        if  (!err)
+                *ppos += count;
+
+        metronomefb_dpy_update(par);
+
+        return (err) ? err : count;
+}
+
+static struct fb_ops metronomefb_ops = {
+        .owner          = THIS_MODULE,
+        .fb_write       = metronomefb_write,
+        .fb_fillrect    = metronomefb_fillrect,
+        .fb_copyarea    = metronomefb_copyarea,
+        .fb_imageblit   = metronomefb_imageblit,
+};
+
+static struct fb_deferred_io metronomefb_defio = {
+        .delay          = HZ,
+        .deferred_io    = metronomefb_dpy_deferred_io,
+};
+
+static irqreturn_t metronome_handle_irq(int irq, void *dev_id)
+{
+        struct fb_info *info = dev_id;
+        struct metronomefb_par *par = info->par;
+
+        wake_up_interruptible(&par->waitq);
+        return IRQ_HANDLED;
+}
+
+static int __devinit metronomefb_probe(struct platform_device *dev)
+{
+        struct fb_info *info;
+        int retval = -ENOMEM;
+        int videomemorysize;
+        unsigned char *videomemory;
+        struct metronomefb_par *par;
+        const struct firmware *fw_entry;
+        int cmd_size, wfm_size, img_size, padding_size, totalsize;
+        int i;
+
+        /* we have two blocks of memory.
+        info->screen_base which is vm, and is the fb used by apps.
+        par->metromem which is physically contiguous memory and
+        contains the display controller commands, waveform,
+        processed image data and padding. this is the data pulled
+        by the pxa255's LCD controller and pushed to Metronome */
+
+        videomemorysize = (DPY_W*DPY_H);
+        videomemory = vmalloc(videomemorysize);
+        if (!videomemory)
+                return retval;
+
+        memset(videomemory, 0, videomemorysize);
+
+        info = framebuffer_alloc(sizeof(struct metronomefb_par), &dev->dev);
+        if (!info)
+                goto err_vfree;
+
+        info->screen_base = (char __iomem *) videomemory;
+        info->fbops = &metronomefb_ops;
+
+        info->var = metronomefb_var;
+        info->fix = metronomefb_fix;
+        info->fix.smem_len = videomemorysize;
+        par = info->par;
+        par->info = info;
+        init_waitqueue_head(&par->waitq);
+
+        /* this table caches per page csum values. */
+        par->csum_table = vmalloc(videomemorysize/PAGE_SIZE);
+        if (!par->csum_table)
+                goto err_csum_table;
+
+        /* the metromem buffer is divided as follows:
+        command | CRC | padding
+        16kb waveform data | CRC | padding
+        image data | CRC
+        and an extra 256 bytes for dma descriptors
+        eg: IW=832 IH=622 WS=128
+        */
+
+        cmd_size = 1 * epd_frame_table[0].fw;
+        wfm_size = ((16*1024 + 2 + epd_frame_table[0].fw - 1)
+                        / epd_frame_table[0].fw) * epd_frame_table[0].fw;
+        img_size = epd_frame_table[0].fh * epd_frame_table[0].fw;
+        padding_size = 4 * epd_frame_table[0].fw;
+        totalsize = cmd_size + wfm_size + img_size + padding_size;
+        par->metromemsize = PAGE_ALIGN(totalsize + 256);
+        DPRINTK("desired memory size = %d\n", par->metromemsize);
+        dev->dev.coherent_dma_mask = 0xffffffffull;
+        par->metromem = dma_alloc_writecombine(&dev->dev, par->metromemsize,
+                                                &par->metromem_dma, GFP_KERNEL);
+        if (!par->metromem) {
+                printk(KERN_ERR
+                        "metronomefb: unable to allocate dma buffer\n");
+                goto err_vfree;
+        }
+
+        info->fix.smem_start = par->metromem_dma;
+        par->metromem_cmd = (struct metromem_cmd *) par->metromem;
+        par->metromem_wfm = par->metromem + cmd_size;
+        par->metromem_img = par->metromem + cmd_size + wfm_size;
+        par->metromem_img_csum = (u16 *) (par->metromem_img +
+                                        (epd_frame_table[0].fw * DPY_H));
+        DPRINTK("img offset=0x%x\n", cmd_size + wfm_size);
+        par->metromem_desc = (struct metromem_desc *) (par->metromem + cmd_size
+                                        + wfm_size + img_size + padding_size);
+        par->metromem_desc_dma = par->metromem_dma + cmd_size + wfm_size
+                                 + img_size + padding_size;
+
+        /* load the waveform in. assume mode 3, temp 31 for now */
+        /*      a) request the waveform file from userspace
+                b) process waveform and decode into metromem */
+
+        retval = request_firmware(&fw_entry, "waveform.wbf", &dev->dev);
+        if (retval < 0) {
+                printk(KERN_ERR "metronomefb: couldn't get waveform\n");
+                goto err_dma_free;
+        }
+
+        retval = load_waveform((u8 *) fw_entry->data, fw_entry->size,
+                                par->metromem_wfm, 3, 31, &par->frame_count);
+        if (retval < 0) {
+                printk(KERN_ERR "metronomefb: couldn't process waveform\n");
+                goto err_ld_wfm;
+        }
+        release_firmware(fw_entry);
+
+        retval = request_irq(IRQ_GPIO(RDY_GPIO_PIN), metronome_handle_irq,
+                                IRQF_DISABLED, "Metronome", info);
+        if (retval) {
+                dev_err(&dev->dev, "request_irq failed: %d\n", retval);
+                goto err_ld_wfm;
+        }
+        set_irq_type(IRQ_GPIO(RDY_GPIO_PIN), IRQT_FALLING);
+
+        retval = metronome_init_regs(par);
+        if (retval < 0)
+                goto err_free_irq;
+
+        info->flags = FBINFO_FLAG_DEFAULT;
+
+        info->fbdefio = &metronomefb_defio;
+        fb_deferred_io_init(info);
+
+        retval = fb_alloc_cmap(&info->cmap, 8, 0);
+        if (retval < 0) {
+                printk(KERN_ERR "Failed to allocate colormap\n");
+                goto err_fb_rel;
+        }
+
+        /* set cmap */
+        for (i = 0; i < 8; i++)
+                info->cmap.red[i] = (((2*i)+1)*(0xFFFF))/16;
+        memcpy(info->cmap.green, info->cmap.red, sizeof(u16)*8);
+        memcpy(info->cmap.blue, info->cmap.red, sizeof(u16)*8);
+
+        retval = register_framebuffer(info);
+        if (retval < 0)
+                goto err_cmap;
+
+        platform_set_drvdata(dev, info);
+
+        printk(KERN_INFO
+                "fb%d: Metronome frame buffer device, using %dK of video"
+                " memory\n", info->node, videomemorysize >> 10);
+
+        return 0;
+
+err_cmap:
+        fb_dealloc_cmap(&info->cmap);
+err_fb_rel:
+        framebuffer_release(info);
+err_free_irq:
+        free_irq(IRQ_GPIO(RDY_GPIO_PIN), info);
+err_ld_wfm:
+        release_firmware(fw_entry);
+err_dma_free:
+        dma_free_writecombine(&dev->dev, par->metromemsize, par->metromem,
+                                par->metromem_dma);
+err_csum_table:
+        vfree(par->csum_table);
+err_vfree:
+        vfree(videomemory);
+        return retval;
+}
+
+static int __devexit metronomefb_remove(struct platform_device *dev)
+{
+        struct fb_info *info = platform_get_drvdata(dev);
+
+        if (info) {
+                struct metronomefb_par *par = info->par;
+                fb_deferred_io_cleanup(info);
+                dma_free_writecombine(&dev->dev, par->metromemsize,
+                                        par->metromem, par->metromem_dma);
+                fb_dealloc_cmap(&info->cmap);
+                vfree(par->csum_table);
+                unregister_framebuffer(info);
+                vfree((void __force *)info->screen_base);
+                free_irq(IRQ_GPIO(RDY_GPIO_PIN), info);
+                framebuffer_release(info);
+        }
+        return 0;
+}
+
+static struct platform_driver metronomefb_driver = {
+        .probe  = metronomefb_probe,
+        .remove = metronomefb_remove,
+        .driver = {
+                .name   = "metronomefb",
+        },
+};
+
+static struct platform_device *metronomefb_device;
+
+static int __init metronomefb_init(void)
+{
+        int ret;
+
+        if (!metronomefb_enable) {
+                printk(KERN_ERR
+                        "Use metronomefb_enable to enable the device\n");
+                return -ENXIO;
+        }
+
+        ret = platform_driver_register(&metronomefb_driver);
+        if (!ret) {
+                metronomefb_device = platform_device_alloc("metronomefb", 0);
+                if (metronomefb_device)
+                        ret = platform_device_add(metronomefb_device);
+                else
+                        ret = -ENOMEM;
+
+                if (ret) {
+                        platform_device_put(metronomefb_device);
+                        platform_driver_unregister(&metronomefb_driver);
+                }
+        }
+        return ret;
+
+}
+
+static void __exit metronomefb_exit(void)
+{
+        platform_device_unregister(metronomefb_device);
+        platform_driver_unregister(&metronomefb_driver);
+}
+
+module_param(metronomefb_enable, uint, 0);
+MODULE_PARM_DESC(metronomefb_enable, "Enable communication with Metronome");
+
+module_init(metronomefb_init);
+module_exit(metronomefb_exit);
+
+MODULE_DESCRIPTION("fbdev driver for Metronome controller");
+MODULE_AUTHOR("Jaya Kumar");
+MODULE_LICENSE("GPL");
diff --git a/drivers/virtio/virtio_balloon.c b/drivers/virtio/virtio_balloon.c
index c8a4332d1132..0b3efc31ee6d 100644
--- a/drivers/virtio/virtio_balloon.c
+++ b/drivers/virtio/virtio_balloon.c
@@ -152,7 +152,7 @@ static void virtballoon_changed(struct virtio_device *vdev)
         wake_up(&vb->config_change);
 }
 
-static inline int towards_target(struct virtio_balloon *vb)
+static inline s64 towards_target(struct virtio_balloon *vb)
 {
         u32 v;
         __virtio_config_val(vb->vdev,
@@ -176,7 +176,7 @@ static int balloon(void *_vballoon)
 
         set_freezable();
         while (!kthread_should_stop()) {
-                int diff;
+                s64 diff;
 
                 try_to_freeze();
                 wait_event_interruptible(vb->config_change,
diff --git a/drivers/virtio/virtio_pci.c b/drivers/virtio/virtio_pci.c
index 26f787ddd5ff..c0df924766a7 100644
--- a/drivers/virtio/virtio_pci.c
+++ b/drivers/virtio/virtio_pci.c
@@ -37,7 +37,7 @@ struct virtio_pci_device
         struct pci_dev *pci_dev;
 
         /* the IO mapping for the PCI config space */
-        void *ioaddr;
+        void __iomem *ioaddr;
 
         /* a list of queues so we can dispatch IRQs */
         spinlock_t lock;
@@ -111,7 +111,7 @@ static void vp_get(struct virtio_device *vdev, unsigned offset,
                    void *buf, unsigned len)
 {
         struct virtio_pci_device *vp_dev = to_vp_device(vdev);
-        void *ioaddr = vp_dev->ioaddr + VIRTIO_PCI_CONFIG + offset;
+        void __iomem *ioaddr = vp_dev->ioaddr + VIRTIO_PCI_CONFIG + offset;
         u8 *ptr = buf;
         int i;
 
@@ -125,7 +125,7 @@ static void vp_set(struct virtio_device *vdev, unsigned offset,
                    const void *buf, unsigned len)
 {
         struct virtio_pci_device *vp_dev = to_vp_device(vdev);
-        void *ioaddr = vp_dev->ioaddr + VIRTIO_PCI_CONFIG + offset;
+        void __iomem *ioaddr = vp_dev->ioaddr + VIRTIO_PCI_CONFIG + offset;
         const u8 *ptr = buf;
         int i;
 
@@ -177,6 +177,7 @@ static irqreturn_t vp_interrupt(int irq, void *opaque)
         struct virtio_pci_device *vp_dev = opaque;
         struct virtio_pci_vq_info *info;
         irqreturn_t ret = IRQ_NONE;
+        unsigned long flags;
         u8 isr;
 
         /* reading the ISR has the effect of also clearing it so it's very
@@ -197,12 +198,12 @@ static irqreturn_t vp_interrupt(int irq, void *opaque)
                         drv->config_changed(&vp_dev->vdev);
         }
 
-        spin_lock(&vp_dev->lock);
+        spin_lock_irqsave(&vp_dev->lock, flags);
         list_for_each_entry(info, &vp_dev->virtqueues, node) {
                 if (vring_interrupt(irq, info->vq) == IRQ_HANDLED)
                         ret = IRQ_HANDLED;
         }
-        spin_unlock(&vp_dev->lock);
+        spin_unlock_irqrestore(&vp_dev->lock, flags);
 
         return ret;
 }
@@ -214,6 +215,7 @@ static struct virtqueue *vp_find_vq(struct virtio_device *vdev, unsigned index,
         struct virtio_pci_device *vp_dev = to_vp_device(vdev);
         struct virtio_pci_vq_info *info;
         struct virtqueue *vq;
+        unsigned long flags;
         u16 num;
         int err;
 
@@ -255,9 +257,9 @@ static struct virtqueue *vp_find_vq(struct virtio_device *vdev, unsigned index,
         vq->priv = info;
         info->vq = vq;
 
-        spin_lock(&vp_dev->lock);
+        spin_lock_irqsave(&vp_dev->lock, flags);
         list_add(&info->node, &vp_dev->virtqueues);
-        spin_unlock(&vp_dev->lock);
+        spin_unlock_irqrestore(&vp_dev->lock, flags);
 
         return vq;
 
@@ -274,10 +276,11 @@ static void vp_del_vq(struct virtqueue *vq)
 {
         struct virtio_pci_device *vp_dev = to_vp_device(vq->vdev);
         struct virtio_pci_vq_info *info = vq->priv;
+        unsigned long flags;
 
-        spin_lock(&vp_dev->lock);
+        spin_lock_irqsave(&vp_dev->lock, flags);
         list_del(&info->node);
-        spin_unlock(&vp_dev->lock);
+        spin_unlock_irqrestore(&vp_dev->lock, flags);
 
         vring_del_virtqueue(vq);
 
@@ -385,6 +388,7 @@ static void __devexit virtio_pci_remove(struct pci_dev *pci_dev)
 {
         struct virtio_pci_device *vp_dev = pci_get_drvdata(pci_dev);
 
+        unregister_virtio_device(&vp_dev->vdev);
         free_irq(pci_dev->irq, vp_dev);
         pci_set_drvdata(pci_dev, NULL);
         pci_iounmap(pci_dev, vp_dev->ioaddr);
diff --git a/drivers/virtio/virtio_ring.c b/drivers/virtio/virtio_ring.c
index 3a28c1382131..aa714028641e 100644
--- a/drivers/virtio/virtio_ring.c
+++ b/drivers/virtio/virtio_ring.c
@@ -232,7 +232,6 @@ static bool vring_enable_cb(struct virtqueue *_vq)
         vq->vring.avail->flags &= ~VRING_AVAIL_F_NO_INTERRUPT;
         mb();
         if (unlikely(more_used(vq))) {
-                vq->vring.avail->flags |= VRING_AVAIL_F_NO_INTERRUPT;
                 END_USE(vq);
                 return false;
         }