102 files changed, 991 insertions, 591 deletions
diff --git a/drivers/acpi/asus_acpi.c b/drivers/acpi/asus_acpi.c
index 9c4bd220c44f..86fd142f4bf3 100644
--- a/drivers/acpi/asus_acpi.c
+++ b/drivers/acpi/asus_acpi.c
@@ -1192,6 +1192,7 @@ static int asus_hotk_get_info(void)
                        break;
                default:
                        kfree(model);
+                        model = NULL;
                        break;
                }
        }
diff --git a/drivers/acpi/battery.c b/drivers/acpi/battery.c
index 81651032791b..d7b499fe0cd9 100644
--- a/drivers/acpi/battery.c
+++ b/drivers/acpi/battery.c
@@ -113,7 +113,7 @@ struct acpi_battery_info {
        acpi_string oem_info;
 };
-enum acpi_battery_files{
+enum acpi_battery_files {
        ACPI_BATTERY_INFO = 0,
        ACPI_BATTERY_STATE,
        ACPI_BATTERY_ALARM,
@@ -129,13 +129,14 @@ struct acpi_battery_flags {
 };
 struct acpi_battery {
-        struct mutex mutex;
        struct acpi_device *device;
        struct acpi_battery_flags flags;
        struct acpi_buffer bif_data;
        struct acpi_buffer bst_data;
+        struct mutex lock;
        unsigned long alarm;
        unsigned long update_time[ACPI_BATTERY_NUMFILES];
 };
 inline int acpi_battery_present(struct acpi_battery *battery)
@@ -235,10 +236,10 @@ static int acpi_battery_get_info(struct acpi_battery *battery)
                return 0;
        /* Evaluate _BIF */
+        mutex_lock(&battery->lock);
-        status =
+        status = acpi_evaluate_object(acpi_battery_handle(battery), "_BIF",
-            acpi_evaluate_object(acpi_battery_handle(battery), "_BIF", NULL,
+                                      NULL, &buffer);
-                                 &buffer);
+        mutex_unlock(&battery->lock);
        if (ACPI_FAILURE(status)) {
                ACPI_EXCEPTION((AE_INFO, status, "Evaluating _BIF"));
                return -ENODEV;
@@ -285,10 +286,10 @@ static int acpi_battery_get_state(struct acpi_battery *battery)
                return 0;
        /* Evaluate _BST */
+        mutex_lock(&battery->lock);
-        status =
+        status = acpi_evaluate_object(acpi_battery_handle(battery), "_BST",
-            acpi_evaluate_object(acpi_battery_handle(battery), "_BST", NULL,
+                                      NULL, &buffer);
-                                 &buffer);
+        mutex_unlock(&battery->lock);
        if (ACPI_FAILURE(status)) {
                ACPI_EXCEPTION((AE_INFO, status, "Evaluating _BST"));
                return -ENODEV;
@@ -336,9 +337,10 @@ static int acpi_battery_set_alarm(struct acpi_battery *battery,
        arg0.integer.value = alarm;
-        status =
+        mutex_lock(&battery->lock);
-            acpi_evaluate_object(acpi_battery_handle(battery), "_BTP",
+        status = acpi_evaluate_object(acpi_battery_handle(battery), "_BTP",
                                 &arg_list, NULL);
+        mutex_unlock(&battery->lock);
        if (ACPI_FAILURE(status))
                return -ENODEV;
@@ -658,8 +660,6 @@ acpi_battery_write_alarm(struct file *file,
        if (!battery || (count > sizeof(alarm_string) - 1))
                return -EINVAL;
-        mutex_lock(&battery->mutex);
        result = acpi_battery_update(battery, 1, &update_result);
        if (result) {
                result = -ENODEV;
@@ -688,9 +688,7 @@ acpi_battery_write_alarm(struct file *file,
        acpi_battery_check_result(battery, result);
        if (!result)
-                result = count;
+                return count;
-        mutex_unlock(&battery->mutex);
        return result;
 }
@@ -714,8 +712,6 @@ static int acpi_battery_read(int fid, struct seq_file *seq)
        int update_result = ACPI_BATTERY_NONE_UPDATE;
        int update = 0;
-        mutex_lock(&battery->mutex);
        update = (get_seconds() - battery->update_time[fid] >= update_time);
        update = (update | battery->flags.update[fid]);
@@ -733,7 +729,6 @@ static int acpi_battery_read(int fid, struct seq_file *seq)
        result = acpi_read_funcs[fid].print(seq, result);
        acpi_battery_check_result(battery, result);
        battery->flags.update[fid] = result;
-        mutex_unlock(&battery->mutex);
        return result;
 }
@@ -897,10 +892,7 @@ static int acpi_battery_add(struct acpi_device *device)
        if (!battery)
                return -ENOMEM;
-        mutex_init(&battery->mutex);
+        mutex_init(&battery->lock);
-        mutex_lock(&battery->mutex);
        battery->device = device;
        strcpy(acpi_device_name(device), ACPI_BATTERY_DEVICE_NAME);
        strcpy(acpi_device_class(device), ACPI_BATTERY_CLASS);
@@ -936,7 +928,6 @@ static int acpi_battery_add(struct acpi_device *device)
                kfree(battery);
        }
-        mutex_unlock(&battery->mutex);
        return result;
 }
@@ -951,8 +942,6 @@ static int acpi_battery_remove(struct acpi_device *device, int type)
        battery = acpi_driver_data(device);
-        mutex_lock(&battery->mutex);
        status = acpi_remove_notify_handler(device->handle,
                                            ACPI_ALL_NOTIFY,
                                            acpi_battery_notify);
@@ -963,9 +952,7 @@ static int acpi_battery_remove(struct acpi_device *device, int type)
        kfree(battery->bst_data.pointer);
-        mutex_unlock(&battery->mutex);
+        mutex_destroy(&battery->lock);
-        mutex_destroy(&battery->mutex);
        kfree(battery);
diff --git a/drivers/acpi/bay.c b/drivers/acpi/bay.c
index 56a5b3fffeb3..6daf6088ac88 100644
--- a/drivers/acpi/bay.c
+++ b/drivers/acpi/bay.c
@@ -337,7 +337,7 @@ static void bay_notify(acpi_handle handle, u32 event, void *data)
        char *envp[] = { event_string, NULL };
        bay_dprintk(handle, "Bay event");
-        sprintf(event_string, "BAY_EVENT=%d\n", event);
+        sprintf(event_string, "BAY_EVENT=%d", event);
        kobject_uevent_env(&dev->kobj, KOBJ_CHANGE, envp);
 }
diff --git a/drivers/acpi/dock.c b/drivers/acpi/dock.c
index 6192c8be66df..1dabdf4c07b3 100644
--- a/drivers/acpi/dock.c
+++ b/drivers/acpi/dock.c
@@ -336,13 +336,13 @@ static void hotplug_dock_devices(struct dock_station *ds, u32 event)
 static void dock_event(struct dock_station *ds, u32 event, int num)
 {
        struct device *dev = &dock_device->dev;
-        char event_string[7];
+        char event_string[13];
        char *envp[] = { event_string, NULL };
        if (num == UNDOCK_EVENT)
-                sprintf(event_string, "UNDOCK");
+                sprintf(event_string, "EVENT=undock");
        else
-                sprintf(event_string, "DOCK");
+                sprintf(event_string, "EVENT=dock");
        /*
         * Indicate that the status of the dock station has
diff --git a/drivers/acpi/ec.c b/drivers/acpi/ec.c
index 469f3f57f881..56bee9e065cf 100644
--- a/drivers/acpi/ec.c
+++ b/drivers/acpi/ec.c
@@ -471,7 +471,6 @@ static void acpi_ec_gpe_query(void *ec_cxt)
                }
        }
        mutex_unlock(&ec->lock);
-        printk(KERN_ERR PREFIX "Handler for query 0x%x is not found!\n", value);
 }
 static u32 acpi_ec_gpe_handler(void *data)
@@ -665,30 +664,44 @@ acpi_ec_register_query_methods(acpi_handle handle, u32 level,
        return AE_OK;
 }
-static int ec_parse_device(struct acpi_ec *ec, acpi_handle handle)
+static acpi_status
+ec_parse_device(acpi_handle handle, u32 Level, void *context, void **retval)
 {
-        if (ACPI_FAILURE(acpi_walk_resources(handle, METHOD_NAME__CRS,
+        acpi_status status;
-                                     ec_parse_io_ports, ec)))
-                return -EINVAL;
+        struct acpi_ec *ec = context;
+        status = acpi_walk_resources(handle, METHOD_NAME__CRS,
+                                     ec_parse_io_ports, ec);
+        if (ACPI_FAILURE(status))
+                return status;
        /* Get GPE bit assignment (EC events). */
        /* TODO: Add support for _GPE returning a package */
-        if (ACPI_FAILURE(acpi_evaluate_integer(handle, "_GPE", NULL, &ec->gpe)))
+        status = acpi_evaluate_integer(handle, "_GPE", NULL, &ec->gpe);
-                return -EINVAL;
+        if (ACPI_FAILURE(status))
+                return status;
-        /* Use the global lock for all EC transactions? */
-        acpi_evaluate_integer(handle, "_GLK", NULL, &ec->global_lock);
        /* Find and register all query methods */
        acpi_walk_namespace(ACPI_TYPE_METHOD, handle, 1,
                            acpi_ec_register_query_methods, ec, NULL);
+        /* Use the global lock for all EC transactions? */
+        acpi_evaluate_integer(handle, "_GLK", NULL, &ec->global_lock);
        ec->handle = handle;
-        printk(KERN_INFO PREFIX "GPE = 0x%lx, I/O: command/status = 0x%lx, data = 0x%lx",
+        printk(KERN_INFO PREFIX "GPE = 0x%lx, I/O: command/status = 0x%lx, data = 0x%lx\n",
                          ec->gpe, ec->command_addr, ec->data_addr);
-        return 0;
+        return AE_CTRL_TERMINATE;
+}
+static void ec_remove_handlers(struct acpi_ec *ec)
+{
+        acpi_remove_address_space_handler(ec->handle,
+                                          ACPI_ADR_SPACE_EC,
+                                          &acpi_ec_space_handler);
+        acpi_remove_gpe_handler(NULL, ec->gpe, &acpi_ec_gpe_handler);
 }
 static int acpi_ec_add(struct acpi_device *device)
@@ -705,7 +718,8 @@ static int acpi_ec_add(struct acpi_device *device)
        if (!ec)
                return -ENOMEM;
-        if (ec_parse_device(ec, device->handle)) {
+        if (ec_parse_device(device->handle, 0, ec, NULL) !=
+            AE_CTRL_TERMINATE) {
                kfree(ec);
                return -EINVAL;
        }
@@ -713,16 +727,13 @@ static int acpi_ec_add(struct acpi_device *device)
        /* Check if we found the boot EC */
        if (boot_ec) {
                if (boot_ec->gpe == ec->gpe) {
-                        /* We might have incorrect info for GL at boot time */
+                        ec_remove_handlers(boot_ec);
-                        mutex_lock(&boot_ec->lock);
+                        mutex_destroy(&boot_ec->lock);
-                        boot_ec->global_lock = ec->global_lock;
+                        kfree(boot_ec);
-                        /* Copy handlers from new ec into boot ec */
+                        first_ec = boot_ec = NULL;
-                        list_splice(&ec->list, &boot_ec->list);
-                        mutex_unlock(&boot_ec->lock);
-                        kfree(ec);
-                        ec = boot_ec;
                }
-        } else
+        }
+        if (!first_ec)
                first_ec = ec;
        ec->handle = device->handle;
        acpi_driver_data(device) = ec;
@@ -734,14 +745,14 @@ static int acpi_ec_add(struct acpi_device *device)
 static int acpi_ec_remove(struct acpi_device *device, int type)
 {
        struct acpi_ec *ec;
-        struct acpi_ec_query_handler *handler;
+        struct acpi_ec_query_handler *handler, *tmp;
        if (!device)
                return -EINVAL;
        ec = acpi_driver_data(device);
        mutex_lock(&ec->lock);
-        list_for_each_entry(handler, &ec->list, node) {
+        list_for_each_entry_safe(handler, tmp, &ec->list, node) {
                list_del(&handler->node);
                kfree(handler);
        }
@@ -751,9 +762,6 @@ static int acpi_ec_remove(struct acpi_device *device, int type)
        if (ec == first_ec)
                first_ec = NULL;
-        /* Don't touch boot EC */
-        if (boot_ec != ec)
-                kfree(ec);
        return 0;
 }
@@ -817,9 +825,7 @@ static int acpi_ec_start(struct acpi_device *device)
        if (!ec)
                return -EINVAL;
-        /* Boot EC is already working */
+        ret = ec_install_handlers(ec);
-        if (ec != boot_ec)
-                ret = ec_install_handlers(ec);
        /* EC is fully operational, allow queries */
        atomic_set(&ec->query_pending, 0);
@@ -829,7 +835,6 @@ static int acpi_ec_start(struct acpi_device *device)
 static int acpi_ec_stop(struct acpi_device *device, int type)
 {
-        acpi_status status;
        struct acpi_ec *ec;
        if (!device)
@@ -838,21 +843,7 @@ static int acpi_ec_stop(struct acpi_device *device, int type)
        ec = acpi_driver_data(device);
        if (!ec)
                return -EINVAL;
+        ec_remove_handlers(ec);
-        /* Don't touch boot EC */
-        if (ec == boot_ec)
-                return 0;
-        status = acpi_remove_address_space_handler(ec->handle,
-                                                   ACPI_ADR_SPACE_EC,
-                                                   &acpi_ec_space_handler);
-        if (ACPI_FAILURE(status))
-                return -ENODEV;
-        status = acpi_remove_gpe_handler(NULL, ec->gpe, &acpi_ec_gpe_handler);
-        if (ACPI_FAILURE(status))
-                return -ENODEV;
        return 0;
 }
@@ -868,18 +859,21 @@ int __init acpi_ec_ecdt_probe(void)
        /*
         * Generate a boot ec context
         */
        status = acpi_get_table(ACPI_SIG_ECDT, 1,
                                (struct acpi_table_header **)&ecdt_ptr);
-        if (ACPI_FAILURE(status))
+        if (ACPI_SUCCESS(status)) {
-                goto error;
+                printk(KERN_INFO PREFIX "EC description table is found, configuring boot EC\n\n");
+                boot_ec->command_addr = ecdt_ptr->control.address;
-        printk(KERN_INFO PREFIX "EC description table is found, configuring boot EC\n");
+                boot_ec->data_addr = ecdt_ptr->data.address;
+                boot_ec->gpe = ecdt_ptr->gpe;
-        boot_ec->command_addr = ecdt_ptr->control.address;
+                boot_ec->handle = ACPI_ROOT_OBJECT;
-        boot_ec->data_addr = ecdt_ptr->data.address;
+        } else {
-        boot_ec->gpe = ecdt_ptr->gpe;
+                printk(KERN_DEBUG PREFIX "Look up EC in DSDT\n");
-        boot_ec->handle = ACPI_ROOT_OBJECT;
+                status = acpi_get_devices(ec_device_ids[0].id, ec_parse_device,
+                                                boot_ec, NULL);
+                if (ACPI_FAILURE(status))
+                        goto error;
+        }
        ret = ec_install_handlers(boot_ec);
        if (!ret) {
diff --git a/drivers/acpi/event.c b/drivers/acpi/event.c
index dfa5853b17f0..95637a4ff782 100644
--- a/drivers/acpi/event.c
+++ b/drivers/acpi/event.c
@@ -108,7 +108,7 @@ static const struct file_operations acpi_system_event_ops = {
 };
 #ifdef CONFIG_NET
-unsigned int acpi_event_seqnum;
+static unsigned int acpi_event_seqnum;
 struct acpi_genl_event {
        acpi_device_class device_class;
        char bus_id[15];
diff --git a/drivers/acpi/processor_idle.c b/drivers/acpi/processor_idle.c
index a898991f77cb..a8634a0655fc 100644
--- a/drivers/acpi/processor_idle.c
+++ b/drivers/acpi/processor_idle.c
@@ -969,11 +969,17 @@ static void acpi_processor_power_verify_c3(struct acpi_processor *pr,
        }
        if (pr->flags.bm_check) {
-                /* bus mastering control is necessary */
                if (!pr->flags.bm_control) {
-                        /* In this case we enter C3 without bus mastering */
+                        if (pr->flags.has_cst != 1) {
-                        ACPI_DEBUG_PRINT((ACPI_DB_INFO,
+                                /* bus mastering control is necessary */
-                                "C3 support without bus mastering control\n"));
+                                ACPI_DEBUG_PRINT((ACPI_DB_INFO,
+                                        "C3 support requires BM control\n"));
+                                return;
+                        } else {
+                                /* Here we enter C3 without bus mastering */
+                                ACPI_DEBUG_PRINT((ACPI_DB_INFO,
+                                        "C3 support without BM control\n"));
+                        }
                }
        } else {
                /*
diff --git a/drivers/acpi/processor_perflib.c b/drivers/acpi/processor_perflib.c
index c4efc0c17f8f..463b0247cbc5 100644
--- a/drivers/acpi/processor_perflib.c
+++ b/drivers/acpi/processor_perflib.c
@@ -539,7 +539,7 @@ end:
 }
 int acpi_processor_preregister_performance(
-                struct acpi_processor_performance **performance)
+                struct acpi_processor_performance *performance)
 {
        int count, count_target;
        int retval = 0;
@@ -567,12 +567,12 @@ int acpi_processor_preregister_performance(
                        continue;
                }
-                if (!performance || !performance[i]) {
+                if (!performance || !percpu_ptr(performance, i)) {
                        retval = -EINVAL;
                        continue;
                }
-                pr->performance = performance[i];
+                pr->performance = percpu_ptr(performance, i);
                cpu_set(i, pr->performance->shared_cpu_map);
                if (acpi_processor_get_psd(pr)) {
                        retval = -EINVAL;
diff --git a/drivers/acpi/resources/rsxface.c b/drivers/acpi/resources/rsxface.c
index f63813a358c5..4c3fd4cdaf73 100644
--- a/drivers/acpi/resources/rsxface.c
+++ b/drivers/acpi/resources/rsxface.c
@@ -474,8 +474,6 @@ acpi_rs_match_vendor_resource(struct acpi_resource *resource, void *context)
        return (AE_CTRL_TERMINATE);
 }
-ACPI_EXPORT_SYMBOL(acpi_rs_match_vendor_resource)
 /*******************************************************************************
 *
 * FUNCTION:    acpi_walk_resources
diff --git a/drivers/acpi/sbs.c b/drivers/acpi/sbs.c
index 7d8e78ea13a5..82c3a550016d 100644
--- a/drivers/acpi/sbs.c
+++ b/drivers/acpi/sbs.c
@@ -1415,7 +1415,7 @@ static int acpi_sbs_update_run(struct acpi_sbs *sbs, int id, int data_type)
        char dir_name[32];
        int do_battery_init = 0, do_ac_init = 0;
        int old_remaining_capacity = 0;
-        int update_ac = 1, update_battery = 1;
+        int update_battery = 1;
        int up_tm = update_time;
        if (sbs_zombie(sbs)) {
@@ -1435,10 +1435,6 @@ static int acpi_sbs_update_run(struct acpi_sbs *sbs, int id, int data_type)
        sbs->run_cnt++;
-        if (!update_ac && !update_battery) {
-                goto end;
-        }
        old_ac_present = sbs->ac.ac_present;
        result = acpi_ac_get_present(sbs);
diff --git a/drivers/acpi/tables/tbxface.c b/drivers/acpi/tables/tbxface.c
index 5b302c4e293f..a9e3331fee5d 100644
--- a/drivers/acpi/tables/tbxface.c
+++ b/drivers/acpi/tables/tbxface.c
@@ -52,6 +52,8 @@ ACPI_MODULE_NAME("tbxface")
 /* Local prototypes */
 static acpi_status acpi_tb_load_namespace(void);
+static int no_auto_ssdt;
 /*******************************************************************************
 *
 * FUNCTION:    acpi_allocate_root_table
@@ -536,6 +538,10 @@ static acpi_status acpi_tb_load_namespace(void)
                ACPI_INFO((AE_INFO, "Table DSDT replaced by host OS"));
                acpi_tb_print_table_header(0, table);
+                if (no_auto_ssdt == 0) {
+                        printk(KERN_WARNING "ACPI: DSDT override uses original SSDTs unless \"acpi_no_auto_ssdt\"");
+                }
        }
        status =
@@ -577,6 +583,11 @@ static acpi_status acpi_tb_load_namespace(void)
                        continue;
                }
+                if (no_auto_ssdt) {
+                        printk(KERN_WARNING "ACPI: SSDT ignored due to \"acpi_no_auto_ssdt\"\n");
+                        continue;
+                }
                /* Ignore errors while loading tables, get as many as possible */
                (void)acpi_ut_release_mutex(ACPI_MTX_TABLES);
@@ -622,3 +633,15 @@ acpi_status acpi_load_tables(void)
 }
 ACPI_EXPORT_SYMBOL(acpi_load_tables)
+static int __init acpi_no_auto_ssdt_setup(char *s) {
+        printk(KERN_NOTICE "ACPI: SSDT auto-load disabled\n");
+        no_auto_ssdt = 1;
+        return 1;
+}
+__setup("acpi_no_auto_ssdt", acpi_no_auto_ssdt_setup);
diff --git a/drivers/acpi/thermal.c b/drivers/acpi/thermal.c
index 5a62de1b7f2a..1e06159fd9c4 100644
--- a/drivers/acpi/thermal.c
+++ b/drivers/acpi/thermal.c
@@ -33,6 +33,7 @@
 #include <linux/kernel.h>
 #include <linux/module.h>
+#include <linux/dmi.h>
 #include <linux/init.h>
 #include <linux/types.h>
 #include <linux/proc_fs.h>
@@ -74,10 +75,26 @@ MODULE_AUTHOR("Paul Diefenbaugh");
 MODULE_DESCRIPTION("ACPI Thermal Zone Driver");
 MODULE_LICENSE("GPL");
+static int act;
+module_param(act, int, 0644);
+MODULE_PARM_DESC(act, "Disable or override all lowest active trip points.\n");
 static int tzp;
-module_param(tzp, int, 0);
+module_param(tzp, int, 0444);
 MODULE_PARM_DESC(tzp, "Thermal zone polling frequency, in 1/10 seconds.\n");
+static int nocrt;
+module_param(nocrt, int, 0);
+MODULE_PARM_DESC(nocrt, "Set to disable action on ACPI thermal zone critical and hot trips.\n");
+static int off;
+module_param(off, int, 0);
+MODULE_PARM_DESC(off, "Set to disable ACPI thermal support.\n");
+static int psv;
+module_param(psv, int, 0644);
+MODULE_PARM_DESC(psv, "Disable or override all passive trip points.\n");
 static int acpi_thermal_add(struct acpi_device *device);
 static int acpi_thermal_remove(struct acpi_device *device, int type);
 static int acpi_thermal_resume(struct acpi_device *device);
@@ -339,9 +356,16 @@ static int acpi_thermal_get_trip_points(struct acpi_thermal *tz)
        /* Passive: Processors (optional) */
-        status =
+        if (psv == -1) {
-            acpi_evaluate_integer(tz->device->handle, "_PSV", NULL,
+                status = AE_SUPPORT;
-                                  &tz->trips.passive.temperature);
+        } else if (psv > 0) {
+                tz->trips.passive.temperature = CELSIUS_TO_KELVIN(psv);
+                status = AE_OK;
+        } else {
+                status = acpi_evaluate_integer(tz->device->handle,
+                        "_PSV", NULL, &tz->trips.passive.temperature);
+        }
        if (ACPI_FAILURE(status)) {
                tz->trips.passive.flags.valid = 0;
                ACPI_DEBUG_PRINT((ACPI_DB_INFO, "No passive threshold\n"));
@@ -386,11 +410,33 @@ static int acpi_thermal_get_trip_points(struct acpi_thermal *tz)
                char name[5] = { '_', 'A', 'C', ('0' + i), '\0' };
-                status =
+                if (act == -1)
-                    acpi_evaluate_integer(tz->device->handle, name, NULL,
+                        break;  /* disable all active trip points */
-                                          &tz->trips.active[i].temperature);
-                if (ACPI_FAILURE(status))
+                status = acpi_evaluate_integer(tz->device->handle,
+                        name, NULL, &tz->trips.active[i].temperature);
+                if (ACPI_FAILURE(status)) {
+                        if (i == 0)     /* no active trip points */
+                                break;
+                        if (act <= 0)   /* no override requested */
+                                break;
+                        if (i == 1) {   /* 1 trip point */
+                                tz->trips.active[0].temperature =
+                                        CELSIUS_TO_KELVIN(act);
+                        } else {        /* multiple trips */
+                                /*
+                                 * Don't allow override higher than
+                                 * the next higher trip point
+                                 */
+                                tz->trips.active[i - 1].temperature =
+                                    (tz->trips.active[i - 2].temperature <
+                                        CELSIUS_TO_KELVIN(act) ?
+                                        tz->trips.active[i - 2].temperature :
+                                        CELSIUS_TO_KELVIN(act));
+                        }
                        break;
+                }
                name[2] = 'L';
                status =
@@ -427,7 +473,7 @@ static int acpi_thermal_get_devices(struct acpi_thermal *tz)
 static int acpi_thermal_critical(struct acpi_thermal *tz)
 {
-        if (!tz || !tz->trips.critical.flags.valid)
+        if (!tz || !tz->trips.critical.flags.valid || nocrt)
                return -EINVAL;
        if (tz->temperature >= tz->trips.critical.temperature) {
@@ -449,7 +495,7 @@ static int acpi_thermal_critical(struct acpi_thermal *tz)
 static int acpi_thermal_hot(struct acpi_thermal *tz)
 {
-        if (!tz || !tz->trips.hot.flags.valid)
+        if (!tz || !tz->trips.hot.flags.valid || nocrt)
                return -EINVAL;
        if (tz->temperature >= tz->trips.hot.temperature) {
@@ -824,12 +870,14 @@ static int acpi_thermal_trip_seq_show(struct seq_file *seq, void *offset)
                goto end;
        if (tz->trips.critical.flags.valid)
-                seq_printf(seq, "critical (S5):           %ld C\n",
+                seq_printf(seq, "critical (S5):           %ld C%s",
-                           KELVIN_TO_CELSIUS(tz->trips.critical.temperature));
+                           KELVIN_TO_CELSIUS(tz->trips.critical.temperature),
+                           nocrt ? " <disabled>\n" : "\n");
        if (tz->trips.hot.flags.valid)
-                seq_printf(seq, "hot (S4):                %ld C\n",
+                seq_printf(seq, "hot (S4):                %ld C%s",
-                           KELVIN_TO_CELSIUS(tz->trips.hot.temperature));
+                           KELVIN_TO_CELSIUS(tz->trips.hot.temperature),
+                           nocrt ? " <disabled>\n" : "\n");
        if (tz->trips.passive.flags.valid) {
                seq_printf(seq,
@@ -1281,11 +1329,78 @@ static int acpi_thermal_resume(struct acpi_device *device)
        return AE_OK;
 }
+#ifdef CONFIG_DMI
+static int thermal_act(struct dmi_system_id *d) {
+        if (act == 0) {
+                printk(KERN_NOTICE "ACPI: %s detected: "
+                        "disabling all active thermal trip points\n", d->ident);
+                act = -1;
+        }
+        return 0;
+}
+static int thermal_tzp(struct dmi_system_id *d) {
+        if (tzp == 0) {
+                printk(KERN_NOTICE "ACPI: %s detected: "
+                        "enabling thermal zone polling\n", d->ident);
+                tzp = 300;      /* 300 dS = 30 Seconds */
+        }
+        return 0;
+}
+static int thermal_psv(struct dmi_system_id *d) {
+        if (psv == 0) {
+                printk(KERN_NOTICE "ACPI: %s detected: "
+                        "disabling all passive thermal trip points\n", d->ident);
+                psv = -1;
+        }
+        return 0;
+}
+static struct dmi_system_id thermal_dmi_table[] __initdata = {
+        /*
+         * Award BIOS on this AOpen makes thermal control almost worthless.
+         * http://bugzilla.kernel.org/show_bug.cgi?id=8842
+         */
+        {
+         .callback = thermal_act,
+         .ident = "AOpen i915GMm-HFS",
+         .matches = {
+                DMI_MATCH(DMI_BOARD_VENDOR, "AOpen"),
+                DMI_MATCH(DMI_BOARD_NAME, "i915GMm-HFS"),
+                },
+        },
+        {
+         .callback = thermal_psv,
+         .ident = "AOpen i915GMm-HFS",
+         .matches = {
+                DMI_MATCH(DMI_BOARD_VENDOR, "AOpen"),
+                DMI_MATCH(DMI_BOARD_NAME, "i915GMm-HFS"),
+                },
+        },
+        {
+         .callback = thermal_tzp,
+         .ident = "AOpen i915GMm-HFS",
+         .matches = {
+                DMI_MATCH(DMI_BOARD_VENDOR, "AOpen"),
+                DMI_MATCH(DMI_BOARD_NAME, "i915GMm-HFS"),
+                },
+        },
+        {}
+};
+#endif /* CONFIG_DMI */
 static int __init acpi_thermal_init(void)
 {
        int result = 0;
+        dmi_check_system(thermal_dmi_table);
+        if (off) {
+                printk(KERN_NOTICE "ACPI: thermal control disabled\n");
+                return -ENODEV;
+        }
        acpi_thermal_dir = proc_mkdir(ACPI_THERMAL_CLASS, acpi_root_dir);
        if (!acpi_thermal_dir)
                return -ENODEV;
diff --git a/drivers/ata/ata_piix.c b/drivers/ata/ata_piix.c
index a78832ea81fa..071d274afaab 100644
--- a/drivers/ata/ata_piix.c
+++ b/drivers/ata/ata_piix.c
@@ -436,7 +436,7 @@ static const struct piix_map_db ich8_map_db = {
                /* PM   PS   SM   SS       MAP */
                {  P0,  P2,  P1,  P3 }, /* 00b (hardwired when in AHCI) */
                {  RV,  RV,  RV,  RV },
-                {  IDE,  IDE,  NA,  NA }, /* 10b (IDE mode) */
+                {  P0,  P2, IDE, IDE }, /* 10b (IDE mode) */
                {  RV,  RV,  RV,  RV },
        },
 };
@@ -901,6 +901,13 @@ static int piix_broken_suspend(void)
                        },
                },
                {
+                        .ident = "TECRA M7",
+                        .matches = {
+                                DMI_MATCH(DMI_SYS_VENDOR, "TOSHIBA"),
+                                DMI_MATCH(DMI_PRODUCT_NAME, "TECRA M7"),
+                        },
+                },
+                {
                        .ident = "Satellite U205",
                        .matches = {
                                DMI_MATCH(DMI_SYS_VENDOR, "TOSHIBA"),
diff --git a/drivers/ata/libata-core.c b/drivers/ata/libata-core.c
index 60e78bef469f..99d4fbffb0df 100644
--- a/drivers/ata/libata-core.c
+++ b/drivers/ata/libata-core.c
@@ -1723,7 +1723,7 @@ int ata_dev_read_id(struct ata_device *dev, unsigned int *p_class,
                tf.protocol = ATA_PROT_NODATA;
                tf.flags |= ATA_TFLAG_ISADDR | ATA_TFLAG_DEVICE;
                err_mask = ata_exec_internal(dev, &tf, NULL, DMA_NONE, NULL, 0);
-                if (err_mask) {
+                if (err_mask && id[2] != 0x738c) {
                        rc = -EIO;
                        reason = "SPINUP failed";
                        goto err_out;
diff --git a/drivers/ata/pata_artop.c b/drivers/ata/pata_artop.c
index ce589d96ca42..b5352ebecef9 100644
--- a/drivers/ata/pata_artop.c
+++ b/drivers/ata/pata_artop.c
@@ -2,6 +2,7 @@
 *    pata_artop.c - ARTOP ATA controller driver
 *
 *      (C) 2006 Red Hat <alan@redhat.com>
+ *      (C) 2007 Bartlomiej Zolnierkiewicz
 *
 *    Based in part on drivers/ide/pci/aec62xx.c
 *      Copyright (C) 1999-2002 Andre Hedrick <andre@linux-ide.org>
@@ -28,7 +29,7 @@
 #include <linux/ata.h>
 #define DRV_NAME        "pata_artop"
-#define DRV_VERSION     "0.4.3"
+#define DRV_VERSION     "0.4.4"
 /*
 *      The ARTOP has 33 Mhz and "over clocked" timing tables. Until we
@@ -430,7 +431,7 @@ static int artop_init_one (struct pci_dev *pdev, const struct pci_device_id *id)
                .udma_mask      = ATA_UDMA4,
                .port_ops       = &artop6260_ops,
        };
-        static const struct ata_port_info info_626x_fast = {
+        static const struct ata_port_info info_628x = {
                .sht            = &artop_sht,
                .flags          = ATA_FLAG_SLAVE_POSS,
                .pio_mask       = 0x1f, /* pio0-4 */
@@ -438,6 +439,14 @@ static int artop_init_one (struct pci_dev *pdev, const struct pci_device_id *id)
                .udma_mask      = ATA_UDMA5,
                .port_ops       = &artop6260_ops,
        };
+        static const struct ata_port_info info_628x_fast = {
+                .sht            = &artop_sht,
+                .flags          = ATA_FLAG_SLAVE_POSS,
+                .pio_mask       = 0x1f, /* pio0-4 */
+                .mwdma_mask     = 0x07, /* mwdma0-2 */
+                .udma_mask      = ATA_UDMA6,
+                .port_ops       = &artop6260_ops,
+        };
        const struct ata_port_info *ppi[] = { NULL, NULL };
        if (!printed_version++)
@@ -455,13 +464,13 @@ static int artop_init_one (struct pci_dev *pdev, const struct pci_device_id *id)
        }
        else if (id->driver_data == 1)  /* 6260 */
                ppi[0] = &info_626x;
-        else if (id->driver_data == 2)  { /* 6260 or 6260 + fast */
+        else if (id->driver_data == 2)  { /* 6280 or 6280 + fast */
                unsigned long io = pci_resource_start(pdev, 4);
                u8 reg;
-                ppi[0] = &info_626x;
+                ppi[0] = &info_628x;
                if (inb(io) & 0x10)
-                        ppi[0] = &info_626x_fast;
+                        ppi[0] = &info_628x_fast;
                /* Mac systems come up with some registers not set as we
                   will need them */
diff --git a/drivers/ata/pata_hpt37x.c b/drivers/ata/pata_hpt37x.c
index 84d9c5568567..c5ddd937dbf2 100644
--- a/drivers/ata/pata_hpt37x.c
+++ b/drivers/ata/pata_hpt37x.c
@@ -8,12 +8,10 @@
 * Copyright (C) 1999-2003              Andre Hedrick <andre@linux-ide.org>
 * Portions Copyright (C) 2001          Sun Microsystems, Inc.
 * Portions Copyright (C) 2003          Red Hat Inc
- * Portions Copyright (C) 2005-2006     MontaVista Software, Inc.
+ * Portions Copyright (C) 2005-2007     MontaVista Software, Inc.
 *
 * TODO
- *      PLL mode
+ *      Look into engine reset on timeout errors. Should not be required.
- *      Look into engine reset on timeout errors. Should not be
- *              required.
 */
 #include <linux/kernel.h>
@@ -26,7 +24,7 @@
 #include <linux/libata.h>
 #define DRV_NAME        "pata_hpt37x"
-#define DRV_VERSION     "0.6.7"
+#define DRV_VERSION     "0.6.9"
 struct hpt_clock {
        u8      xfer_speed;
@@ -1092,9 +1090,7 @@ static int hpt37x_init_one(struct pci_dev *dev, const struct pci_device_id *id)
                int dpll, adjust;
                /* Compute DPLL */
-                dpll = 2;
+                dpll = (port->udma_mask & 0xC0) ? 3 : 2;
-                if (port->udma_mask & 0xE0)
-                        dpll = 3;
                f_low = (MHz[clock_slot] * 48) / MHz[dpll];
                f_high = f_low + 2;
@@ -1116,7 +1112,7 @@ static int hpt37x_init_one(struct pci_dev *dev, const struct pci_device_id *id)
                        pci_write_config_dword(dev, 0x5C, (f_high << 16) | f_low | 0x100);
                }
                if (adjust == 8) {
-                        printk(KERN_WARNING "hpt37x: DPLL did not stabilize.\n");
+                        printk(KERN_ERR "pata_hpt37x: DPLL did not stabilize!\n");
                        return -ENODEV;
                }
                if (dpll == 3)
@@ -1124,7 +1120,8 @@ static int hpt37x_init_one(struct pci_dev *dev, const struct pci_device_id *id)
                else
                        private_data = (void *)hpt37x_timings_50;
-                printk(KERN_INFO "hpt37x: Bus clock %dMHz, using DPLL.\n", MHz[dpll]);
+                printk(KERN_INFO "pata_hpt37x: bus clock %dMHz, using %dMHz DPLL.\n",
+                       MHz[clock_slot], MHz[dpll]);
        } else {
                private_data = (void *)chip_table->clocks[clock_slot];
                /*
@@ -1137,7 +1134,8 @@ static int hpt37x_init_one(struct pci_dev *dev, const struct pci_device_id *id)
                        port = &info_hpt370_33;
                if (clock_slot < 2 && port == &info_hpt370a)
                        port = &info_hpt370a_33;
-                printk(KERN_INFO "hpt37x: %s: Bus clock %dMHz.\n", chip_table->name, MHz[clock_slot]);
+                printk(KERN_INFO "pata_hpt37x: %s using %dMHz bus clock.\n",
+                       chip_table->name, MHz[clock_slot]);
        }
        /* Now kick off ATA set up */
diff --git a/drivers/ata/pata_hpt3x2n.c b/drivers/ata/pata_hpt3x2n.c
index aa29cde09f8b..f8f234bfc8ce 100644
--- a/drivers/ata/pata_hpt3x2n.c
+++ b/drivers/ata/pata_hpt3x2n.c
@@ -8,7 +8,7 @@
 * Copyright (C) 1999-2003              Andre Hedrick <andre@linux-ide.org>
 * Portions Copyright (C) 2001          Sun Microsystems, Inc.
 * Portions Copyright (C) 2003          Red Hat Inc
- * Portions Copyright (C) 2005-2006     MontaVista Software, Inc.
+ * Portions Copyright (C) 2005-2007     MontaVista Software, Inc.
 *
 *
 * TODO
@@ -25,7 +25,7 @@
 #include <linux/libata.h>
 #define DRV_NAME        "pata_hpt3x2n"
-#define DRV_VERSION     "0.3.3"
+#define DRV_VERSION     "0.3.4"
 enum {
        HPT_PCI_FAST    =       (1 << 31),
@@ -579,10 +579,12 @@ static int hpt3x2n_init_one(struct pci_dev *dev, const struct pci_device_id *id)
                pci_write_config_dword(dev, 0x5C, (f_high << 16) | f_low);
        }
        if (adjust == 8) {
-                printk(KERN_WARNING "hpt3x2n: DPLL did not stabilize.\n");
+                printk(KERN_ERR "pata_hpt3x2n: DPLL did not stabilize!\n");
                return -ENODEV;
        }
+        printk(KERN_INFO "pata_hpt37x: bus clock %dMHz, using 66MHz DPLL.\n",
+               pci_mhz);
        /* Set our private data up. We only need a few flags so we use
           it directly */
        port.private_data = NULL;
diff --git a/drivers/ata/pata_isapnp.c b/drivers/ata/pata_isapnp.c
index 5525518204e6..91a396fa5b20 100644
--- a/drivers/ata/pata_isapnp.c
+++ b/drivers/ata/pata_isapnp.c
@@ -139,6 +139,8 @@ static struct pnp_device_id isapnp_devices[] = {
        {.id = ""}
 };
+MODULE_DEVICE_TABLE(pnp, isapnp_devices);
 static struct pnp_driver isapnp_driver = {
        .name           = DRV_NAME,
        .id_table       = isapnp_devices,
diff --git a/drivers/ata/sata_mv.c b/drivers/ata/sata_mv.c
index 8ec520885b95..3acf65e75eb2 100644
--- a/drivers/ata/sata_mv.c
+++ b/drivers/ata/sata_mv.c
@@ -621,6 +621,9 @@ static const struct pci_device_id mv_pci_tbl[] = {
        { PCI_VDEVICE(MARVELL, 0x5041), chip_504x },
        { PCI_VDEVICE(MARVELL, 0x5080), chip_5080 },
        { PCI_VDEVICE(MARVELL, 0x5081), chip_508x },
+        /* RocketRAID 1740/174x have different identifiers */
+        { PCI_VDEVICE(TTI, 0x1740), chip_508x },
+        { PCI_VDEVICE(TTI, 0x1742), chip_508x },
        { PCI_VDEVICE(MARVELL, 0x6040), chip_604x },
        { PCI_VDEVICE(MARVELL, 0x6041), chip_604x },
diff --git a/drivers/atm/Kconfig b/drivers/atm/Kconfig
index bed9f58c2d5a..b554edac1ced 100644
--- a/drivers/atm/Kconfig
+++ b/drivers/atm/Kconfig
@@ -6,6 +6,11 @@ menuconfig ATM_DRIVERS
        bool "ATM drivers"
        depends on NETDEVICES && ATM
        default y
+        ---help---
+          Say Y here to get to see options for Asynchronous Transfer Mode
+          device drivers. This option alone does not add any kernel code.
+          If you say N, all options in this submenu will be skipped and disabled.
 if ATM_DRIVERS && NETDEVICES && ATM
diff --git a/drivers/atm/fore200e.c b/drivers/atm/fore200e.c
index 405ee5e09221..8b12925fe7a4 100644
--- a/drivers/atm/fore200e.c
+++ b/drivers/atm/fore200e.c
@@ -2435,7 +2435,7 @@ fore200e_init_cmd_queue(struct fore200e* fore200e)
 }
-static void __init
+static void __devinit
 fore200e_param_bs_queue(struct fore200e* fore200e,
                        enum buffer_scheme scheme, enum buffer_magn magn,
                        int queue_length, int pool_size, int supply_blksize)
diff --git a/drivers/atm/iphase.c b/drivers/atm/iphase.c
index a3b605a0ca17..ef52452640e0 100644
--- a/drivers/atm/iphase.c
+++ b/drivers/atm/iphase.c
@@ -1601,14 +1601,14 @@ static int rx_init(struct atm_dev *dev)
  
        skb_queue_head_init(&iadev->rx_dma_q);  
        iadev->rx_free_desc_qhead = NULL;   
-        iadev->rx_open = kmalloc(4*iadev->num_vc,GFP_KERNEL);
-        if (!iadev->rx_open)  
+        iadev->rx_open = kzalloc(4 * iadev->num_vc, GFP_KERNEL);
-        {  
+        if (!iadev->rx_open) {
                printk(KERN_ERR DEV_LABEL "itf %d couldn't get free page\n",
                dev->number);  
                goto err_free_dle;
        }  
-        memset(iadev->rx_open, 0, 4*iadev->num_vc);  
        iadev->rxing = 1;
        iadev->rx_pkt_cnt = 0;
        /* Mode Register */  
@@ -3171,12 +3171,12 @@ static int __devinit ia_init_one(struct pci_dev *pdev,
        unsigned long flags;
        int ret;
-        iadev = kmalloc(sizeof(*iadev), GFP_KERNEL); 
+        iadev = kzalloc(sizeof(*iadev), GFP_KERNEL);
        if (!iadev) {
                ret = -ENOMEM;
                goto err_out;
        }
-        memset(iadev, 0, sizeof(*iadev));
        iadev->pci = pdev;
        IF_INIT(printk("ia detected at bus:%d dev: %d function:%d\n",
diff --git a/drivers/atm/lanai.c b/drivers/atm/lanai.c
index 55fd1b4543fd..144a49f15220 100644
--- a/drivers/atm/lanai.c
+++ b/drivers/atm/lanai.c
@@ -65,7 +65,6 @@
 #include <linux/init.h>
 #include <linux/delay.h>
 #include <linux/interrupt.h>
-#include <linux/dma-mapping.h>
 /* -------------------- TUNABLE PARAMATERS: */
diff --git a/drivers/auxdisplay/Kconfig b/drivers/auxdisplay/Kconfig
index de2fcce10ba5..043353bd0600 100644
--- a/drivers/auxdisplay/Kconfig
+++ b/drivers/auxdisplay/Kconfig
@@ -8,6 +8,11 @@
 menuconfig AUXDISPLAY
        depends on PARPORT
        bool "Auxiliary Display support"
+        ---help---
+          Say Y here to get to see options for auxiliary display drivers.
+          This option alone does not add any kernel code.
+          If you say N, all options in this submenu will be skipped and disabled.
 if AUXDISPLAY && PARPORT
diff --git a/drivers/block/Kconfig b/drivers/block/Kconfig
index a4a311992408..ef32e977d307 100644
--- a/drivers/block/Kconfig
+++ b/drivers/block/Kconfig
@@ -6,6 +6,12 @@ menuconfig BLK_DEV
        bool "Block devices"
        depends on BLOCK
        default y
+        ---help---
+          Say Y here to get to see options for various different block device
+          drivers. This option alone does not add any kernel code.
+          If you say N, all options in this submenu will be skipped and disabled;
+          only do this if you know what you are doing.
 if BLK_DEV
diff --git a/drivers/block/cciss.c b/drivers/block/cciss.c
index a11b2bd54bbe..084358a828e9 100644
--- a/drivers/block/cciss.c
+++ b/drivers/block/cciss.c
@@ -1977,12 +1977,13 @@ cciss_read_capacity(int ctlr, int logvol, int withirq, sector_t *total_size,
 {
        ReadCapdata_struct *buf;
        int return_code;
-        buf = kmalloc(sizeof(ReadCapdata_struct), GFP_KERNEL);
-        if (buf == NULL) {
+        buf = kzalloc(sizeof(ReadCapdata_struct), GFP_KERNEL);
+        if (!buf) {
                printk(KERN_WARNING "cciss: out of memory\n");
                return;
        }
-        memset(buf, 0, sizeof(ReadCapdata_struct));
        if (withirq)
                return_code = sendcmd_withirq(CCISS_READ_CAPACITY,
                                ctlr, buf, sizeof(ReadCapdata_struct),
@@ -2003,7 +2004,6 @@ cciss_read_capacity(int ctlr, int logvol, int withirq, sector_t *total_size,
                printk(KERN_INFO "      blocks= %llu block_size= %d\n",
                (unsigned long long)*total_size+1, *block_size);
        kfree(buf);
-        return;
 }
 static void
@@ -2011,12 +2011,13 @@ cciss_read_capacity_16(int ctlr, int logvol, int withirq, sector_t *total_size,
 {
        ReadCapdata_struct_16 *buf;
        int return_code;
-        buf = kmalloc(sizeof(ReadCapdata_struct_16), GFP_KERNEL);
-        if (buf == NULL) {
+        buf = kzalloc(sizeof(ReadCapdata_struct_16), GFP_KERNEL);
+        if (!buf) {
                printk(KERN_WARNING "cciss: out of memory\n");
                return;
        }
-        memset(buf, 0, sizeof(ReadCapdata_struct_16));
        if (withirq) {
                return_code = sendcmd_withirq(CCISS_READ_CAPACITY_16,
                        ctlr, buf, sizeof(ReadCapdata_struct_16),
@@ -2038,7 +2039,6 @@ cciss_read_capacity_16(int ctlr, int logvol, int withirq, sector_t *total_size,
        printk(KERN_INFO "      blocks= %llu block_size= %d\n",
               (unsigned long long)*total_size+1, *block_size);
        kfree(buf);
-        return;
 }
 static int cciss_revalidate(struct gendisk *disk)
diff --git a/drivers/block/cpqarray.c b/drivers/block/cpqarray.c
index be4e3477d83b..eb9799acf65b 100644
--- a/drivers/block/cpqarray.c
+++ b/drivers/block/cpqarray.c
@@ -420,18 +420,17 @@ static int __init cpqarray_register_ctlr( int i, struct pci_dev *pdev)
                        goto Enomem2;
        }
-        hba[i]->cmd_pool = (cmdlist_t *)pci_alloc_consistent(
+        hba[i]->cmd_pool = pci_alloc_consistent(
                hba[i]->pci_dev, NR_CMDS * sizeof(cmdlist_t),
                &(hba[i]->cmd_pool_dhandle));
-        hba[i]->cmd_pool_bits = kmalloc(
+        hba[i]->cmd_pool_bits = kcalloc(
-                ((NR_CMDS+BITS_PER_LONG-1)/BITS_PER_LONG)*sizeof(unsigned long),
+                (NR_CMDS+BITS_PER_LONG-1)/BITS_PER_LONG, sizeof(unsigned long),
                GFP_KERNEL);
        if (!hba[i]->cmd_pool_bits || !hba[i]->cmd_pool)
                        goto Enomem1;
        memset(hba[i]->cmd_pool, 0, NR_CMDS * sizeof(cmdlist_t));
-        memset(hba[i]->cmd_pool_bits, 0, ((NR_CMDS+BITS_PER_LONG-1)/BITS_PER_LONG)*sizeof(unsigned long));
        printk(KERN_INFO "cpqarray: Finding drives on %s",
                hba[i]->devname);
@@ -1660,45 +1659,30 @@ static void getgeometry(int ctlr)
        info_p->log_drv_map = 0;        
        
-        id_ldrive = kmalloc(sizeof(id_log_drv_t), GFP_KERNEL);
+        id_ldrive = kzalloc(sizeof(id_log_drv_t), GFP_KERNEL);
-        if(id_ldrive == NULL)
+        if (!id_ldrive) {
-        {
                printk( KERN_ERR "cpqarray:  out of memory.\n");
-                return;
+                goto err_0;
        }
-        id_ctlr_buf = kmalloc(sizeof(id_ctlr_t), GFP_KERNEL);
+        id_ctlr_buf = kzalloc(sizeof(id_ctlr_t), GFP_KERNEL);
-        if(id_ctlr_buf == NULL)
+        if (!id_ctlr_buf) {
-        {
-                kfree(id_ldrive);
                printk( KERN_ERR "cpqarray:  out of memory.\n");
-                return;
+                goto err_1;
        }
-        id_lstatus_buf = kmalloc(sizeof(sense_log_drv_stat_t), GFP_KERNEL);
+        id_lstatus_buf = kzalloc(sizeof(sense_log_drv_stat_t), GFP_KERNEL);
-        if(id_lstatus_buf == NULL)
+        if (!id_lstatus_buf) {
-        {
-                kfree(id_ctlr_buf);
-                kfree(id_ldrive);
                printk( KERN_ERR "cpqarray:  out of memory.\n");
-                return;
+                goto err_2;
        }
-        sense_config_buf = kmalloc(sizeof(config_t), GFP_KERNEL);
+        sense_config_buf = kzalloc(sizeof(config_t), GFP_KERNEL);
-        if(sense_config_buf == NULL)
+        if (!sense_config_buf) {
-        {
-                kfree(id_lstatus_buf);
-                kfree(id_ctlr_buf);
-                kfree(id_ldrive);
                printk( KERN_ERR "cpqarray:  out of memory.\n");
-                return;
+                goto err_3;
        }
-        memset(id_ldrive, 0, sizeof(id_log_drv_t));
-        memset(id_ctlr_buf, 0, sizeof(id_ctlr_t));
-        memset(id_lstatus_buf, 0, sizeof(sense_log_drv_stat_t));
-        memset(sense_config_buf, 0, sizeof(config_t));
        info_p->phys_drives = 0;
        info_p->log_drv_map = 0;
        info_p->drv_assign_map = 0;
@@ -1712,13 +1696,8 @@ static void getgeometry(int ctlr)
                 * so the idastubopen will fail on all logical drives
                 * on the controller.
                 */
-                 /* Free all the buffers and return */ 
                printk(KERN_ERR "cpqarray: error sending ID controller\n");
-                kfree(sense_config_buf);
+                goto err_4;
-                kfree(id_lstatus_buf);
-                kfree(id_ctlr_buf);
-                kfree(id_ldrive);
-                return;
        }
        info_p->log_drives = id_ctlr_buf->nr_drvs;
@@ -1764,12 +1743,7 @@ static void getgeometry(int ctlr)
                                " failed to report status of logical drive %d\n"
                         "Access to this controller has been disabled\n",
                                ctlr, log_unit);
-                        /* Free all the buffers and return */
+                        goto err_4;
-                        kfree(sense_config_buf);
-                        kfree(id_lstatus_buf);
-                        kfree(id_ctlr_buf);
-                        kfree(id_ldrive);
-                        return;
                }
                /*
                   Make sure the logical drive is configured
@@ -1798,14 +1772,8 @@ static void getgeometry(int ctlr)
                                 sizeof(config_t), 0, 0, log_unit);
                                if (ret_code == IO_ERROR) {
                                        info_p->log_drv_map = 0;
-                                        /* Free all the buffers and return */
                                        printk(KERN_ERR "cpqarray: error sending sense config\n");
-                                        kfree(sense_config_buf);
+                                        goto err_4;
-                                        kfree(id_lstatus_buf);
-                                        kfree(id_ctlr_buf);
-                                        kfree(id_ldrive);
-                                        return;
                                }
                                info_p->phys_drives =
@@ -1820,12 +1788,18 @@ static void getgeometry(int ctlr)
                        log_index = log_index + 1;
                }               /* end of if logical drive configured */
        }                       /* end of for log_unit */
+        /* Free all the buffers and return */
+err_4:
        kfree(sense_config_buf);
-        kfree(id_ldrive);
+err_3:
        kfree(id_lstatus_buf);
+err_2:
        kfree(id_ctlr_buf);
+err_1:
+        kfree(id_ldrive);
+err_0:
        return;
 }
 static void __exit cpqarray_exit(void)
diff --git a/drivers/block/lguest_blk.c b/drivers/block/lguest_blk.c
index 93e3c4001bf5..160cf14431ac 100644
--- a/drivers/block/lguest_blk.c
+++ b/drivers/block/lguest_blk.c
@@ -308,9 +308,12 @@ static int lguestblk_probe(struct lguest_device *lgdev)
        }
        /* This allocates a "struct gendisk" where we pack all the information
-         * about the disk which the rest of Linux sees.  We ask for one minor
+         * about the disk which the rest of Linux sees.  The argument is the
-         * number; I do wonder if we should be asking for more. */
+         * number of minor devices desired: we need one minor for the main
-        bd->disk = alloc_disk(1);
+         * disk, and one for each partition.  Of course, we can't possibly know
+         * how many partitions are on the disk (add_disk does that).
+         */
+        bd->disk = alloc_disk(16);
        if (!bd->disk) {
                err = -ENOMEM;
                goto out_unregister_blkdev;
diff --git a/drivers/block/viodasd.c b/drivers/block/viodasd.c
index 85916e2665d4..af3969a9c963 100644
--- a/drivers/block/viodasd.c
+++ b/drivers/block/viodasd.c
@@ -41,7 +41,6 @@
 #include <linux/dma-mapping.h>
 #include <linux/completion.h>
 #include <linux/device.h>
-#include <linux/kernel.h>
 #include <asm/uaccess.h>
 #include <asm/vio.h>
diff --git a/drivers/block/xsysace.c b/drivers/block/xsysace.c
index cb27e8863d7c..3ede0b63da13 100644
--- a/drivers/block/xsysace.c
+++ b/drivers/block/xsysace.c
@@ -902,26 +902,17 @@ static int ace_release(struct inode *inode, struct file *filp)
        return 0;
 }
-static int ace_ioctl(struct inode *inode, struct file *filp,
+static int ace_getgeo(struct block_device *bdev, struct hd_geometry *geo)
-                     unsigned int cmd, unsigned long arg)
 {
-        struct ace_device *ace = inode->i_bdev->bd_disk->private_data;
+        struct ace_device *ace = bdev->bd_disk->private_data;
-        struct hd_geometry __user *geo = (struct hd_geometry __user *)arg;
-        struct hd_geometry g;
-        dev_dbg(ace->dev, "ace_ioctl()\n");
-        switch (cmd) {
-        case HDIO_GETGEO:
-                g.heads = ace->cf_id.heads;
-                g.sectors = ace->cf_id.sectors;
-                g.cylinders = ace->cf_id.cyls;
-                g.start = 0;
-                return copy_to_user(geo, &g, sizeof(g)) ? -EFAULT : 0;
-        default:
+        dev_dbg(ace->dev, "ace_getgeo()\n");
-                return -ENOTTY;
-        }
+        geo->heads = ace->cf_id.heads;
-        return -ENOTTY;
+        geo->sectors = ace->cf_id.sectors;
+        geo->cylinders = ace->cf_id.cyls;
+        return 0;
 }
 static struct block_device_operations ace_fops = {
@@ -930,7 +921,7 @@ static struct block_device_operations ace_fops = {
        .release = ace_release,
        .media_changed = ace_media_changed,
        .revalidate_disk = ace_revalidate_disk,
-        .ioctl = ace_ioctl,
+        .getgeo = ace_getgeo,
 };
 /* --------------------------------------------------------------------
diff --git a/drivers/char/hvc_lguest.c b/drivers/char/hvc_lguest.c
index feeccbaec438..3d6bd0baa56d 100644
--- a/drivers/char/hvc_lguest.c
+++ b/drivers/char/hvc_lguest.c
@@ -35,6 +35,7 @@
 #include <linux/err.h>
 #include <linux/init.h>
 #include <linux/lguest_bus.h>
+#include <asm/paravirt.h>
 #include "hvc_console.h"
 /*D:340 This is our single console input buffer, with associated "struct
diff --git a/drivers/char/pcmcia/cm4000_cs.c b/drivers/char/pcmcia/cm4000_cs.c
index fee58e03dbe2..4177f6db83e9 100644
--- a/drivers/char/pcmcia/cm4000_cs.c
+++ b/drivers/char/pcmcia/cm4000_cs.c
@@ -1629,7 +1629,7 @@ static int cmm_open(struct inode *inode, struct file *filp)
 {
        struct cm4000_dev *dev;
        struct pcmcia_device *link;
-        int rc, minor = iminor(inode);
+        int minor = iminor(inode);
        if (minor >= CM4000_MAX_DEV)
                return -ENODEV;
@@ -1668,7 +1668,6 @@ static int cmm_open(struct inode *inode, struct file *filp)
        start_monitor(dev);
        link->open = 1;         /* only one open per device */
-        rc = 0;
        DEBUGP(2, dev, "<- cmm_open\n");
        return nonseekable_open(inode, filp);
@@ -1824,7 +1823,7 @@ static int cm4000_resume(struct pcmcia_device *link)
 static void cm4000_release(struct pcmcia_device *link)
 {
-        cmm_cm4000_release(link->priv); /* delay release until device closed */
+        cmm_cm4000_release(link);       /* delay release until device closed */
        pcmcia_disable_device(link);
 }
diff --git a/drivers/char/pcmcia/cm4040_cs.c b/drivers/char/pcmcia/cm4040_cs.c
index af88181a17f4..b24a3e7bbb9f 100644
--- a/drivers/char/pcmcia/cm4040_cs.c
+++ b/drivers/char/pcmcia/cm4040_cs.c
@@ -599,7 +599,7 @@ cs_release:
 static void reader_release(struct pcmcia_device *link)
 {
-        cm4040_reader_release(link->priv);
+        cm4040_reader_release(link);
        pcmcia_disable_device(link);
 }
diff --git a/drivers/char/sonypi.c b/drivers/char/sonypi.c
index 73037a4d3c50..aeec67e27264 100644
--- a/drivers/char/sonypi.c
+++ b/drivers/char/sonypi.c
@@ -1147,10 +1147,15 @@ static int sonypi_acpi_remove(struct acpi_device *device, int type)
        return 0;
 }
+const static struct acpi_device_id sonypi_device_ids[] = {
+        {"SNY6001", 0},
+        {"", 0},
+};
 static struct acpi_driver sonypi_acpi_driver = {
        .name           = "sonypi",
        .class          = "hkey",
-        .ids            = "SNY6001",
+        .ids            = sonypi_device_ids,
        .ops            = {
                           .add = sonypi_acpi_add,
                           .remove = sonypi_acpi_remove,
diff --git a/drivers/char/tty_io.c b/drivers/char/tty_io.c
index de37ebc3a4cf..51ea93cab6c4 100644
--- a/drivers/char/tty_io.c
+++ b/drivers/char/tty_io.c
@@ -369,25 +369,54 @@ static void tty_buffer_free(struct tty_struct *tty, struct tty_buffer *b)
 }
 /**
- *      tty_buffer_flush                -       flush full tty buffers
+ *      __tty_buffer_flush              -       flush full tty buffers
 *      @tty: tty to flush
 *
- *      flush all the buffers containing receive data
+ *      flush all the buffers containing receive data. Caller must
+ *      hold the buffer lock and must have ensured no parallel flush to
+ *      ldisc is running.
 *
- *      Locking: none
+ *      Locking: Caller must hold tty->buf.lock
 */
-static void tty_buffer_flush(struct tty_struct *tty)
+static void __tty_buffer_flush(struct tty_struct *tty)
 {
        struct tty_buffer *thead;
-        unsigned long flags;
-        spin_lock_irqsave(&tty->buf.lock, flags);
        while((thead = tty->buf.head) != NULL) {
                tty->buf.head = thead->next;
                tty_buffer_free(tty, thead);
        }
        tty->buf.tail = NULL;
+}
+/**
+ *      tty_buffer_flush                -       flush full tty buffers
+ *      @tty: tty to flush
+ *
+ *      flush all the buffers containing receive data. If the buffer is
+ *      being processed by flush_to_ldisc then we defer the processing
+ *      to that function
+ *
+ *      Locking: none
+ */
+static void tty_buffer_flush(struct tty_struct *tty)
+{
+        unsigned long flags;
+        spin_lock_irqsave(&tty->buf.lock, flags);
+        /* If the data is being pushed to the tty layer then we can't
+           process it here. Instead set a flag and the flush_to_ldisc
+           path will process the flush request before it exits */
+        if (test_bit(TTY_FLUSHING, &tty->flags)) {
+                set_bit(TTY_FLUSHPENDING, &tty->flags);
+                spin_unlock_irqrestore(&tty->buf.lock, flags);
+                wait_event(tty->read_wait,
+                                test_bit(TTY_FLUSHPENDING, &tty->flags) == 0);
+                return;
+        } else
+                __tty_buffer_flush(tty);
        spin_unlock_irqrestore(&tty->buf.lock, flags);
 }
@@ -3594,6 +3623,7 @@ static void flush_to_ldisc(struct work_struct *work)
                return;
        spin_lock_irqsave(&tty->buf.lock, flags);
+        set_bit(TTY_FLUSHING, &tty->flags);     /* So we know a flush is running */
        head = tty->buf.head;
        if (head != NULL) {
                tty->buf.head = NULL;
@@ -3607,6 +3637,11 @@ static void flush_to_ldisc(struct work_struct *work)
                                tty_buffer_free(tty, tbuf);
                                continue;
                        }
+                        /* Ldisc or user is trying to flush the buffers
+                           we are feeding to the ldisc, stop feeding the
+                           line discipline as we want to empty the queue */
+                        if (test_bit(TTY_FLUSHPENDING, &tty->flags))
+                                break;
                        if (!tty->receive_room) {
                                schedule_delayed_work(&tty->buf.work, 1);
                                break;
@@ -3620,8 +3655,17 @@ static void flush_to_ldisc(struct work_struct *work)
                        disc->receive_buf(tty, char_buf, flag_buf, count);
                        spin_lock_irqsave(&tty->buf.lock, flags);
                }
+                /* Restore the queue head */
                tty->buf.head = head;
        }
+        /* We may have a deferred request to flush the input buffer,
+           if so pull the chain under the lock and empty the queue */
+        if (test_bit(TTY_FLUSHPENDING, &tty->flags)) {
+                __tty_buffer_flush(tty);
+                clear_bit(TTY_FLUSHPENDING, &tty->flags);
+                wake_up(&tty->read_wait);
+        }
+        clear_bit(TTY_FLUSHING, &tty->flags);
        spin_unlock_irqrestore(&tty->buf.lock, flags);
        tty_ldisc_deref(disc);
diff --git a/drivers/crypto/Kconfig b/drivers/crypto/Kconfig
index 84ebfcc1ffb4..c0fc4aeb8596 100644
--- a/drivers/crypto/Kconfig
+++ b/drivers/crypto/Kconfig
@@ -2,6 +2,11 @@
 menuconfig CRYPTO_HW
        bool "Hardware crypto devices"
        default y
+        ---help---
+          Say Y here to get to see options for hardware crypto devices and
+          processors. This option alone does not add any kernel code.
+          If you say N, all options in this submenu will be skipped and disabled.
 if CRYPTO_HW
diff --git a/drivers/dma/ioatdma.c b/drivers/dma/ioatdma.c
index 5fbe56b5cea0..2d1f17865b64 100644
--- a/drivers/dma/ioatdma.c
+++ b/drivers/dma/ioatdma.c
@@ -347,8 +347,7 @@ ioat_dma_prep_memcpy(struct dma_chan *chan, size_t len, int int_en)
        new->async_tx.ack = 0; /* client is in control of this ack */
        new->async_tx.cookie = -EBUSY;
-        pci_unmap_len_set(new, src_len, orig_len);
+        pci_unmap_len_set(new, len, orig_len);
-        pci_unmap_len_set(new, dst_len, orig_len);
        spin_unlock_bh(&ioat_chan->desc_lock);
        return new ? &new->async_tx : NULL;
@@ -423,11 +422,11 @@ static void ioat_dma_memcpy_cleanup(struct ioat_dma_chan *chan)
                        */
                        pci_unmap_page(chan->device->pdev,
                                        pci_unmap_addr(desc, dst),
-                                        pci_unmap_len(desc, dst_len),
+                                        pci_unmap_len(desc, len),
                                        PCI_DMA_FROMDEVICE);
                        pci_unmap_page(chan->device->pdev,
                                        pci_unmap_addr(desc, src),
-                                        pci_unmap_len(desc, src_len),
+                                        pci_unmap_len(desc, len),
                                        PCI_DMA_TODEVICE);
                }
diff --git a/drivers/dma/ioatdma.h b/drivers/dma/ioatdma.h
index d3726478031a..bf4dad70e0f5 100644
--- a/drivers/dma/ioatdma.h
+++ b/drivers/dma/ioatdma.h
@@ -111,10 +111,9 @@ struct ioat_desc_sw {
        struct ioat_dma_descriptor *hw;
        struct list_head node;
        int tx_cnt;
+        DECLARE_PCI_UNMAP_LEN(len)
        DECLARE_PCI_UNMAP_ADDR(src)
-        DECLARE_PCI_UNMAP_LEN(src_len)
        DECLARE_PCI_UNMAP_ADDR(dst)
-        DECLARE_PCI_UNMAP_LEN(dst_len)
        struct dma_async_tx_descriptor async_tx;
 };
diff --git a/drivers/hid/Kconfig b/drivers/hid/Kconfig
index 3b63b0b78122..19667fcc722a 100644
--- a/drivers/hid/Kconfig
+++ b/drivers/hid/Kconfig
@@ -5,6 +5,11 @@ menuconfig HID_SUPPORT
        bool "HID Devices"
        depends on INPUT
        default y
+        ---help---
+          Say Y here to get to see options for various computer-human interface
+          device drivers. This option alone does not add any kernel code.
+          If you say N, all options in this submenu will be skipped and disabled.
 if HID_SUPPORT
diff --git a/drivers/hwmon/smsc47m1.c b/drivers/hwmon/smsc47m1.c
index 338ee4f54614..d3181967f167 100644
--- a/drivers/hwmon/smsc47m1.c
+++ b/drivers/hwmon/smsc47m1.c
@@ -585,6 +585,8 @@ static int __devinit smsc47m1_probe(struct platform_device *pdev)
        if ((err = device_create_file(dev, &dev_attr_alarms)))
                goto error_remove_files;
+        if ((err = device_create_file(dev, &dev_attr_name)))
+                goto error_remove_files;
        data->class_dev = hwmon_device_register(dev);
        if (IS_ERR(data->class_dev)) {
diff --git a/drivers/hwmon/w83627ehf.c b/drivers/hwmon/w83627ehf.c
index c51ae2e17758..d9a9ec7dd84a 100644
--- a/drivers/hwmon/w83627ehf.c
+++ b/drivers/hwmon/w83627ehf.c
@@ -309,18 +309,16 @@ static inline int is_word_sized(u16 reg)
              || (reg & 0x00ff) == 0x55));
 }
-/* We assume that the default bank is 0, thus the following two functions do
+/* Registers 0x50-0x5f are banked */
-   nothing for registers which live in bank 0. For others, they respectively
-   set the bank register to the correct value (before the register is
-   accessed), and back to 0 (afterwards). */
 static inline void w83627ehf_set_bank(struct w83627ehf_data *data, u16 reg)
 {
-        if (reg & 0xff00) {
+        if ((reg & 0x00f0) == 0x50) {
                outb_p(W83627EHF_REG_BANK, data->addr + ADDR_REG_OFFSET);
                outb_p(reg >> 8, data->addr + DATA_REG_OFFSET);
        }
 }
+/* Not strictly necessary, but play it safe for now */
 static inline void w83627ehf_reset_bank(struct w83627ehf_data *data, u16 reg)
 {
        if (reg & 0xff00) {
@@ -421,6 +419,31 @@ static void w83627ehf_write_fan_div(struct w83627ehf_data *data, int nr)
        }
 }
+static void w83627ehf_update_fan_div(struct w83627ehf_data *data)
+{
+        int i;
+        i = w83627ehf_read_value(data, W83627EHF_REG_FANDIV1);
+        data->fan_div[0] = (i >> 4) & 0x03;
+        data->fan_div[1] = (i >> 6) & 0x03;
+        i = w83627ehf_read_value(data, W83627EHF_REG_FANDIV2);
+        data->fan_div[2] = (i >> 6) & 0x03;
+        i = w83627ehf_read_value(data, W83627EHF_REG_VBAT);
+        data->fan_div[0] |= (i >> 3) & 0x04;
+        data->fan_div[1] |= (i >> 4) & 0x04;
+        data->fan_div[2] |= (i >> 5) & 0x04;
+        if (data->has_fan & ((1 << 3) | (1 << 4))) {
+                i = w83627ehf_read_value(data, W83627EHF_REG_DIODE);
+                data->fan_div[3] = i & 0x03;
+                data->fan_div[4] = ((i >> 2) & 0x03)
+                                 | ((i >> 5) & 0x04);
+        }
+        if (data->has_fan & (1 << 3)) {
+                i = w83627ehf_read_value(data, W83627EHF_REG_SMI_OVT);
+                data->fan_div[3] |= (i >> 5) & 0x04;
+        }
+}
 static struct w83627ehf_data *w83627ehf_update_device(struct device *dev)
 {
        struct w83627ehf_data *data = dev_get_drvdata(dev);
@@ -432,25 +455,7 @@ static struct w83627ehf_data *w83627ehf_update_device(struct device *dev)
        if (time_after(jiffies, data->last_updated + HZ + HZ/2)
         || !data->valid) {
                /* Fan clock dividers */
-                i = w83627ehf_read_value(data, W83627EHF_REG_FANDIV1);
+                w83627ehf_update_fan_div(data);
-                data->fan_div[0] = (i >> 4) & 0x03;
-                data->fan_div[1] = (i >> 6) & 0x03;
-                i = w83627ehf_read_value(data, W83627EHF_REG_FANDIV2);
-                data->fan_div[2] = (i >> 6) & 0x03;
-                i = w83627ehf_read_value(data, W83627EHF_REG_VBAT);
-                data->fan_div[0] |= (i >> 3) & 0x04;
-                data->fan_div[1] |= (i >> 4) & 0x04;
-                data->fan_div[2] |= (i >> 5) & 0x04;
-                if (data->has_fan & ((1 << 3) | (1 << 4))) {
-                        i = w83627ehf_read_value(data, W83627EHF_REG_DIODE);
-                        data->fan_div[3] = i & 0x03;
-                        data->fan_div[4] = ((i >> 2) & 0x03)
-                                         | ((i >> 5) & 0x04);
-                }
-                if (data->has_fan & (1 << 3)) {
-                        i = w83627ehf_read_value(data, W83627EHF_REG_SMI_OVT);
-                        data->fan_div[3] |= (i >> 5) & 0x04;
-                }
                /* Measured voltages and limits */
                for (i = 0; i < data->in_num; i++) {
@@ -1312,6 +1317,9 @@ static int __devinit w83627ehf_probe(struct platform_device *pdev)
        if (!(i & (1 << 1)) && (!fan5pin))
                data->has_fan |= (1 << 4);
+        /* Read fan clock dividers immediately */
+        w83627ehf_update_fan_div(data);
        /* Register sysfs hooks */
        for (i = 0; i < ARRAY_SIZE(sda_sf3_arrays); i++)
                if ((err = device_create_file(dev,
diff --git a/drivers/hwmon/w83781d.c b/drivers/hwmon/w83781d.c
index f85b48fea1c4..c95909cc1d21 100644
--- a/drivers/hwmon/w83781d.c
+++ b/drivers/hwmon/w83781d.c
@@ -740,9 +740,9 @@ store_sensor(struct device *dev, struct device_attribute *da,
 static SENSOR_DEVICE_ATTR(temp1_type, S_IRUGO | S_IWUSR,
        show_sensor, store_sensor, 0);
 static SENSOR_DEVICE_ATTR(temp2_type, S_IRUGO | S_IWUSR,
-        show_sensor, store_sensor, 0);
+        show_sensor, store_sensor, 1);
 static SENSOR_DEVICE_ATTR(temp3_type, S_IRUGO | S_IWUSR,
-        show_sensor, store_sensor, 0);
+        show_sensor, store_sensor, 2);
 /* I2C devices get this name attribute automatically, but for ISA devices
   we must create it by ourselves. */
diff --git a/drivers/i2c/busses/i2c-i801.c b/drivers/i2c/busses/i2c-i801.c
index 8f5c686123b8..289816db52ae 100644
--- a/drivers/i2c/busses/i2c-i801.c
+++ b/drivers/i2c/busses/i2c-i801.c
@@ -272,11 +272,11 @@ static int i801_block_transaction_byte_by_byte(union i2c_smbus_data *data,
                /* Make sure the SMBus host is ready to start transmitting */
                temp = inb_p(SMBHSTSTS);
                if (i == 1) {
-                        /* Erronenous conditions before transaction:
+                        /* Erroneous conditions before transaction:
                         * Byte_Done, Failed, Bus_Err, Dev_Err, Intr, Host_Busy */
                        errmask = 0x9f;
                } else {
-                        /* Erronenous conditions during transaction:
+                        /* Erroneous conditions during transaction:
                         * Failed, Bus_Err, Dev_Err, Intr */
                        errmask = 0x1e;
                }
diff --git a/drivers/i2c/busses/i2c-iop3xx.c b/drivers/i2c/busses/i2c-iop3xx.c
index 440342bc62e1..ace644e21b14 100644
--- a/drivers/i2c/busses/i2c-iop3xx.c
+++ b/drivers/i2c/busses/i2c-iop3xx.c
@@ -490,6 +490,7 @@ iop3xx_i2c_probe(struct platform_device *pdev)
        memcpy(new_adapter->name, pdev->name, strlen(pdev->name));
        new_adapter->id = I2C_HW_IOP3XX;
        new_adapter->owner = THIS_MODULE;
+        new_adapter->class = I2C_CLASS_HWMON;
        new_adapter->dev.parent = &pdev->dev;
        new_adapter->nr = pdev->id;
diff --git a/drivers/i2c/busses/i2c-mpc.c b/drivers/i2c/busses/i2c-mpc.c
index 851c3ed513d0..d8de4ac88b7d 100644
--- a/drivers/i2c/busses/i2c-mpc.c
+++ b/drivers/i2c/busses/i2c-mpc.c
@@ -105,6 +105,7 @@ static int i2c_wait(struct mpc_i2c *i2c, unsigned timeout, int writing)
                        schedule();
                        if (time_after(jiffies, orig_jiffies + timeout)) {
                                pr_debug("I2C: timeout\n");
+                                writeccr(i2c, 0);
                                result = -EIO;
                                break;
                        }
@@ -116,10 +117,12 @@ static int i2c_wait(struct mpc_i2c *i2c, unsigned timeout, int writing)
                result = wait_event_interruptible_timeout(i2c->queue,
                        (i2c->interrupt & CSR_MIF), timeout * HZ);
-                if (unlikely(result < 0))
+                if (unlikely(result < 0)) {
                        pr_debug("I2C: wait interrupted\n");
-                else if (unlikely(!(i2c->interrupt & CSR_MIF))) {
+                        writeccr(i2c, 0);
+                } else if (unlikely(!(i2c->interrupt & CSR_MIF))) {
                        pr_debug("I2C: wait timeout\n");
+                        writeccr(i2c, 0);
                        result = -ETIMEDOUT;
                }
@@ -172,7 +175,6 @@ static void mpc_i2c_start(struct mpc_i2c *i2c)
 static void mpc_i2c_stop(struct mpc_i2c *i2c)
 {
        writeccr(i2c, CCR_MEN);
-        writeccr(i2c, 0);
 }
 static int mpc_write(struct mpc_i2c *i2c, int target,
@@ -261,6 +263,7 @@ static int mpc_xfer(struct i2c_adapter *adap, struct i2c_msg *msgs, int num)
        while (readb(i2c->base + MPC_I2C_SR) & CSR_MBB) {
                if (signal_pending(current)) {
                        pr_debug("I2C: Interrupted\n");
+                        writeccr(i2c, 0);
                        return -EINTR;
                }
                if (time_after(jiffies, orig_jiffies + HZ)) {
@@ -362,7 +365,7 @@ static int fsl_i2c_probe(struct platform_device *pdev)
      fail_add:
        if (i2c->irq != 0)
-                free_irq(i2c->irq, NULL);
+                free_irq(i2c->irq, i2c);
      fail_irq:
        iounmap(i2c->base);
      fail_map:
diff --git a/drivers/i2c/busses/i2c-mv64xxx.c b/drivers/i2c/busses/i2c-mv64xxx.c
index 251154ae5d97..bb7bf68a7fb6 100644
--- a/drivers/i2c/busses/i2c-mv64xxx.c
+++ b/drivers/i2c/busses/i2c-mv64xxx.c
@@ -107,6 +107,21 @@ struct mv64xxx_i2c_data {
 *
 *****************************************************************************
 */
+/* Reset hardware and initialize FSM */
+static void
+mv64xxx_i2c_hw_init(struct mv64xxx_i2c_data *drv_data)
+{
+        writel(0, drv_data->reg_base + MV64XXX_I2C_REG_SOFT_RESET);
+        writel((((drv_data->freq_m & 0xf) << 3) | (drv_data->freq_n & 0x7)),
+                drv_data->reg_base + MV64XXX_I2C_REG_BAUD);
+        writel(0, drv_data->reg_base + MV64XXX_I2C_REG_SLAVE_ADDR);
+        writel(0, drv_data->reg_base + MV64XXX_I2C_REG_EXT_SLAVE_ADDR);
+        writel(MV64XXX_I2C_REG_CONTROL_TWSIEN | MV64XXX_I2C_REG_CONTROL_STOP,
+                drv_data->reg_base + MV64XXX_I2C_REG_CONTROL);
+        drv_data->state = MV64XXX_I2C_STATE_IDLE;
+}
 static void
 mv64xxx_i2c_fsm(struct mv64xxx_i2c_data *drv_data, u32 status)
 {
@@ -203,7 +218,7 @@ mv64xxx_i2c_fsm(struct mv64xxx_i2c_data *drv_data, u32 status)
                         drv_data->state, status, drv_data->msg->addr,
                         drv_data->msg->flags);
                drv_data->action = MV64XXX_I2C_ACTION_SEND_STOP;
-                drv_data->state = MV64XXX_I2C_STATE_IDLE;
+                mv64xxx_i2c_hw_init(drv_data);
                drv_data->rc = -EIO;
        }
 }
@@ -367,6 +382,7 @@ mv64xxx_i2c_wait_for_completion(struct mv64xxx_i2c_data *drv_data)
                                "mv64xxx: I2C bus locked, block: %d, "
                                "time_left: %d\n", drv_data->block,
                                (int)time_left);
+                        mv64xxx_i2c_hw_init(drv_data);
                }
        } else
                spin_unlock_irqrestore(&drv_data->lock, flags);
@@ -443,19 +459,6 @@ static const struct i2c_algorithm mv64xxx_i2c_algo = {
 *
 *****************************************************************************
 */
-static void __devinit
-mv64xxx_i2c_hw_init(struct mv64xxx_i2c_data *drv_data)
-{
-        writel(0, drv_data->reg_base + MV64XXX_I2C_REG_SOFT_RESET);
-        writel((((drv_data->freq_m & 0xf) << 3) | (drv_data->freq_n & 0x7)),
-                drv_data->reg_base + MV64XXX_I2C_REG_BAUD);
-        writel(0, drv_data->reg_base + MV64XXX_I2C_REG_SLAVE_ADDR);
-        writel(0, drv_data->reg_base + MV64XXX_I2C_REG_EXT_SLAVE_ADDR);
-        writel(MV64XXX_I2C_REG_CONTROL_TWSIEN | MV64XXX_I2C_REG_CONTROL_STOP,
-                drv_data->reg_base + MV64XXX_I2C_REG_CONTROL);
-        drv_data->state = MV64XXX_I2C_STATE_IDLE;
-}
 static int __devinit
 mv64xxx_i2c_map_regs(struct platform_device *pd,
        struct mv64xxx_i2c_data *drv_data)
diff --git a/drivers/i2c/busses/i2c-s3c2410.c b/drivers/i2c/busses/i2c-s3c2410.c
index e4540fcf6476..c44ada5f4292 100644
--- a/drivers/i2c/busses/i2c-s3c2410.c
+++ b/drivers/i2c/busses/i2c-s3c2410.c
@@ -39,8 +39,8 @@
 #include <asm/io.h>
 #include <asm/arch/regs-gpio.h>
-#include <asm/arch/regs-iic.h>
+#include <asm/plat-s3c/regs-iic.h>
-#include <asm/arch/iic.h>
+#include <asm/plat-s3c/iic.h>
 /* i2c controller state */
diff --git a/drivers/i2c/chips/isp1301_omap.c b/drivers/i2c/chips/isp1301_omap.c
index 9fafadb92510..fe04e46991aa 100644
--- a/drivers/i2c/chips/isp1301_omap.c
+++ b/drivers/i2c/chips/isp1301_omap.c
@@ -18,8 +18,6 @@
 * along with this program; if not, write to the Free Software
 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 */
-#undef  DEBUG
-#undef  VERBOSE
 #include <linux/kernel.h>
 #include <linux/module.h>
@@ -44,7 +42,7 @@
 #define DRIVER_VERSION  "24 August 2004"
-#define DRIVER_NAME     (isp1301_driver.name)
+#define DRIVER_NAME     (isp1301_driver.driver.name)
 MODULE_DESCRIPTION("ISP1301 USB OTG Transceiver Driver");
 MODULE_LICENSE("GPL");
@@ -55,6 +53,7 @@ struct isp1301 {
        void                    (*i2c_release)(struct device *dev);
        int                     irq;
+        int                     irq_type;
        u32                     last_otg_ctrl;
        unsigned                working:1;
@@ -63,7 +62,7 @@ struct isp1301 {
        /* use keventd context to change the state for us */
        struct work_struct      work;
-        
        unsigned long           todo;
 #               define WORK_UPDATE_ISP  0       /* update ISP from OTG */
 #               define WORK_UPDATE_OTG  1       /* update OTG from ISP */
@@ -94,7 +93,7 @@ struct isp1301 {
 /* board-specific PM hooks */
-#include <asm/arch/gpio.h>
+#include <asm/gpio.h>
 #include <asm/arch/mux.h>
 #include <asm/mach-types.h>
@@ -291,7 +290,7 @@ static void power_up(struct isp1301 *isp)
 {
        // isp1301_clear_bits(isp, ISP1301_MODE_CONTROL_2, MC2_GLOBAL_PWR_DN);
        isp1301_clear_bits(isp, ISP1301_MODE_CONTROL_1, MC1_SUSPEND_REG);
-        
        /* do this only when cpu is driving transceiver,
         * so host won't see a low speed device...
         */
@@ -799,7 +798,7 @@ static irqreturn_t omap_otg_irq(int irq, void *_isp)
                /* role is host */
                } else {
                        if (!(otg_ctrl & OTG_ID)) {
-                                otg_ctrl &= OTG_CTRL_MASK & ~OTG_XCEIV_INPUTS;
+                                otg_ctrl &= OTG_CTRL_MASK & ~OTG_XCEIV_INPUTS;
                                OTG_CTRL_REG = otg_ctrl | OTG_A_BUSREQ;
                        }
@@ -1100,9 +1099,9 @@ static u8 isp1301_clear_latch(struct isp1301 *isp)
 }
 static void
-isp1301_work(void *data)
+isp1301_work(struct work_struct *work)
 {
-        struct isp1301  *isp = data;
+        struct isp1301  *isp = container_of(work, struct isp1301, work);
        int             stop;
        /* implicit lock:  we're the only task using this device */
@@ -1244,7 +1243,7 @@ static int isp1301_detach_client(struct i2c_client *i2c)
 *  - DEVICE mode, for when there's a B/Mini-B (device) connector
 *
 * As a rule, you won't have an isp1301 chip unless it's there to
- * support the OTG mode.  Other modes help testing USB controllers 
+ * support the OTG mode.  Other modes help testing USB controllers
 * in isolation from (full) OTG support, or maybe so later board
 * revisions can help to support those feature.
 */
@@ -1260,9 +1259,9 @@ static int isp1301_otg_enable(struct isp1301 *isp)
         * a few more interrupts than are strictly needed.
         */
        isp1301_set_bits(isp, ISP1301_INTERRUPT_RISING,
-                INTR_VBUS_VLD | INTR_SESS_VLD | INTR_ID_GND);
+                INTR_VBUS_VLD | INTR_SESS_VLD | INTR_ID_GND);
        isp1301_set_bits(isp, ISP1301_INTERRUPT_FALLING,
-                INTR_VBUS_VLD | INTR_SESS_VLD | INTR_ID_GND);
+                INTR_VBUS_VLD | INTR_SESS_VLD | INTR_ID_GND);
        dev_info(&isp->client.dev, "ready for dual-role USB ...\n");
@@ -1306,9 +1305,9 @@ isp1301_set_host(struct otg_transceiver *otg, struct usb_bus *host)
        dev_info(&isp->client.dev, "A-Host sessions ok\n");
        isp1301_set_bits(isp, ISP1301_INTERRUPT_RISING,
-                INTR_ID_GND);
+                INTR_ID_GND);
        isp1301_set_bits(isp, ISP1301_INTERRUPT_FALLING,
-                INTR_ID_GND);
+                INTR_ID_GND);
        /* If this has a Mini-AB connector, this mode is highly
         * nonstandard ... but can be handy for testing, especially with
@@ -1368,9 +1367,9 @@ isp1301_set_peripheral(struct otg_transceiver *otg, struct usb_gadget *gadget)
                isp1301_set_bits(isp, ISP1301_MODE_CONTROL_1, MC1_DAT_SE0);
        isp1301_set_bits(isp, ISP1301_INTERRUPT_RISING,
-                INTR_SESS_VLD);
+                INTR_SESS_VLD);
        isp1301_set_bits(isp, ISP1301_INTERRUPT_FALLING,
-                INTR_VBUS_VLD);
+                INTR_VBUS_VLD);
        dev_info(&isp->client.dev, "B-Peripheral sessions ok\n");
        dump_regs(isp, __FUNCTION__);
@@ -1494,7 +1493,7 @@ static int isp1301_probe(struct i2c_adapter *bus, int address, int kind)
        if (!isp)
                return 0;
-        INIT_WORK(&isp->work, isp1301_work, isp);
+        INIT_WORK(&isp->work, isp1301_work);
        init_timer(&isp->timer);
        isp->timer.function = isp1301_timer;
        isp->timer.data = (unsigned long) isp;
@@ -1572,13 +1571,14 @@ fail1:
                /* IRQ wired at M14 */
                omap_cfg_reg(M14_1510_GPIO2);
                isp->irq = OMAP_GPIO_IRQ(2);
-                omap_request_gpio(2);
+                if (gpio_request(2, "isp1301") == 0)
-                omap_set_gpio_direction(2, 1);
+                        gpio_direction_input(2);
-                omap_set_gpio_edge_ctrl(2, OMAP_GPIO_FALLING_EDGE);
+                isp->irq_type = IRQF_TRIGGER_FALLING;
        }
+        isp->irq_type |= IRQF_SAMPLE_RANDOM;
        status = request_irq(isp->irq, isp1301_irq,
-                        IRQF_SAMPLE_RANDOM, DRIVER_NAME, isp);
+                        isp->irq_type, DRIVER_NAME, isp);
        if (status < 0) {
                dev_dbg(&i2c->dev, "can't get IRQ %d, err %d\n",
                                isp->irq, status);
diff --git a/drivers/i2c/chips/menelaus.c b/drivers/i2c/chips/menelaus.c
index 48a7e2f0bdd3..d9c92c5e0077 100644
--- a/drivers/i2c/chips/menelaus.c
+++ b/drivers/i2c/chips/menelaus.c
@@ -1,4 +1,3 @@
-#define DEBUG
 /*
 * Copyright (C) 2004 Texas Instruments, Inc.
 *
@@ -933,7 +932,7 @@ static int menelaus_set_time(struct device *dev, struct rtc_time *t)
                return status;
        status = menelaus_write_reg(MENELAUS_RTC_WKDAY, BIN2BCD(t->tm_wday));
        if (status < 0) {
-                dev_err(&the_menelaus->client->dev, "rtc write reg %02x",
+                dev_err(&the_menelaus->client->dev, "rtc write reg %02x "
                                "err %d\n", MENELAUS_RTC_WKDAY, status);
                return status;
        }
diff --git a/drivers/infiniband/core/agent.c b/drivers/infiniband/core/agent.c
index db2633e4aae6..ae7c2880e624 100644
--- a/drivers/infiniband/core/agent.c
+++ b/drivers/infiniband/core/agent.c
@@ -78,15 +78,14 @@ ib_get_agent_port(struct ib_device *device, int port_num)
        return entry;
 }
-int agent_send_response(struct ib_mad *mad, struct ib_grh *grh,
+void agent_send_response(struct ib_mad *mad, struct ib_grh *grh,
-                        struct ib_wc *wc, struct ib_device *device,
+                         struct ib_wc *wc, struct ib_device *device,
-                        int port_num, int qpn)
+                         int port_num, int qpn)
 {
        struct ib_agent_port_private *port_priv;
        struct ib_mad_agent *agent;
        struct ib_mad_send_buf *send_buf;
        struct ib_ah *ah;
-        int ret;
        struct ib_mad_send_wr_private *mad_send_wr;
        if (device->node_type == RDMA_NODE_IB_SWITCH)
@@ -96,23 +95,21 @@ int agent_send_response(struct ib_mad *mad, struct ib_grh *grh,
        if (!port_priv) {
                printk(KERN_ERR SPFX "Unable to find port agent\n");
-                return -ENODEV;
+                return;
        }
        agent = port_priv->agent[qpn];
        ah = ib_create_ah_from_wc(agent->qp->pd, wc, grh, port_num);
        if (IS_ERR(ah)) {
-                ret = PTR_ERR(ah);
+                printk(KERN_ERR SPFX "ib_create_ah_from_wc error\n");
-                printk(KERN_ERR SPFX "ib_create_ah_from_wc error:%d\n", ret);
+                return;
-                return ret;
        }
        send_buf = ib_create_send_mad(agent, wc->src_qp, wc->pkey_index, 0,
                                      IB_MGMT_MAD_HDR, IB_MGMT_MAD_DATA,
                                      GFP_KERNEL);
        if (IS_ERR(send_buf)) {
-                ret = PTR_ERR(send_buf);
+                printk(KERN_ERR SPFX "ib_create_send_mad error\n");
-                printk(KERN_ERR SPFX "ib_create_send_mad error:%d\n", ret);
                goto err1;
        }
@@ -126,16 +123,15 @@ int agent_send_response(struct ib_mad *mad, struct ib_grh *grh,
                mad_send_wr->send_wr.wr.ud.port_num = port_num;
        }
-        if ((ret = ib_post_send_mad(send_buf, NULL))) {
+        if (ib_post_send_mad(send_buf, NULL)) {
-                printk(KERN_ERR SPFX "ib_post_send_mad error:%d\n", ret);
+                printk(KERN_ERR SPFX "ib_post_send_mad error\n");
                goto err2;
        }
-        return 0;
+        return;
 err2:
        ib_free_send_mad(send_buf);
 err1:
        ib_destroy_ah(ah);
-        return ret;
 }
 static void agent_send_handler(struct ib_mad_agent *mad_agent,
diff --git a/drivers/infiniband/core/agent.h b/drivers/infiniband/core/agent.h
index 86d72fab37b0..fb9ed1489f95 100644
--- a/drivers/infiniband/core/agent.h
+++ b/drivers/infiniband/core/agent.h
@@ -46,8 +46,8 @@ extern int ib_agent_port_open(struct ib_device *device, int port_num);
 extern int ib_agent_port_close(struct ib_device *device, int port_num);
-extern int agent_send_response(struct ib_mad *mad, struct ib_grh *grh,
+extern void agent_send_response(struct ib_mad *mad, struct ib_grh *grh,
-                               struct ib_wc *wc, struct ib_device *device,
+                                struct ib_wc *wc, struct ib_device *device,
-                               int port_num, int qpn);
+                                int port_num, int qpn);
 #endif  /* __AGENT_H_ */
diff --git a/drivers/infiniband/core/device.c b/drivers/infiniband/core/device.c
index 3ada17c0f239..2506c43ba041 100644
--- a/drivers/infiniband/core/device.c
+++ b/drivers/infiniband/core/device.c
@@ -702,7 +702,7 @@ int ib_find_pkey(struct ib_device *device,
                if (ret)
                        return ret;
-                if (pkey == tmp_pkey) {
+                if ((pkey & 0x7fff) == (tmp_pkey & 0x7fff)) {
                        *index = i;
                        return 0;
                }
diff --git a/drivers/infiniband/core/mad.c b/drivers/infiniband/core/mad.c
index bc547f1d34ba..6f4287716ab1 100644
--- a/drivers/infiniband/core/mad.c
+++ b/drivers/infiniband/core/mad.c
@@ -1842,16 +1842,11 @@ static void ib_mad_recv_done_handler(struct ib_mad_port_private *port_priv,
 {
        struct ib_mad_qp_info *qp_info;
        struct ib_mad_private_header *mad_priv_hdr;
-        struct ib_mad_private *recv, *response;
+        struct ib_mad_private *recv, *response = NULL;
        struct ib_mad_list_head *mad_list;
        struct ib_mad_agent_private *mad_agent;
        int port_num;
-        response = kmem_cache_alloc(ib_mad_cache, GFP_KERNEL);
-        if (!response)
-                printk(KERN_ERR PFX "ib_mad_recv_done_handler no memory "
-                       "for response buffer\n");
        mad_list = (struct ib_mad_list_head *)(unsigned long)wc->wr_id;
        qp_info = mad_list->mad_queue->qp_info;
        dequeue_mad(mad_list);
@@ -1879,6 +1874,13 @@ static void ib_mad_recv_done_handler(struct ib_mad_port_private *port_priv,
        if (!validate_mad(&recv->mad.mad, qp_info->qp->qp_num))
                goto out;
+        response = kmem_cache_alloc(ib_mad_cache, GFP_KERNEL);
+        if (!response) {
+                printk(KERN_ERR PFX "ib_mad_recv_done_handler no memory "
+                       "for response buffer\n");
+                goto out;
+        }
        if (port_priv->device->node_type == RDMA_NODE_IB_SWITCH)
                port_num = wc->port_num;
        else
@@ -1914,12 +1916,11 @@ static void ib_mad_recv_done_handler(struct ib_mad_port_private *port_priv,
                        response->header.recv_wc.recv_buf.mad = &response->mad.mad;
                        response->header.recv_wc.recv_buf.grh = &response->grh;
-                        if (!agent_send_response(&response->mad.mad,
+                        agent_send_response(&response->mad.mad,
-                                                 &response->grh, wc,
+                                            &response->grh, wc,
-                                                 port_priv->device,
+                                            port_priv->device,
-                                                 smi_get_fwd_port(&recv->mad.smp),
+                                            smi_get_fwd_port(&recv->mad.smp),
-                                                 qp_info->qp->qp_num))
+                                            qp_info->qp->qp_num);
-                                response = NULL;
                        goto out;
                }
diff --git a/drivers/infiniband/core/mad_rmpp.c b/drivers/infiniband/core/mad_rmpp.c
index 3663fd7022be..d43bc62005b3 100644
--- a/drivers/infiniband/core/mad_rmpp.c
+++ b/drivers/infiniband/core/mad_rmpp.c
@@ -163,8 +163,10 @@ static struct ib_mad_send_buf *alloc_response_msg(struct ib_mad_agent *agent,
                                 hdr_len, 0, GFP_KERNEL);
        if (IS_ERR(msg))
                ib_destroy_ah(ah);
-        else
+        else {
                msg->ah = ah;
+                msg->context[0] = ah;
+        }
        return msg;
 }
@@ -197,9 +199,7 @@ static void ack_ds_ack(struct ib_mad_agent_private *agent,
 void ib_rmpp_send_handler(struct ib_mad_send_wc *mad_send_wc)
 {
-        struct ib_rmpp_mad *rmpp_mad = mad_send_wc->send_buf->mad;
+        if (mad_send_wc->send_buf->context[0] == mad_send_wc->send_buf->ah)
-        if (rmpp_mad->rmpp_hdr.rmpp_type != IB_MGMT_RMPP_TYPE_ACK)
                ib_destroy_ah(mad_send_wc->send_buf->ah);
        ib_free_send_mad(mad_send_wc->send_buf);
 }
diff --git a/drivers/infiniband/core/sa_query.c b/drivers/infiniband/core/sa_query.c
index 20ab6b3e484d..d271bd715c12 100644
--- a/drivers/infiniband/core/sa_query.c
+++ b/drivers/infiniband/core/sa_query.c
@@ -385,9 +385,7 @@ static void update_sm_ah(struct work_struct *work)
        new_ah->pkey_index = 0;
        if (ib_find_pkey(port->agent->device, port->port_num,
-                         IB_DEFAULT_PKEY_FULL, &new_ah->pkey_index) &&
+                         IB_DEFAULT_PKEY_FULL, &new_ah->pkey_index))
-            ib_find_pkey(port->agent->device, port->port_num,
-                         IB_DEFAULT_PKEY_PARTIAL, &new_ah->pkey_index))
                printk(KERN_ERR "Couldn't find index for default PKey\n");
        memset(&ah_attr, 0, sizeof ah_attr);
diff --git a/drivers/infiniband/core/umem.c b/drivers/infiniband/core/umem.c
index 26d0470eef6e..664d2faa9e74 100644
--- a/drivers/infiniband/core/umem.c
+++ b/drivers/infiniband/core/umem.c
@@ -40,6 +40,11 @@
 #include "uverbs.h"
+#define IB_UMEM_MAX_PAGE_CHUNK                                          \
+        ((PAGE_SIZE - offsetof(struct ib_umem_chunk, page_list)) /      \
+         ((void *) &((struct ib_umem_chunk *) 0)->page_list[1] -        \
+          (void *) &((struct ib_umem_chunk *) 0)->page_list[0]))
 static void __ib_umem_release(struct ib_device *dev, struct ib_umem *umem, int dirty)
 {
        struct ib_umem_chunk *chunk, *tmp;
diff --git a/drivers/infiniband/hw/cxgb3/iwch_cm.c b/drivers/infiniband/hw/cxgb3/iwch_cm.c
index 9574088f0d4e..1cdfcd43b0bc 100644
--- a/drivers/infiniband/hw/cxgb3/iwch_cm.c
+++ b/drivers/infiniband/hw/cxgb3/iwch_cm.c
@@ -139,7 +139,7 @@ static void release_tid(struct t3cdev *tdev, u32 hwtid, struct sk_buff *skb)
        req->wr.wr_hi = htonl(V_WR_OP(FW_WROPCODE_FORWARD));
        OPCODE_TID(req) = htonl(MK_OPCODE_TID(CPL_TID_RELEASE, hwtid));
        skb->priority = CPL_PRIORITY_SETUP;
-        tdev->send(tdev, skb);
+        cxgb3_ofld_send(tdev, skb);
        return;
 }
@@ -161,7 +161,7 @@ int iwch_quiesce_tid(struct iwch_ep *ep)
        req->val = cpu_to_be64(1 << S_TCB_RX_QUIESCE);
        skb->priority = CPL_PRIORITY_DATA;
-        ep->com.tdev->send(ep->com.tdev, skb);
+        cxgb3_ofld_send(ep->com.tdev, skb);
        return 0;
 }
@@ -183,7 +183,7 @@ int iwch_resume_tid(struct iwch_ep *ep)
        req->val = 0;
        skb->priority = CPL_PRIORITY_DATA;
-        ep->com.tdev->send(ep->com.tdev, skb);
+        cxgb3_ofld_send(ep->com.tdev, skb);
        return 0;
 }
@@ -784,7 +784,7 @@ static int update_rx_credits(struct iwch_ep *ep, u32 credits)
        OPCODE_TID(req) = htonl(MK_OPCODE_TID(CPL_RX_DATA_ACK, ep->hwtid));
        req->credit_dack = htonl(V_RX_CREDITS(credits) | V_RX_FORCE_ACK(1));
        skb->priority = CPL_PRIORITY_ACK;
-        ep->com.tdev->send(ep->com.tdev, skb);
+        cxgb3_ofld_send(ep->com.tdev, skb);
        return credits;
 }
@@ -1152,7 +1152,7 @@ static int listen_start(struct iwch_listen_ep *ep)
        req->opt1 = htonl(V_CONN_POLICY(CPL_CONN_POLICY_ASK));
        skb->priority = 1;
-        ep->com.tdev->send(ep->com.tdev, skb);
+        cxgb3_ofld_send(ep->com.tdev, skb);
        return 0;
 }
@@ -1186,7 +1186,7 @@ static int listen_stop(struct iwch_listen_ep *ep)
        req->cpu_idx = 0;
        OPCODE_TID(req) = htonl(MK_OPCODE_TID(CPL_CLOSE_LISTSRV_REQ, ep->stid));
        skb->priority = 1;
-        ep->com.tdev->send(ep->com.tdev, skb);
+        cxgb3_ofld_send(ep->com.tdev, skb);
        return 0;
 }
@@ -1264,7 +1264,7 @@ static void reject_cr(struct t3cdev *tdev, u32 hwtid, __be32 peer_ip,
                rpl->opt0l_status = htonl(CPL_PASS_OPEN_REJECT);
                rpl->opt2 = 0;
                rpl->rsvd = rpl->opt2;
-                tdev->send(tdev, skb);
+                cxgb3_ofld_send(tdev, skb);
        }
 }
@@ -1557,7 +1557,7 @@ static int peer_abort(struct t3cdev *tdev, struct sk_buff *skb, void *ctx)
        rpl->wr.wr_lo = htonl(V_WR_TID(ep->hwtid));
        OPCODE_TID(rpl) = htonl(MK_OPCODE_TID(CPL_ABORT_RPL, ep->hwtid));
        rpl->cmd = CPL_ABORT_NO_RST;
-        ep->com.tdev->send(ep->com.tdev, rpl_skb);
+        cxgb3_ofld_send(ep->com.tdev, rpl_skb);
        if (state != ABORTING) {
                state_set(&ep->com, DEAD);
                release_ep_resources(ep);
diff --git a/drivers/infiniband/hw/mlx4/cq.c b/drivers/infiniband/hw/mlx4/cq.c
index 660b27aecae5..8bf44daf45ec 100644
--- a/drivers/infiniband/hw/mlx4/cq.c
+++ b/drivers/infiniband/hw/mlx4/cq.c
@@ -389,7 +389,7 @@ static int mlx4_ib_poll_one(struct mlx4_ib_cq *cq,
                        wc->opcode    = IB_WC_SEND;
                        break;
                case MLX4_OPCODE_RDMA_READ:
-                        wc->opcode    = IB_WC_SEND;
+                        wc->opcode    = IB_WC_RDMA_READ;
                        wc->byte_len  = be32_to_cpu(cqe->byte_cnt);
                        break;
                case MLX4_OPCODE_ATOMIC_CS:
diff --git a/drivers/infiniband/hw/mlx4/mad.c b/drivers/infiniband/hw/mlx4/mad.c
index 333091787c5f..0ed02b7834da 100644
--- a/drivers/infiniband/hw/mlx4/mad.c
+++ b/drivers/infiniband/hw/mlx4/mad.c
@@ -109,7 +109,7 @@ int mlx4_MAD_IFC(struct mlx4_ib_dev *dev, int ignore_mkey, int ignore_bkey,
                           in_modifier, op_modifier,
                           MLX4_CMD_MAD_IFC, MLX4_CMD_TIME_CLASS_C);
-        if (!err);
+        if (!err)
                memcpy(response_mad, outmailbox->buf, 256);
        mlx4_free_cmd_mailbox(dev->dev, inmailbox);
diff --git a/drivers/infiniband/ulp/ipoib/ipoib_verbs.c b/drivers/infiniband/ulp/ipoib/ipoib_verbs.c
index 982eb88e27ec..563aeacf9e14 100644
--- a/drivers/infiniband/ulp/ipoib/ipoib_verbs.c
+++ b/drivers/infiniband/ulp/ipoib/ipoib_verbs.c
@@ -211,6 +211,7 @@ out_free_cq:
 out_free_mr:
        ib_dereg_mr(priv->mr);
+        ipoib_cm_dev_cleanup(dev);
 out_free_pd:
        ib_dealloc_pd(priv->pd);
diff --git a/drivers/infiniband/ulp/srp/ib_srp.c b/drivers/infiniband/ulp/srp/ib_srp.c
index f01ca182f226..f6a051428144 100644
--- a/drivers/infiniband/ulp/srp/ib_srp.c
+++ b/drivers/infiniband/ulp/srp/ib_srp.c
@@ -75,16 +75,12 @@ module_param(topspin_workarounds, int, 0444);
 MODULE_PARM_DESC(topspin_workarounds,
                 "Enable workarounds for Topspin/Cisco SRP target bugs if != 0");
-static const u8 topspin_oui[3] = { 0x00, 0x05, 0xad };
 static int mellanox_workarounds = 1;
 module_param(mellanox_workarounds, int, 0444);
 MODULE_PARM_DESC(mellanox_workarounds,
                 "Enable workarounds for Mellanox SRP target bugs if != 0");
-static const u8 mellanox_oui[3] = { 0x00, 0x02, 0xc9 };
 static void srp_add_one(struct ib_device *device);
 static void srp_remove_one(struct ib_device *device);
 static void srp_completion(struct ib_cq *cq, void *target_ptr);
@@ -108,6 +104,24 @@ static const char *srp_target_info(struct Scsi_Host *host)
        return host_to_target(host)->target_name;
 }
+static int srp_target_is_topspin(struct srp_target_port *target)
+{
+        static const u8 topspin_oui[3] = { 0x00, 0x05, 0xad };
+        static const u8 cisco_oui[3]   = { 0x00, 0x1b, 0x0d };
+        return topspin_workarounds &&
+                (!memcmp(&target->ioc_guid, topspin_oui, sizeof topspin_oui) ||
+                 !memcmp(&target->ioc_guid, cisco_oui, sizeof cisco_oui));
+}
+static int srp_target_is_mellanox(struct srp_target_port *target)
+{
+        static const u8 mellanox_oui[3] = { 0x00, 0x02, 0xc9 };
+        return mellanox_workarounds &&
+                !memcmp(&target->ioc_guid, mellanox_oui, sizeof mellanox_oui);
+}
 static struct srp_iu *srp_alloc_iu(struct srp_host *host, size_t size,
                                   gfp_t gfp_mask,
                                   enum dma_data_direction direction)
@@ -360,7 +374,7 @@ static int srp_send_req(struct srp_target_port *target)
         * zero out the first 8 bytes of our initiator port ID and set
         * the second 8 bytes to the local node GUID.
         */
-        if (topspin_workarounds && !memcmp(&target->ioc_guid, topspin_oui, 3)) {
+        if (srp_target_is_topspin(target)) {
                printk(KERN_DEBUG PFX "Topspin/Cisco initiator port ID workaround "
                       "activated for target GUID %016llx\n",
                       (unsigned long long) be64_to_cpu(target->ioc_guid));
@@ -585,8 +599,8 @@ static int srp_map_fmr(struct srp_target_port *target, struct scatterlist *scat,
        if (!dev->fmr_pool)
                return -ENODEV;
-        if ((ib_sg_dma_address(ibdev, &scat[0]) & ~dev->fmr_page_mask) &&
+        if (srp_target_is_mellanox(target) &&
-            mellanox_workarounds && !memcmp(&target->ioc_guid, mellanox_oui, 3))
+            (ib_sg_dma_address(ibdev, &scat[0]) & ~dev->fmr_page_mask))
                return -EINVAL;
        len = page_cnt = 0;
@@ -1087,8 +1101,7 @@ static void srp_cm_rej_handler(struct ib_cm_id *cm_id,
                break;
        case IB_CM_REJ_PORT_REDIRECT:
-                if (topspin_workarounds &&
+                if (srp_target_is_topspin(target)) {
-                    !memcmp(&target->ioc_guid, topspin_oui, 3)) {
                        /*
                         * Topspin/Cisco SRP gateways incorrectly send
                         * reject reason code 25 when they mean 24
diff --git a/drivers/kvm/Kconfig b/drivers/kvm/Kconfig
index 6cecc396e040..7b64fd4aa2f3 100644
--- a/drivers/kvm/Kconfig
+++ b/drivers/kvm/Kconfig
@@ -5,6 +5,11 @@ menuconfig VIRTUALIZATION
        bool "Virtualization"
        depends on X86
        default y
+        ---help---
+          Say Y here to get to see options for virtualization guest drivers.
+          This option alone does not add any kernel code.
+          If you say N, all options in this submenu will be skipped and disabled.
 if VIRTUALIZATION
diff --git a/drivers/lguest/lguest.c b/drivers/lguest/lguest.c
index 524beea7fb19..6e135ac0834f 100644
--- a/drivers/lguest/lguest.c
+++ b/drivers/lguest/lguest.c
@@ -936,23 +936,24 @@ static const struct lguest_insns
 /* Now our patch routine is fairly simple (based on the native one in
 * paravirt.c).  If we have a replacement, we copy it in and return how much of
 * the available space we used. */
-static unsigned lguest_patch(u8 type, u16 clobber, void *insns, unsigned len)
+static unsigned lguest_patch(u8 type, u16 clobber, void *ibuf,
+                             unsigned long addr, unsigned len)
 {
        unsigned int insn_len;
        /* Don't do anything special if we don't have a replacement */
        if (type >= ARRAY_SIZE(lguest_insns) || !lguest_insns[type].start)
-                return paravirt_patch_default(type, clobber, insns, len);
+                return paravirt_patch_default(type, clobber, ibuf, addr, len);
        insn_len = lguest_insns[type].end - lguest_insns[type].start;
        /* Similarly if we can't fit replacement (shouldn't happen, but let's
         * be thorough). */
        if (len < insn_len)
-                return paravirt_patch_default(type, clobber, insns, len);
+                return paravirt_patch_default(type, clobber, ibuf, addr, len);
        /* Copy in our instructions. */
-        memcpy(insns, lguest_insns[type].start, insn_len);
+        memcpy(ibuf, lguest_insns[type].start, insn_len);
        return insn_len;
 }
diff --git a/drivers/lguest/lguest_bus.c b/drivers/lguest/lguest_bus.c
index 55a7940ca732..9e7752cc8002 100644
--- a/drivers/lguest/lguest_bus.c
+++ b/drivers/lguest/lguest_bus.c
@@ -5,6 +5,7 @@
 #include <linux/bootmem.h>
 #include <linux/lguest_bus.h>
 #include <asm/io.h>
+#include <asm/paravirt.h>
 static ssize_t type_show(struct device *_dev,
                         struct device_attribute *attr, char *buf)
diff --git a/drivers/macintosh/Kconfig b/drivers/macintosh/Kconfig
index dbe96268866e..56cd8998fe4b 100644
--- a/drivers/macintosh/Kconfig
+++ b/drivers/macintosh/Kconfig
@@ -3,6 +3,11 @@ menuconfig MACINTOSH_DRIVERS
        bool "Macintosh device drivers"
        depends on PPC || MAC || X86
        default y if (PPC_PMAC || MAC)
+        ---help---
+          Say Y here to get to see options for devices used with Macintosh
+          computers. This option alone does not add any kernel code.
+          If you say N, all options in this submenu will be skipped and disabled.
 if MACINTOSH_DRIVERS
diff --git a/drivers/md/dm.c b/drivers/md/dm.c
index 141ff9fa296e..2120155929a6 100644
--- a/drivers/md/dm.c
+++ b/drivers/md/dm.c
@@ -580,8 +580,8 @@ static void __map_bio(struct dm_target *ti, struct bio *clone,
                /* the bio has been remapped so dispatch it */
                blk_add_trace_remap(bdev_get_queue(clone->bi_bdev), clone,
-                                    tio->io->bio->bi_bdev->bd_dev, sector,
+                                    tio->io->bio->bi_bdev->bd_dev,
-                                    clone->bi_sector);
+                                    clone->bi_sector, sector);
                generic_make_request(clone);
        } else if (r < 0 || r == DM_MAPIO_REQUEUE) {
diff --git a/drivers/misc/Kconfig b/drivers/misc/Kconfig
index aaaa61ea4217..a26655881e6a 100644
--- a/drivers/misc/Kconfig
+++ b/drivers/misc/Kconfig
@@ -5,6 +5,11 @@
 menuconfig MISC_DEVICES
        bool "Misc devices"
        default y
+        ---help---
+          Say Y here to get to see options for device drivers from various
+          different categories. This option alone does not add any kernel code.
+          If you say N, all options in this submenu will be skipped and disabled.
 if MISC_DEVICES
@@ -200,14 +205,22 @@ config THINKPAD_ACPI_BAY
 config THINKPAD_ACPI_INPUT_ENABLED
        bool "Enable input layer support by default"
        depends on THINKPAD_ACPI
-        default y
+        default n
        ---help---
-          Enables hot key handling over the input layer by default.  If unset,
+          This option enables thinkpad-acpi hot key handling over the input
-          the driver does not enable any hot key handling by default, and also
+          layer at driver load time.  When it is unset, the driver does not
-          starts up with a mostly empty keymap.
+          enable hot key handling by default, and also starts up with a mostly
+          empty keymap.
-          If you are not sure, say Y here.  Say N to retain the deprecated
-          behavior of ibm-acpi, and thinkpad-acpi for kernels up to 2.6.21.
+          This option should be enabled if you have a new enough HAL or other
+          userspace support that properly handles the thinkpad-acpi event
+          device.  It auto-tunes the hot key support to those reported by the
+          firmware and enables it automatically.
+          If unsure, say N here to retain the old behaviour of ibm-acpi, and
+          thinkpad-acpi up to kernel 2.6.21: userspace will have to enable and
+          set up the thinkpad-acpi hot key handling using the sysfs interace
+          after loading the driver.
 endif # MISC_DEVICES
diff --git a/drivers/misc/sony-laptop.c b/drivers/misc/sony-laptop.c
index 14ee06c8f127..91da6880ae93 100644
--- a/drivers/misc/sony-laptop.c
+++ b/drivers/misc/sony-laptop.c
@@ -845,7 +845,7 @@ static struct sony_nc_event sony_C_events[] = {
 };
 /* SNC-only model map */
-struct dmi_system_id sony_nc_ids[] = {
+static struct dmi_system_id sony_nc_ids[] = {
                {
                        .ident = "Sony Vaio FE Series",
                        .callback = sony_nc_C_enable,
@@ -942,6 +942,11 @@ static int sony_nc_resume(struct acpi_device *device)
                }
        }
+        /* set the last requested brightness level */
+        if (sony_backlight_device &&
+                        !sony_backlight_update_status(sony_backlight_device))
+                printk(KERN_WARNING DRV_PFX "unable to restore brightness level");
        /* re-initialize models with specific requirements */
        dmi_check_system(sony_nc_ids);
diff --git a/drivers/misc/thinkpad_acpi.c b/drivers/misc/thinkpad_acpi.c
index fa80f355e522..f6cd34a3dbac 100644
--- a/drivers/misc/thinkpad_acpi.c
+++ b/drivers/misc/thinkpad_acpi.c
@@ -4668,12 +4668,15 @@ static int __init thinkpad_acpi_module_init(void)
                thinkpad_acpi_module_exit();
                return ret;
        }
+        tp_features.platform_drv_registered = 1;
        ret = tpacpi_create_driver_attributes(&tpacpi_pdriver.driver);
        if (ret) {
                printk(IBM_ERR "unable to create sysfs driver attributes\n");
                thinkpad_acpi_module_exit();
                return ret;
        }
+        tp_features.platform_drv_attrs_registered = 1;
        /* Device initialization */
@@ -4756,8 +4759,11 @@ static void thinkpad_acpi_module_exit(void)
        if (tpacpi_pdev)
                platform_device_unregister(tpacpi_pdev);
-        tpacpi_remove_driver_attributes(&tpacpi_pdriver.driver);
+        if (tp_features.platform_drv_attrs_registered)
-        platform_driver_unregister(&tpacpi_pdriver);
+                tpacpi_remove_driver_attributes(&tpacpi_pdriver.driver);
+        if (tp_features.platform_drv_registered)
+                platform_driver_unregister(&tpacpi_pdriver);
        if (proc_dir)
                remove_proc_entry(IBM_PROC_DIR, acpi_root_dir);
diff --git a/drivers/misc/thinkpad_acpi.h b/drivers/misc/thinkpad_acpi.h
index 88af089d6494..eee8809a50d9 100644
--- a/drivers/misc/thinkpad_acpi.h
+++ b/drivers/misc/thinkpad_acpi.h
@@ -246,6 +246,8 @@ static struct {
        u16 wan:1;
        u16 fan_ctrl_status_undef:1;
        u16 input_device_registered:1;
+        u16 platform_drv_registered:1;
+        u16 platform_drv_attrs_registered:1;
 } tp_features;
 struct thinkpad_id_data {
diff --git a/drivers/mtd/mtdchar.c b/drivers/mtd/mtdchar.c
index 8c86b802f212..d091b2430b48 100644
--- a/drivers/mtd/mtdchar.c
+++ b/drivers/mtd/mtdchar.c
@@ -7,6 +7,7 @@
 #include <linux/device.h>
 #include <linux/fs.h>
+#include <linux/mm.h>
 #include <linux/err.h>
 #include <linux/init.h>
 #include <linux/kernel.h>
diff --git a/drivers/net/3c59x.c b/drivers/net/3c59x.c
index 001c66dd3a94..a8c0f436cdd2 100644
--- a/drivers/net/3c59x.c
+++ b/drivers/net/3c59x.c
@@ -1555,6 +1555,7 @@ vortex_up(struct net_device *dev)
                mii_reg1 = mdio_read(dev, vp->phys[0], MII_BMSR);
                mii_reg5 = mdio_read(dev, vp->phys[0], MII_LPA);
                vp->partner_flow_ctrl = ((mii_reg5 & 0x0400) != 0);
+                vp->mii.full_duplex = vp->full_duplex;
                vortex_check_media(dev, 1);
        }
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index 81ef81c9a584..5b9e17bf1749 100644
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -1968,6 +1968,16 @@ menuconfig NETDEV_1000
        bool "Ethernet (1000 Mbit)"
        depends on !UML
        default y
+        ---help---
+          Ethernet (also called IEEE 802.3 or ISO 8802-2) is the most common
+          type of Local Area Network (LAN) in universities and companies.
+          Say Y here to get to see options for Gigabit Ethernet drivers.
+          This option alone does not add any kernel code.
+          Note that drivers supporting both 100 and 1000 MBit may be listed
+          under "Ethernet (10 or 100MBit)" instead.
+          If you say N, all options in this submenu will be skipped and disabled.
 if NETDEV_1000
@@ -2339,6 +2349,11 @@ menuconfig NETDEV_10000
        bool "Ethernet (10000 Mbit)"
        depends on !UML
        default y
+        ---help---
+          Say Y here to get to see options for 10 Gigabit Ethernet drivers.
+          This option alone does not add any kernel code.
+          If you say N, all options in this submenu will be skipped and disabled.
 if NETDEV_10000
diff --git a/drivers/net/ax88796.c b/drivers/net/ax88796.c
index 83da1770bafb..90e0734e6037 100644
--- a/drivers/net/ax88796.c
+++ b/drivers/net/ax88796.c
@@ -821,8 +821,9 @@ static int ax_probe(struct platform_device *pdev)
        dev->base_addr = (unsigned long)ei_status.mem;
        if (ei_status.mem == NULL) {
-                dev_err(&pdev->dev, "Cannot ioremap area (%08zx,%08zx)\n",
+                dev_err(&pdev->dev, "Cannot ioremap area (%08llx,%08llx)\n",
-                        res->start, res->end);
+                        (unsigned long long)res->start,
+                        (unsigned long long)res->end);
                ret = -ENXIO;
                goto exit_req;
diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c
index 070b78d959cc..1afda3230def 100644
--- a/drivers/net/bonding/bond_main.c
+++ b/drivers/net/bonding/bond_main.c
@@ -1202,43 +1202,35 @@ static int bond_sethwaddr(struct net_device *bond_dev,
        return 0;
 }
-#define BOND_INTERSECT_FEATURES \
+#define BOND_VLAN_FEATURES \
-        (NETIF_F_SG | NETIF_F_ALL_CSUM | NETIF_F_TSO | NETIF_F_UFO)
+        (NETIF_F_VLAN_CHALLENGED | NETIF_F_HW_VLAN_RX | NETIF_F_HW_VLAN_TX | \
+         NETIF_F_HW_VLAN_FILTER)
 /* 
 * Compute the common dev->feature set available to all slaves.  Some
- * feature bits are managed elsewhere, so preserve feature bits set on
+ * feature bits are managed elsewhere, so preserve those feature bits
- * master device that are not part of the examined set.
+ * on the master device.
 */
 static int bond_compute_features(struct bonding *bond)
 {
-        unsigned long features = BOND_INTERSECT_FEATURES;
        struct slave *slave;
        struct net_device *bond_dev = bond->dev;
+        unsigned long features = bond_dev->features;
        unsigned short max_hard_header_len = ETH_HLEN;
        int i;
+        features &= ~(NETIF_F_ALL_CSUM | BOND_VLAN_FEATURES);
+        features |= NETIF_F_SG | NETIF_F_FRAGLIST | NETIF_F_HIGHDMA |
+                    NETIF_F_GSO_MASK | NETIF_F_NO_CSUM;
        bond_for_each_slave(bond, slave, i) {
-                features &= (slave->dev->features & BOND_INTERSECT_FEATURES);
+                features = netdev_compute_features(features,
+                                                   slave->dev->features);
                if (slave->dev->hard_header_len > max_hard_header_len)
                        max_hard_header_len = slave->dev->hard_header_len;
        }
-        if ((features & NETIF_F_SG) && 
+        features |= (bond_dev->features & BOND_VLAN_FEATURES);
-            !(features & NETIF_F_ALL_CSUM))
-                features &= ~NETIF_F_SG;
-        /* 
-         * features will include NETIF_F_TSO (NETIF_F_UFO) iff all 
-         * slave devices support NETIF_F_TSO (NETIF_F_UFO), which 
-         * implies that all slaves also support scatter-gather 
-         * (NETIF_F_SG), which implies that features also includes 
-         * NETIF_F_SG. So no need to check whether we have an  
-         * illegal combination of NETIF_F_{TSO,UFO} and 
-         * !NETIF_F_SG 
-         */
-        features |= (bond_dev->features & ~BOND_INTERSECT_FEATURES);
        bond_dev->features = features;
        bond_dev->hard_header_len = max_hard_header_len;
diff --git a/drivers/net/e1000/e1000_ethtool.c b/drivers/net/e1000/e1000_ethtool.c
index c90c92e72d2a..4c3785c9d4b8 100644
--- a/drivers/net/e1000/e1000_ethtool.c
+++ b/drivers/net/e1000/e1000_ethtool.c
@@ -1706,6 +1706,7 @@ static int e1000_wol_exclusion(struct e1000_adapter *adapter, struct ethtool_wol
        case E1000_DEV_ID_82545EM_COPPER:
        case E1000_DEV_ID_82546GB_QUAD_COPPER:
        case E1000_DEV_ID_82546GB_PCIE:
+        case E1000_DEV_ID_82571EB_SERDES_QUAD:
                /* these don't support WoL at all */
                wol->supported = 0;
                break;
@@ -1723,6 +1724,7 @@ static int e1000_wol_exclusion(struct e1000_adapter *adapter, struct ethtool_wol
                retval = 0;
                break;
        case E1000_DEV_ID_82571EB_QUAD_COPPER:
+        case E1000_DEV_ID_82571EB_QUAD_FIBER:
        case E1000_DEV_ID_82571EB_QUAD_COPPER_LOWPROFILE:
        case E1000_DEV_ID_82546GB_QUAD_COPPER_KSP3:
                /* quad port adapters only support WoL on port A */
diff --git a/drivers/net/e1000/e1000_hw.c b/drivers/net/e1000/e1000_hw.c
index 9be44699300b..ba120f7fb0be 100644
--- a/drivers/net/e1000/e1000_hw.c
+++ b/drivers/net/e1000/e1000_hw.c
@@ -384,7 +384,10 @@ e1000_set_mac_type(struct e1000_hw *hw)
        case E1000_DEV_ID_82571EB_COPPER:
        case E1000_DEV_ID_82571EB_FIBER:
        case E1000_DEV_ID_82571EB_SERDES:
+        case E1000_DEV_ID_82571EB_SERDES_DUAL:
+        case E1000_DEV_ID_82571EB_SERDES_QUAD:
        case E1000_DEV_ID_82571EB_QUAD_COPPER:
+        case E1000_DEV_ID_82571EB_QUAD_FIBER:
        case E1000_DEV_ID_82571EB_QUAD_COPPER_LOWPROFILE:
                hw->mac_type = e1000_82571;
                break;
@@ -485,6 +488,8 @@ e1000_set_media_type(struct e1000_hw *hw)
    case E1000_DEV_ID_82545GM_SERDES:
    case E1000_DEV_ID_82546GB_SERDES:
    case E1000_DEV_ID_82571EB_SERDES:
+    case E1000_DEV_ID_82571EB_SERDES_DUAL:
+    case E1000_DEV_ID_82571EB_SERDES_QUAD:
    case E1000_DEV_ID_82572EI_SERDES:
    case E1000_DEV_ID_80003ES2LAN_SERDES_DPT:
        hw->media_type = e1000_media_type_internal_serdes;
diff --git a/drivers/net/e1000/e1000_hw.h b/drivers/net/e1000/e1000_hw.h
index bd000b802ee7..fe8714655c90 100644
--- a/drivers/net/e1000/e1000_hw.h
+++ b/drivers/net/e1000/e1000_hw.h
@@ -475,7 +475,10 @@ int32_t e1000_check_phy_reset_block(struct e1000_hw *hw);
 #define E1000_DEV_ID_82571EB_FIBER       0x105F
 #define E1000_DEV_ID_82571EB_SERDES      0x1060
 #define E1000_DEV_ID_82571EB_QUAD_COPPER 0x10A4
+#define E1000_DEV_ID_82571EB_QUAD_FIBER  0x10A5
 #define E1000_DEV_ID_82571EB_QUAD_COPPER_LOWPROFILE  0x10BC
+#define E1000_DEV_ID_82571EB_SERDES_DUAL 0x10D9
+#define E1000_DEV_ID_82571EB_SERDES_QUAD 0x10DA
 #define E1000_DEV_ID_82572EI_COPPER      0x107D
 #define E1000_DEV_ID_82572EI_FIBER       0x107E
 #define E1000_DEV_ID_82572EI_SERDES      0x107F
diff --git a/drivers/net/e1000/e1000_main.c b/drivers/net/e1000/e1000_main.c
index f48b659e0c2b..4a225950fb43 100644
--- a/drivers/net/e1000/e1000_main.c
+++ b/drivers/net/e1000/e1000_main.c
@@ -100,6 +100,7 @@ static struct pci_device_id e1000_pci_tbl[] = {
        INTEL_E1000_ETHERNET_DEVICE(0x1099),
        INTEL_E1000_ETHERNET_DEVICE(0x109A),
        INTEL_E1000_ETHERNET_DEVICE(0x10A4),
+        INTEL_E1000_ETHERNET_DEVICE(0x10A5),
        INTEL_E1000_ETHERNET_DEVICE(0x10B5),
        INTEL_E1000_ETHERNET_DEVICE(0x10B9),
        INTEL_E1000_ETHERNET_DEVICE(0x10BA),
@@ -107,6 +108,8 @@ static struct pci_device_id e1000_pci_tbl[] = {
        INTEL_E1000_ETHERNET_DEVICE(0x10BC),
        INTEL_E1000_ETHERNET_DEVICE(0x10C4),
        INTEL_E1000_ETHERNET_DEVICE(0x10C5),
+        INTEL_E1000_ETHERNET_DEVICE(0x10D9),
+        INTEL_E1000_ETHERNET_DEVICE(0x10DA),
        /* required last entry */
        {0,}
 };
@@ -1096,6 +1099,7 @@ e1000_probe(struct pci_dev *pdev,
                break;
        case E1000_DEV_ID_82546GB_QUAD_COPPER_KSP3:
        case E1000_DEV_ID_82571EB_QUAD_COPPER:
+        case E1000_DEV_ID_82571EB_QUAD_FIBER:
        case E1000_DEV_ID_82571EB_QUAD_COPPER_LOWPROFILE:
                /* if quad port adapter, disable WoL on all but port A */
                if (global_quad_port_a != 0)
diff --git a/drivers/net/forcedeth.c b/drivers/net/forcedeth.c
index 69f5f365239a..10f4e3b55168 100644
--- a/drivers/net/forcedeth.c
+++ b/drivers/net/forcedeth.c
@@ -3068,8 +3068,8 @@ static irqreturn_t nv_nic_irq(int foo, void *data)
                                np->nic_poll_irq = np->irqmask;
                                mod_timer(&np->nic_poll, jiffies + POLL_WAIT);
                        }
-                        printk(KERN_DEBUG "%s: too many iterations (%d) in nv_nic_irq.\n", dev->name, i);
                        spin_unlock(&np->lock);
+                        printk(KERN_DEBUG "%s: too many iterations (%d) in nv_nic_irq.\n", dev->name, i);
                        break;
                }
@@ -3186,8 +3186,8 @@ static irqreturn_t nv_nic_irq_optimized(int foo, void *data)
                                np->nic_poll_irq = np->irqmask;
                                mod_timer(&np->nic_poll, jiffies + POLL_WAIT);
                        }
-                        printk(KERN_DEBUG "%s: too many iterations (%d) in nv_nic_irq.\n", dev->name, i);
                        spin_unlock(&np->lock);
+                        printk(KERN_DEBUG "%s: too many iterations (%d) in nv_nic_irq.\n", dev->name, i);
                        break;
                }
@@ -3233,8 +3233,8 @@ static irqreturn_t nv_nic_irq_tx(int foo, void *data)
                                np->nic_poll_irq |= NVREG_IRQ_TX_ALL;
                                mod_timer(&np->nic_poll, jiffies + POLL_WAIT);
                        }
-                        printk(KERN_DEBUG "%s: too many iterations (%d) in nv_nic_irq_tx.\n", dev->name, i);
                        spin_unlock_irqrestore(&np->lock, flags);
+                        printk(KERN_DEBUG "%s: too many iterations (%d) in nv_nic_irq_tx.\n", dev->name, i);
                        break;
                }
@@ -3348,8 +3348,8 @@ static irqreturn_t nv_nic_irq_rx(int foo, void *data)
                                np->nic_poll_irq |= NVREG_IRQ_RX_ALL;
                                mod_timer(&np->nic_poll, jiffies + POLL_WAIT);
                        }
-                        printk(KERN_DEBUG "%s: too many iterations (%d) in nv_nic_irq_rx.\n", dev->name, i);
                        spin_unlock_irqrestore(&np->lock, flags);
+                        printk(KERN_DEBUG "%s: too many iterations (%d) in nv_nic_irq_rx.\n", dev->name, i);
                        break;
                }
        }
@@ -3421,8 +3421,8 @@ static irqreturn_t nv_nic_irq_other(int foo, void *data)
                                np->nic_poll_irq |= NVREG_IRQ_OTHER;
                                mod_timer(&np->nic_poll, jiffies + POLL_WAIT);
                        }
-                        printk(KERN_DEBUG "%s: too many iterations (%d) in nv_nic_irq_other.\n", dev->name, i);
                        spin_unlock_irqrestore(&np->lock, flags);
+                        printk(KERN_DEBUG "%s: too many iterations (%d) in nv_nic_irq_other.\n", dev->name, i);
                        break;
                }
diff --git a/drivers/net/irda/irda-usb.c b/drivers/net/irda/irda-usb.c
index 0ac240ca905b..3b0fd83fa266 100644
--- a/drivers/net/irda/irda-usb.c
+++ b/drivers/net/irda/irda-usb.c
@@ -1561,10 +1561,9 @@ static inline struct irda_class_desc *irda_usb_find_class_desc(struct usb_interf
        struct irda_class_desc *desc;
        int ret;
-        desc = kmalloc(sizeof (*desc), GFP_KERNEL);
+        desc = kzalloc(sizeof(*desc), GFP_KERNEL);
-        if (desc == NULL) 
+        if (!desc)
                return NULL;
-        memset(desc, 0, sizeof(*desc));
        /* USB-IrDA class spec 1.0:
         *      6.1.3: Standard "Get Descriptor" Device Request is not
@@ -1617,7 +1616,7 @@ static int irda_usb_probe(struct usb_interface *intf,
 {
        struct net_device *net;
        struct usb_device *dev = interface_to_usbdev(intf);
-        struct irda_usb_cb *self = NULL;
+        struct irda_usb_cb *self;
        struct usb_host_interface *interface;
        struct irda_class_desc *irda_desc;
        int ret = -ENOMEM;
@@ -1655,7 +1654,7 @@ static int irda_usb_probe(struct usb_interface *intf,
                self->header_length = USB_IRDA_HEADER;
        }
-        self->rx_urb = kzalloc(self->max_rx_urb * sizeof(struct urb *),
+        self->rx_urb = kcalloc(self->max_rx_urb, sizeof(struct urb *),
                                GFP_KERNEL);
        for (i = 0; i < self->max_rx_urb; i++) {
@@ -1715,7 +1714,7 @@ static int irda_usb_probe(struct usb_interface *intf,
        /* Find IrDA class descriptor */
        irda_desc = irda_usb_find_class_desc(intf);
        ret = -ENODEV;
-        if (irda_desc == NULL)
+        if (!irda_desc)
                goto err_out_3;
        if (self->needspatch) {
@@ -1738,15 +1737,13 @@ static int irda_usb_probe(struct usb_interface *intf,
        /* Don't change this buffer size and allocation without doing
         * some heavy and complete testing. Don't ask why :-(
         * Jean II */
-        self->speed_buff = kmalloc(IRDA_USB_SPEED_MTU, GFP_KERNEL);
+        self->speed_buff = kzalloc(IRDA_USB_SPEED_MTU, GFP_KERNEL);
-        if (self->speed_buff == NULL) 
+        if (!self->speed_buff)
                goto err_out_3;
-        memset(self->speed_buff, 0, IRDA_USB_SPEED_MTU);
        self->tx_buff = kzalloc(IRDA_SKB_MAX_MTU + self->header_length,
                                GFP_KERNEL);
-        if (self->tx_buff == NULL)
+        if (!self->tx_buff)
                goto err_out_4;
        ret = irda_usb_open(self);
@@ -1767,12 +1764,11 @@ static int irda_usb_probe(struct usb_interface *intf,
                /* replace IrDA class descriptor with what patched device is now reporting */
                irda_desc = irda_usb_find_class_desc (self->usbintf);
-                if (irda_desc == NULL) {
+                if (!irda_desc) {
                        ret = -ENODEV;
                        goto err_out_6;
                }
-                if (self->irda_desc)
+                kfree(self->irda_desc);
-                        kfree (self->irda_desc);
                self->irda_desc = irda_desc;
                irda_usb_init_qos(self);
        }
diff --git a/drivers/net/mlx4/reset.c b/drivers/net/mlx4/reset.c
index e4dfd4b11a4a..e199715fabd0 100644
--- a/drivers/net/mlx4/reset.c
+++ b/drivers/net/mlx4/reset.c
@@ -119,6 +119,9 @@ int mlx4_reset(struct mlx4_dev *dev)
        writel(MLX4_RESET_VALUE, reset + MLX4_RESET_OFFSET);
        iounmap(reset);
+        /* Docs say to wait one second before accessing device */
+        msleep(1000);
        end = jiffies + MLX4_RESET_TIMEOUT_JIFFIES;
        do {
                if (!pci_read_config_word(dev->pdev, PCI_VENDOR_ID, &vendor) &&
diff --git a/drivers/net/myri10ge/myri10ge.c b/drivers/net/myri10ge/myri10ge.c
index deca65330b0f..ae9bb7b7fd67 100644
--- a/drivers/net/myri10ge/myri10ge.c
+++ b/drivers/net/myri10ge/myri10ge.c
@@ -191,6 +191,7 @@ struct myri10ge_priv {
        struct timer_list watchdog_timer;
        int watchdog_tx_done;
        int watchdog_tx_req;
+        int watchdog_pause;
        int watchdog_resets;
        int tx_linearized;
        int pause;
@@ -2800,6 +2801,7 @@ static void myri10ge_watchdog(struct work_struct *work)
 static void myri10ge_watchdog_timer(unsigned long arg)
 {
        struct myri10ge_priv *mgp;
+        u32 rx_pause_cnt;
        mgp = (struct myri10ge_priv *)arg;
@@ -2816,19 +2818,28 @@ static void myri10ge_watchdog_timer(unsigned long arg)
                    myri10ge_fill_thresh)
                        mgp->rx_big.watchdog_needed = 0;
        }
+        rx_pause_cnt = ntohl(mgp->fw_stats->dropped_pause);
        if (mgp->tx.req != mgp->tx.done &&
            mgp->tx.done == mgp->watchdog_tx_done &&
-            mgp->watchdog_tx_req != mgp->watchdog_tx_done)
+            mgp->watchdog_tx_req != mgp->watchdog_tx_done) {
                /* nic seems like it might be stuck.. */
-                schedule_work(&mgp->watchdog_work);
+                if (rx_pause_cnt != mgp->watchdog_pause) {
-        else
+                        if (net_ratelimit())
-                /* rearm timer */
+                                printk(KERN_WARNING "myri10ge %s:"
-                mod_timer(&mgp->watchdog_timer,
+                                       "TX paused, check link partner\n",
-                          jiffies + myri10ge_watchdog_timeout * HZ);
+                                       mgp->dev->name);
+                } else {
+                        schedule_work(&mgp->watchdog_work);
+                        return;
+                }
+        }
+        /* rearm timer */
+        mod_timer(&mgp->watchdog_timer,
+                  jiffies + myri10ge_watchdog_timeout * HZ);
        mgp->watchdog_tx_done = mgp->tx.done;
        mgp->watchdog_tx_req = mgp->tx.req;
+        mgp->watchdog_pause = rx_pause_cnt;
 }
 static int myri10ge_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
diff --git a/drivers/net/natsemi.c b/drivers/net/natsemi.c
index 6bb48ba80964..b47a12d684f9 100644
--- a/drivers/net/natsemi.c
+++ b/drivers/net/natsemi.c
@@ -2438,13 +2438,16 @@ static void netdev_error(struct net_device *dev, int intr_status)
                                dev->name);
                }
                np->stats.rx_fifo_errors++;
+                np->stats.rx_errors++;
        }
        /* Hmmmmm, it's not clear how to recover from PCI faults. */
        if (intr_status & IntrPCIErr) {
                printk(KERN_NOTICE "%s: PCI error %#08x\n", dev->name,
                        intr_status & IntrPCIErr);
                np->stats.tx_fifo_errors++;
+                np->stats.tx_errors++;
                np->stats.rx_fifo_errors++;
+                np->stats.rx_errors++;
        }
        spin_unlock(&np->lock);
 }
diff --git a/drivers/net/via-rhine.c b/drivers/net/via-rhine.c
index c3fe230695a0..b56dff26772d 100644
--- a/drivers/net/via-rhine.c
+++ b/drivers/net/via-rhine.c
@@ -42,7 +42,13 @@ static int max_interrupt_work = 20;
 /* Set the copy breakpoint for the copy-only-tiny-frames scheme.
   Setting to > 1518 effectively disables this feature. */
+#if defined(__alpha__) || defined(__arm__) || defined(__hppa__) \
+       || defined(CONFIG_SPARC) || defined(__ia64__) \
+       || defined(__sh__) || defined(__mips__)
+static int rx_copybreak = 1518;
+#else
 static int rx_copybreak;
+#endif
 /* Work-around for broken BIOSes: they are unable to get the chip back out of
   power state D3 so PXE booting fails. bootparam(7): via-rhine.avoid_D3=1 */
diff --git a/drivers/net/wan/hdlc_fr.c b/drivers/net/wan/hdlc_fr.c
index 15b6e07a4382..071a64cacd5c 100644
--- a/drivers/net/wan/hdlc_fr.c
+++ b/drivers/net/wan/hdlc_fr.c
@@ -212,14 +212,13 @@ static pvc_device* add_pvc(struct net_device *dev, u16 dlci)
                pvc_p = &(*pvc_p)->next;
        }
-        pvc = kmalloc(sizeof(pvc_device), GFP_ATOMIC);
+        pvc = kzalloc(sizeof(pvc_device), GFP_ATOMIC);
 #ifdef DEBUG_PVC
        printk(KERN_DEBUG "add_pvc: allocated pvc %p, frad %p\n", pvc, dev);
 #endif
        if (!pvc)
                return NULL;
-        memset(pvc, 0, sizeof(pvc_device));
        pvc->dlci = dlci;
        pvc->frad = dev;
        pvc->next = *pvc_p;     /* Put it in the chain */
diff --git a/drivers/net/xen-netfront.c b/drivers/net/xen-netfront.c
index 489f69c5d6ca..4445810335a8 100644
--- a/drivers/net/xen-netfront.c
+++ b/drivers/net/xen-netfront.c
@@ -566,6 +566,10 @@ static int xennet_start_xmit(struct sk_buff *skb, struct net_device *dev)
        if (notify)
                notify_remote_via_irq(np->netdev->irq);
+        np->stats.tx_bytes += skb->len;
+        np->stats.tx_packets++;
+        /* Note: It is not safe to access skb after xennet_tx_buf_gc()! */
        xennet_tx_buf_gc(dev);
        if (!netfront_tx_slot_available(np))
@@ -573,9 +577,6 @@ static int xennet_start_xmit(struct sk_buff *skb, struct net_device *dev)
        spin_unlock_irq(&np->tx_lock);
-        np->stats.tx_bytes += skb->len;
-        np->stats.tx_packets++;
        return 0;
 drop:
diff --git a/drivers/s390/char/monwriter.c b/drivers/s390/char/monwriter.c
index 268598ef3efe..20442fbf9346 100644
--- a/drivers/s390/char/monwriter.c
+++ b/drivers/s390/char/monwriter.c
@@ -17,6 +17,7 @@
 #include <linux/miscdevice.h>
 #include <linux/ctype.h>
 #include <linux/poll.h>
+#include <linux/mutex.h>
 #include <asm/uaccess.h>
 #include <asm/ebcdic.h>
 #include <asm/io.h>
@@ -41,6 +42,7 @@ struct mon_private {
        size_t hdr_to_read;
        size_t data_to_read;
        struct mon_buf *current_buf;
+        struct mutex thread_mutex;
 };
 /*
@@ -179,6 +181,7 @@ static int monwrite_open(struct inode *inode, struct file *filp)
                return -ENOMEM;
        INIT_LIST_HEAD(&monpriv->list);
        monpriv->hdr_to_read = sizeof(monpriv->hdr);
+        mutex_init(&monpriv->thread_mutex);
        filp->private_data = monpriv;
        return nonseekable_open(inode, filp);
 }
@@ -209,6 +212,7 @@ static ssize_t monwrite_write(struct file *filp, const char __user *data,
        void *to;
        int rc;
+        mutex_lock(&monpriv->thread_mutex);
        for (written = 0; written < count; ) {
                if (monpriv->hdr_to_read) {
                        len = min(count - written, monpriv->hdr_to_read);
@@ -247,11 +251,13 @@ static ssize_t monwrite_write(struct file *filp, const char __user *data,
                }
                monpriv->hdr_to_read = sizeof(monpriv->hdr);
        }
+        mutex_unlock(&monpriv->thread_mutex);
        return written;
 out_error:
        monpriv->data_to_read = 0;
        monpriv->hdr_to_read = sizeof(struct monwrite_hdr);
+        mutex_unlock(&monpriv->thread_mutex);
        return rc;
 }
diff --git a/drivers/s390/char/vmur.c b/drivers/s390/char/vmur.c
index 161867cebd8c..04b19bdc09da 100644
--- a/drivers/s390/char/vmur.c
+++ b/drivers/s390/char/vmur.c
@@ -119,10 +119,12 @@ static void urdev_put(struct urdev *urd)
 /*
 * Low-level functions to do I/O to a ur device.
 *     alloc_chan_prog
+ *     free_chan_prog
 *     do_ur_io
 *     ur_int_handler
 *
 * alloc_chan_prog allocates and builds the channel program
+ * free_chan_prog frees memory of the channel program
 *
 * do_ur_io issues the channel program to the device and blocks waiting
 * on a completion event it publishes at urd->io_done. The function
@@ -137,6 +139,16 @@ static void urdev_put(struct urdev *urd)
 * address pointer that alloc_chan_prog returned.
 */
+static void free_chan_prog(struct ccw1 *cpa)
+{
+        struct ccw1 *ptr = cpa;
+        while (ptr->cda) {
+                kfree((void *)(addr_t) ptr->cda);
+                ptr++;
+        }
+        kfree(cpa);
+}
 /*
 * alloc_chan_prog
@@ -144,44 +156,45 @@ static void urdev_put(struct urdev *urd)
 * with a final NOP CCW command-chained on (which ensures that CE and DE
 * are presented together in a single interrupt instead of as separate
 * interrupts unless an incorrect length indication kicks in first). The
- * data length in each CCW is reclen. The caller must ensure that count
+ * data length in each CCW is reclen.
- * is an integral multiple of reclen.
- * The channel program pointer returned by this function must be freed
- * with kfree. The caller is responsible for checking that
- * count/reclen is not ridiculously large.
 */
-static struct ccw1 *alloc_chan_prog(char *buf, size_t count, size_t reclen)
+static struct ccw1 *alloc_chan_prog(const char __user *ubuf, int rec_count,
+                                    int reclen)
 {
-        size_t num_ccws;
        struct ccw1 *cpa;
+        void *kbuf;
        int i;
-        TRACE("alloc_chan_prog(%p, %zu, %zu)\n", buf, count, reclen);
+        TRACE("alloc_chan_prog(%p, %i, %i)\n", ubuf, rec_count, reclen);
        /*
         * We chain a NOP onto the writes to force CE+DE together.
         * That means we allocate room for CCWs to cover count/reclen
         * records plus a NOP.
         */
-        num_ccws = count / reclen + 1;
+        cpa = kzalloc((rec_count + 1) * sizeof(struct ccw1),
-        cpa = kmalloc(num_ccws * sizeof(struct ccw1), GFP_KERNEL | GFP_DMA);
+                      GFP_KERNEL | GFP_DMA);
        if (!cpa)
-                return NULL;
+                return ERR_PTR(-ENOMEM);
-        for (i = 0; count; i++) {
+        for (i = 0; i < rec_count; i++) {
                cpa[i].cmd_code = WRITE_CCW_CMD;
                cpa[i].flags = CCW_FLAG_CC | CCW_FLAG_SLI;
                cpa[i].count = reclen;
-                cpa[i].cda = __pa(buf);
+                kbuf = kmalloc(reclen, GFP_KERNEL | GFP_DMA);
-                buf += reclen;
+                if (!kbuf) {
-                count -= reclen;
+                        free_chan_prog(cpa);
+                        return ERR_PTR(-ENOMEM);
+                }
+                cpa[i].cda = (u32)(addr_t) kbuf;
+                if (copy_from_user(kbuf, ubuf, reclen)) {
+                        free_chan_prog(cpa);
+                        return ERR_PTR(-EFAULT);
+                }
+                ubuf += reclen;
        }
        /* The following NOP CCW forces CE+DE to be presented together */
        cpa[i].cmd_code = CCW_CMD_NOOP;
-        cpa[i].flags = 0;
-        cpa[i].count = 0;
-        cpa[i].cda = 0;
        return cpa;
 }
@@ -189,7 +202,7 @@ static int do_ur_io(struct urdev *urd, struct ccw1 *cpa)
 {
        int rc;
        struct ccw_device *cdev = urd->cdev;
-        DECLARE_COMPLETION(event);
+        DECLARE_COMPLETION_ONSTACK(event);
        TRACE("do_ur_io: cpa=%p\n", cpa);
@@ -325,24 +338,11 @@ static ssize_t do_write(struct urdev *urd, const char __user *udata,
                        size_t count, size_t reclen, loff_t *ppos)
 {
        struct ccw1 *cpa;
-        char *buf;
        int rc;
-        /* Data buffer must be under 2GB line for fmt1 CCWs: hence GFP_DMA */
+        cpa = alloc_chan_prog(udata, count / reclen, reclen);
-        buf = kmalloc(count, GFP_KERNEL | GFP_DMA);
+        if (IS_ERR(cpa))
-        if (!buf)
+                return PTR_ERR(cpa);
-                return -ENOMEM;
-        if (copy_from_user(buf, udata, count)) {
-                rc = -EFAULT;
-                goto fail_kfree_buf;
-        }
-        cpa = alloc_chan_prog(buf, count, reclen);
-        if (!cpa) {
-                rc = -ENOMEM;
-                goto fail_kfree_buf;
-        }
        rc = do_ur_io(urd, cpa);
        if (rc)
@@ -354,10 +354,9 @@ static ssize_t do_write(struct urdev *urd, const char __user *udata,
        }
        *ppos += count;
        rc = count;
 fail_kfree_cpa:
-        kfree(cpa);
+        free_chan_prog(cpa);
-fail_kfree_buf:
-        kfree(buf);
        return rc;
 }
@@ -473,7 +472,7 @@ static ssize_t diag14_read(struct file *file, char __user *ubuf, size_t count,
                return rc;
        len = min((size_t) PAGE_SIZE, count);
-        buf = kmalloc(PAGE_SIZE, GFP_KERNEL);
+        buf = (char *) __get_free_page(GFP_KERNEL | GFP_DMA);
        if (!buf)
                return -ENOMEM;
@@ -500,7 +499,7 @@ static ssize_t diag14_read(struct file *file, char __user *ubuf, size_t count,
        *offs += copied;
        rc = copied;
 fail:
-        kfree(buf);
+        free_page((unsigned long) buf);
        return rc;
 }
@@ -543,56 +542,97 @@ static int diag_read_next_file_info(struct file_control_block *buf, int spid)
        }
 }
-static int verify_device(struct urdev *urd)
+static int verify_uri_device(struct urdev *urd)
 {
-        struct file_control_block fcb;
+        struct file_control_block *fcb;
        char *buf;
        int rc;
+        fcb = kmalloc(sizeof(*fcb), GFP_KERNEL | GFP_DMA);
+        if (!fcb)
+                return -ENOMEM;
+        /* check for empty reader device (beginning of chain) */
+        rc = diag_read_next_file_info(fcb, 0);
+        if (rc)
+                goto fail_free_fcb;
+        /* if file is in hold status, we do not read it */
+        if (fcb->file_stat & (FLG_SYSTEM_HOLD | FLG_USER_HOLD)) {
+                rc = -EPERM;
+                goto fail_free_fcb;
+        }
+        /* open file on virtual reader  */
+        buf = (char *) __get_free_page(GFP_KERNEL | GFP_DMA);
+        if (!buf) {
+                rc = -ENOMEM;
+                goto fail_free_fcb;
+        }
+        rc = diag_read_file(urd->dev_id.devno, buf);
+        if ((rc != 0) && (rc != -ENODATA)) /* EOF does not hurt */
+                goto fail_free_buf;
+        /* check if the file on top of the queue is open now */
+        rc = diag_read_next_file_info(fcb, 0);
+        if (rc)
+                goto fail_free_buf;
+        if (!(fcb->file_stat & FLG_IN_USE)) {
+                rc = -EMFILE;
+                goto fail_free_buf;
+        }
+        rc = 0;
+fail_free_buf:
+        free_page((unsigned long) buf);
+fail_free_fcb:
+        kfree(fcb);
+        return rc;
+}
+static int verify_device(struct urdev *urd)
+{
        switch (urd->class) {
        case DEV_CLASS_UR_O:
                return 0; /* no check needed here */
        case DEV_CLASS_UR_I:
-                /* check for empty reader device (beginning of chain) */
+                return verify_uri_device(urd);
-                rc = diag_read_next_file_info(&fcb, 0);
-                if (rc)
-                        return rc;
-                /* open file on virtual reader  */
-                buf = kmalloc(PAGE_SIZE, GFP_KERNEL);
-                if (!buf)
-                        return -ENOMEM;
-                rc = diag_read_file(urd->dev_id.devno, buf);
-                kfree(buf);
-                if ((rc != 0) && (rc != -ENODATA)) /* EOF does not hurt */
-                        return rc;
-                return 0;
        default:
                return -ENOTSUPP;
        }
 }
-static int get_file_reclen(struct urdev *urd)
+static int get_uri_file_reclen(struct urdev *urd)
 {
-        struct file_control_block fcb;
+        struct file_control_block *fcb;
        int rc;
+        fcb = kmalloc(sizeof(*fcb), GFP_KERNEL | GFP_DMA);
+        if (!fcb)
+                return -ENOMEM;
+        rc = diag_read_next_file_info(fcb, 0);
+        if (rc)
+                goto fail_free;
+        if (fcb->file_stat & FLG_CP_DUMP)
+                rc = 0;
+        else
+                rc = fcb->rec_len;
+fail_free:
+        kfree(fcb);
+        return rc;
+}
+static int get_file_reclen(struct urdev *urd)
+{
        switch (urd->class) {
        case DEV_CLASS_UR_O:
                return 0;
        case DEV_CLASS_UR_I:
-                rc = diag_read_next_file_info(&fcb, 0);
+                return get_uri_file_reclen(urd);
-                if (rc)
-                        return rc;
-                break;
        default:
                return -ENOTSUPP;
        }
-        if (fcb.file_stat & FLG_CP_DUMP)
-                return 0;
-        return fcb.rec_len;
 }
 static int ur_open(struct inode *inode, struct file *file)
diff --git a/drivers/s390/char/vmur.h b/drivers/s390/char/vmur.h
index 16d0a4e38e40..2b3c564e0472 100644
--- a/drivers/s390/char/vmur.h
+++ b/drivers/s390/char/vmur.h
@@ -50,7 +50,10 @@ struct file_control_block {
        char  rest[200];
 } __attribute__ ((packed));
-#define FLG_CP_DUMP 0x10
+#define FLG_SYSTEM_HOLD 0x04
+#define FLG_CP_DUMP     0x10
+#define FLG_USER_HOLD   0x20
+#define FLG_IN_USE      0x80
 /*
 * A struct urdev is created for each ur device that is made available
diff --git a/drivers/s390/cio/css.c b/drivers/s390/cio/css.c
index 1c27a5a06b49..5635e656c1a3 100644
--- a/drivers/s390/cio/css.c
+++ b/drivers/s390/cio/css.c
@@ -79,6 +79,7 @@ css_alloc_subchannel(struct subchannel_id schid)
        sch->schib.pmcw.intparm = (__u32)(unsigned long)sch;
        ret = cio_modify(sch);
        if (ret) {
+                kfree(sch->lock);
                kfree(sch);
                return ERR_PTR(ret);
        }
diff --git a/drivers/s390/cio/qdio.c b/drivers/s390/cio/qdio.c
index ed026a1dc324..03347aed2b3e 100644
--- a/drivers/s390/cio/qdio.c
+++ b/drivers/s390/cio/qdio.c
@@ -81,6 +81,7 @@ static __u32 volatile spare_indicator;
 static atomic_t spare_indicator_usecount;
 #define QDIO_MEMPOOL_SCSSC_ELEMENTS 2
 static mempool_t *qdio_mempool_scssc;
+static struct kmem_cache *qdio_q_cache;
 static debug_info_t *qdio_dbf_setup;
 static debug_info_t *qdio_dbf_sbal;
@@ -1617,23 +1618,21 @@ static void
 qdio_release_irq_memory(struct qdio_irq *irq_ptr)
 {
        int i;
+        struct qdio_q *q;
-        for (i=0;i<QDIO_MAX_QUEUES_PER_IRQ;i++) {
+        for (i = 0; i < QDIO_MAX_QUEUES_PER_IRQ; i++) {
-                if (!irq_ptr->input_qs[i])
+                q = irq_ptr->input_qs[i];
-                        goto next;
+                if (q) {
+                        free_page((unsigned long) q->slib);
-                kfree(irq_ptr->input_qs[i]->slib);
+                        kmem_cache_free(qdio_q_cache, q);
-                kfree(irq_ptr->input_qs[i]);
+                }
+                q = irq_ptr->output_qs[i];
-next:
+                if (q) {
-                if (!irq_ptr->output_qs[i])
+                        free_page((unsigned long) q->slib);
-                        continue;
+                        kmem_cache_free(qdio_q_cache, q);
+                }
-                kfree(irq_ptr->output_qs[i]->slib);
-                kfree(irq_ptr->output_qs[i]);
        }
-        kfree(irq_ptr->qdr);
+        free_page((unsigned long) irq_ptr->qdr);
        free_page((unsigned long) irq_ptr);
 }
@@ -1680,44 +1679,35 @@ qdio_alloc_qs(struct qdio_irq *irq_ptr,
 {
        int i;
        struct qdio_q *q;
-        int result=-ENOMEM;
-        for (i=0;i<no_input_qs;i++) {
-                q = kzalloc(sizeof(struct qdio_q), GFP_KERNEL);
-                if (!q) {
+        for (i = 0; i < no_input_qs; i++) {
-                        QDIO_PRINT_ERR("kmalloc of q failed!\n");
+                q = kmem_cache_alloc(qdio_q_cache, GFP_KERNEL);
-                        goto out;
+                if (!q)
-                }
+                        return -ENOMEM;
+                memset(q, 0, sizeof(*q));
-                q->slib = kmalloc(PAGE_SIZE, GFP_KERNEL);
+                q->slib = (struct slib *) __get_free_page(GFP_KERNEL);
                if (!q->slib) {
-                        QDIO_PRINT_ERR("kmalloc of slib failed!\n");
+                        kmem_cache_free(qdio_q_cache, q);
-                        goto out;
+                        return -ENOMEM;
                }
                irq_ptr->input_qs[i]=q;
        }
-        for (i=0;i<no_output_qs;i++) {
+        for (i = 0; i < no_output_qs; i++) {
-                q = kzalloc(sizeof(struct qdio_q), GFP_KERNEL);
+                q = kmem_cache_alloc(qdio_q_cache, GFP_KERNEL);
+                if (!q)
-                if (!q) {
+                        return -ENOMEM;
-                        goto out;
+                memset(q, 0, sizeof(*q));
-                }
-                q->slib=kmalloc(PAGE_SIZE,GFP_KERNEL);
+                q->slib = (struct slib *) __get_free_page(GFP_KERNEL);
                if (!q->slib) {
-                        QDIO_PRINT_ERR("kmalloc of slib failed!\n");
+                        kmem_cache_free(qdio_q_cache, q);
-                        goto out;
+                        return -ENOMEM;
                }
                irq_ptr->output_qs[i]=q;
        }
+        return 0;
-        result=0;
-out:
-        return result;
 }
 static void
@@ -2985,17 +2975,17 @@ qdio_allocate(struct qdio_initialize *init_data)
        QDIO_DBF_HEX0(0,setup,&irq_ptr,sizeof(void*));
        if (!irq_ptr) {
-                QDIO_PRINT_ERR("kmalloc of irq_ptr failed!\n");
+                QDIO_PRINT_ERR("allocation of irq_ptr failed!\n");
                return -ENOMEM;
        }
        init_MUTEX(&irq_ptr->setting_up_sema);
        /* QDR must be in DMA area since CCW data address is only 32 bit */
-        irq_ptr->qdr=kmalloc(sizeof(struct qdr), GFP_KERNEL | GFP_DMA);
+        irq_ptr->qdr = (struct qdr *) __get_free_page(GFP_KERNEL | GFP_DMA);
        if (!(irq_ptr->qdr)) {
                free_page((unsigned long) irq_ptr);
-                QDIO_PRINT_ERR("kmalloc of irq_ptr->qdr failed!\n");
+                QDIO_PRINT_ERR("allocation of irq_ptr->qdr failed!\n");
                return -ENOMEM;
        }
        QDIO_DBF_TEXT0(0,setup,"qdr:");
@@ -3004,6 +2994,7 @@ qdio_allocate(struct qdio_initialize *init_data)
        if (qdio_alloc_qs(irq_ptr,
                          init_data->no_input_qs,
                          init_data->no_output_qs)) {
+                QDIO_PRINT_ERR("queue allocation failed!\n");
                qdio_release_irq_memory(irq_ptr);
                return -ENOMEM;
        }
@@ -3895,9 +3886,19 @@ init_QDIO(void)
        if (res)
                return res;
+        qdio_q_cache = kmem_cache_create("qdio_q", sizeof(struct qdio_q),
+                                         256, 0, NULL);
+        if (!qdio_q_cache) {
+                qdio_release_qdio_memory();
+                return -ENOMEM;
+        }
        res = qdio_register_dbf_views();
-        if (res)
+        if (res) {
+                kmem_cache_destroy(qdio_q_cache);
+                qdio_release_qdio_memory();
                return res;
+        }
        QDIO_DBF_TEXT0(0,setup,"initQDIO");
        res = bus_create_file(&ccw_bus_type, &bus_attr_qdio_performance_stats);
@@ -3929,6 +3930,7 @@ cleanup_QDIO(void)
        qdio_release_qdio_memory();
        qdio_unregister_dbf_views();
        mempool_destroy(qdio_mempool_scssc);
+        kmem_cache_destroy(qdio_q_cache);
        bus_remove_file(&ccw_bus_type, &bus_attr_qdio_performance_stats);
        printk("qdio: %s: module removed\n",version);
 }
diff --git a/drivers/spi/spi_mpc83xx.c b/drivers/spi/spi_mpc83xx.c
index 0c16a2b39b41..2adf856e44c2 100644
--- a/drivers/spi/spi_mpc83xx.c
+++ b/drivers/spi/spi_mpc83xx.c
@@ -86,7 +86,7 @@ struct mpc83xx_spi {
        unsigned nsecs;         /* (clock cycle time)/2 */
-        u32 sysclk;
+        u32 spibrg;             /* SPIBRG input clock */
        u32 rx_shift;           /* RX data reg shift when in qe mode */
        u32 tx_shift;           /* TX data reg shift when in qe mode */
@@ -148,6 +148,8 @@ static void mpc83xx_spi_chipselect(struct spi_device *spi, int value)
        if (value == BITBANG_CS_ACTIVE) {
                u32 regval = mpc83xx_spi_read_reg(&mpc83xx_spi->base->mode);
                u32 len = spi->bits_per_word;
+                u8 pm;
                if (len == 32)
                        len = 0;
                else
@@ -169,17 +171,20 @@ static void mpc83xx_spi_chipselect(struct spi_device *spi, int value)
                regval |= SPMODE_LEN(len);
-                if ((mpc83xx_spi->sysclk / spi->max_speed_hz) >= 64) {
+                if ((mpc83xx_spi->spibrg / spi->max_speed_hz) >= 64) {
-                        u8 pm = mpc83xx_spi->sysclk / (spi->max_speed_hz * 64);
+                        pm = mpc83xx_spi->spibrg / (spi->max_speed_hz * 64) - 1;
                        if (pm > 0x0f) {
-                                printk(KERN_WARNING "MPC83xx SPI: SPICLK can't be less then a SYSCLK/1024!\n"
+                                dev_err(&spi->dev, "Requested speed is too "
-                                                "Requested SPICLK is %d Hz. Will use %d Hz instead.\n",
+                                        "low: %d Hz. Will use %d Hz instead.\n",
-                                                spi->max_speed_hz, mpc83xx_spi->sysclk / 1024);
+                                        spi->max_speed_hz,
+                                        mpc83xx_spi->spibrg / 1024);
                                pm = 0x0f;
                        }
                        regval |= SPMODE_PM(pm) | SPMODE_DIV16;
                } else {
-                        u8 pm = mpc83xx_spi->sysclk / (spi->max_speed_hz * 4);
+                        pm = mpc83xx_spi->spibrg / (spi->max_speed_hz * 4);
+                        if (pm)
+                                pm--;
                        regval |= SPMODE_PM(pm);
                }
@@ -429,13 +434,17 @@ static int __init mpc83xx_spi_probe(struct platform_device *dev)
        mpc83xx_spi->bitbang.chipselect = mpc83xx_spi_chipselect;
        mpc83xx_spi->bitbang.setup_transfer = mpc83xx_spi_setup_transfer;
        mpc83xx_spi->bitbang.txrx_bufs = mpc83xx_spi_bufs;
-        mpc83xx_spi->sysclk = pdata->sysclk;
        mpc83xx_spi->activate_cs = pdata->activate_cs;
        mpc83xx_spi->deactivate_cs = pdata->deactivate_cs;
        mpc83xx_spi->qe_mode = pdata->qe_mode;
        mpc83xx_spi->get_rx = mpc83xx_spi_rx_buf_u8;
        mpc83xx_spi->get_tx = mpc83xx_spi_tx_buf_u8;
+        if (mpc83xx_spi->qe_mode)
+                mpc83xx_spi->spibrg = pdata->sysclk / 2;
+        else
+                mpc83xx_spi->spibrg = pdata->sysclk;
        mpc83xx_spi->rx_shift = 0;
        mpc83xx_spi->tx_shift = 0;
        if (mpc83xx_spi->qe_mode) {
diff --git a/drivers/spi/spidev.c b/drivers/spi/spidev.c
index 630f781aeb19..c55459c592b8 100644
--- a/drivers/spi/spidev.c
+++ b/drivers/spi/spidev.c
@@ -183,7 +183,9 @@ static int spidev_message(struct spidev_data *spidev,
                if (u_tmp->rx_buf) {
                        k_tmp->rx_buf = buf;
-                        if (!access_ok(VERIFY_WRITE, u_tmp->rx_buf, u_tmp->len))
+                        if (!access_ok(VERIFY_WRITE, (u8 __user *)
+                                                (ptrdiff_t) u_tmp->rx_buf,
+                                                u_tmp->len))
                                goto done;
                }
                if (u_tmp->tx_buf) {
diff --git a/drivers/usb/Kconfig b/drivers/usb/Kconfig
index 7dd73546bf43..63436892688c 100644
--- a/drivers/usb/Kconfig
+++ b/drivers/usb/Kconfig
@@ -6,6 +6,9 @@ menuconfig USB_SUPPORT
        bool "USB support"
        depends on HAS_IOMEM
        default y
+        ---help---
+          This option adds core support for Universal Serial Bus (USB).
+          You will also need drivers from the following menu to make use of it.
 if USB_SUPPORT
diff --git a/drivers/video/console/fbcon.c b/drivers/video/console/fbcon.c
index decfdc8eb9cc..e58c87b3e3a0 100644
--- a/drivers/video/console/fbcon.c
+++ b/drivers/video/console/fbcon.c
@@ -127,8 +127,20 @@ static int last_fb_vc = MAX_NR_CONSOLES - 1;
 static int fbcon_is_default = 1; 
 static int fbcon_has_exited;
 static int primary_device = -1;
+#ifdef CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY
 static int map_override;
+static inline void fbcon_map_override(void)
+{
+        map_override = 1;
+}
+#else
+static inline void fbcon_map_override(void)
+{
+}
+#endif /* CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY */
 /* font data */
 static char fontname[40];
@@ -506,7 +518,7 @@ static int __init fb_console_setup(char *this_opt)
                                                (options[j++]-'0') % FB_MAX;
                                }
-                                map_override = 1;
+                                fbcon_map_override();
                        }
                        return 1;
diff --git a/drivers/video/matrox/g450_pll.c b/drivers/video/matrox/g450_pll.c
index 7c76e079ca7d..d42346e7fdda 100644
--- a/drivers/video/matrox/g450_pll.c
+++ b/drivers/video/matrox/g450_pll.c
@@ -331,16 +331,19 @@ static int __g450_setclk(WPMINFO unsigned int fout, unsigned int pll,
                                        tmp |= M1064_XPIXCLKCTRL_PLL_UP;
                                }
                                matroxfb_DAC_out(PMINFO M1064_XPIXCLKCTRL, tmp);
-#ifdef __powerpc__
+                                /* DVI PLL preferred for frequencies up to
-                                /* This is necessary to avoid jitter on PowerPC
+                                   panel link max, standard PLL otherwise */
-                                 * (OpenFirmware) systems, but apparently
+                                if (fout >= MINFO->max_pixel_clock_panellink)
-                                 * introduces jitter, at least on a x86-64
+                                        tmp = 0;
-                                 * using DVI.
+                                else tmp =
-                                 * A simple workaround is disable for non-PPC.
+                                        M1064_XDVICLKCTRL_DVIDATAPATHSEL |
-                                 */
+                                        M1064_XDVICLKCTRL_C1DVICLKSEL |
-                                matroxfb_DAC_out(PMINFO M1064_XDVICLKCTRL, 0);
+                                        M1064_XDVICLKCTRL_C1DVICLKEN |
-#endif /* __powerpc__ */
+                                        M1064_XDVICLKCTRL_DVILOOPCTL |
-                                matroxfb_DAC_out(PMINFO M1064_XPWRCTRL, xpwrctrl);
+                                        M1064_XDVICLKCTRL_P1LOOPBWDTCTL;
+                                matroxfb_DAC_out(PMINFO M1064_XDVICLKCTRL,tmp);
+                                matroxfb_DAC_out(PMINFO M1064_XPWRCTRL,
+                                                 xpwrctrl);
                                matroxfb_DAC_unlock_irqrestore(flags);
                        }
diff --git a/drivers/video/matrox/matroxfb_DAC1064.h b/drivers/video/matrox/matroxfb_DAC1064.h
index df39c3193735..7a98ce8043d7 100644
--- a/drivers/video/matrox/matroxfb_DAC1064.h
+++ b/drivers/video/matrox/matroxfb_DAC1064.h
@@ -33,6 +33,21 @@ void DAC1064_global_restore(WPMINFO2);
 #define     M1064_XCURCTRL_3COLOR       0x01    /* transparent, 0, 1, 2 */
 #define     M1064_XCURCTRL_XGA          0x02    /* 0, 1, transparent, complement */
 #define     M1064_XCURCTRL_XWIN         0x03    /* transparent, transparent, 0, 1 */
+        /* drive DVI by standard(0)/DVI(1) PLL */
+        /* if set(1), C?DVICLKEN and C?DVICLKSEL must be set(1) */
+#define      M1064_XDVICLKCTRL_DVIDATAPATHSEL   0x01
+        /* drive CRTC1 by standard(0)/DVI(1) PLL */
+#define      M1064_XDVICLKCTRL_C1DVICLKSEL      0x02
+        /* drive CRTC2 by standard(0)/DVI(1) PLL */
+#define      M1064_XDVICLKCTRL_C2DVICLKSEL      0x04
+        /* pixel clock allowed to(0)/blocked from(1) driving CRTC1 */
+#define      M1064_XDVICLKCTRL_C1DVICLKEN       0x08
+        /* DVI PLL loop filter bandwidth selection bits */
+#define      M1064_XDVICLKCTRL_DVILOOPCTL       0x30
+        /* CRTC2 pixel clock allowed to(0)/blocked from(1) driving CRTC2 */
+#define      M1064_XDVICLKCTRL_C2DVICLKEN       0x40
+        /* P1PLL loop filter bandwith selection */
+#define      M1064_XDVICLKCTRL_P1LOOPBWDTCTL    0x80
 #define M1064_XCURCOL0RED       0x08
 #define M1064_XCURCOL0GREEN     0x09
 #define M1064_XCURCOL0BLUE      0x0A
diff --git a/drivers/video/matrox/matroxfb_base.h b/drivers/video/matrox/matroxfb_base.h
index d59577c8de86..f3107ad7e545 100644
--- a/drivers/video/matrox/matroxfb_base.h
+++ b/drivers/video/matrox/matroxfb_base.h
@@ -424,6 +424,7 @@ struct matrox_fb_info {
                      } mmio;
        unsigned int    max_pixel_clock;
+        unsigned int    max_pixel_clock_panellink;
        struct matrox_switch*   hw_switch;
diff --git a/drivers/video/matrox/matroxfb_misc.c b/drivers/video/matrox/matroxfb_misc.c
index 5948e54b9ef9..ab7fb50bc1de 100644
--- a/drivers/video/matrox/matroxfb_misc.c
+++ b/drivers/video/matrox/matroxfb_misc.c
@@ -658,6 +658,7 @@ static int parse_pins5(WPMINFO const struct matrox_bios* bd) {
                MINFO->values.reg.mctlwtst_core = (MINFO->values.reg.mctlwtst & ~7) |
                                                  wtst_xlat[MINFO->values.reg.mctlwtst & 7];
        }
+        MINFO->max_pixel_clock_panellink = bd->pins[47] * 4000;
        return 0;
 }
diff --git a/drivers/video/pvr2fb.c b/drivers/video/pvr2fb.c
index f9300266044d..7d6c29800d14 100644
--- a/drivers/video/pvr2fb.c
+++ b/drivers/video/pvr2fb.c
@@ -94,6 +94,7 @@
 #define DISP_DIWCONF (DISP_BASE + 0xe8)
 #define DISP_DIWHSTRT (DISP_BASE + 0xec)
 #define DISP_DIWVSTRT (DISP_BASE + 0xf0)
+#define DISP_PIXDEPTH (DISP_BASE + 0x108)
 /* Pixel clocks, one for TV output, doubled for VGA output */
 #define TV_CLK 74239
@@ -143,6 +144,7 @@ static struct pvr2fb_par {
        unsigned char is_lowres;        /* Is horizontal pixel-doubling enabled? */
        unsigned long mmio_base;        /* MMIO base */
+        u32 palette[16];
 } *currentpar;
 static struct fb_info *fb_info;
@@ -599,6 +601,7 @@ static void pvr2_init_display(struct fb_info *info)
        /* bits per pixel */
        fb_writel(fb_readl(DISP_DIWMODE) | (--bytesperpixel << 2), DISP_DIWMODE);
+        fb_writel(bytesperpixel << 2, DISP_PIXDEPTH);
        /* video enable, color sync, interlace,
         * hsync and vsync polarity (currently unused) */
@@ -790,7 +793,7 @@ static int __devinit pvr2fb_common_init(void)
        fb_info->fbops          = &pvr2fb_ops;
        fb_info->fix            = pvr2_fix;
        fb_info->par            = currentpar;
-        fb_info->pseudo_palette = (void *)(fb_info->par + 1);
+        fb_info->pseudo_palette = currentpar->palette;
        fb_info->flags          = FBINFO_DEFAULT | FBINFO_HWACCEL_YPAN;
        if (video_output == VO_VGA)
@@ -807,6 +810,8 @@ static int __devinit pvr2fb_common_init(void)
        if (register_framebuffer(fb_info) < 0)
                goto out_err;
+        /*Must write PIXDEPTH to register before anything is displayed - so force init */
+        pvr2_init_display(fb_info);
        modememused = get_line_length(fb_info->var.xres_virtual,
                                      fb_info->var.bits_per_pixel);
@@ -1082,14 +1087,15 @@ static int __init pvr2fb_init(void)
 #endif
        size = sizeof(struct fb_info) + sizeof(struct pvr2fb_par) + 16 * sizeof(u32);
-        fb_info = kzalloc(size, GFP_KERNEL);
+        fb_info = framebuffer_alloc(sizeof(struct pvr2fb_par), NULL);
        if (!fb_info) {
                printk(KERN_ERR "Failed to allocate memory for fb_info\n");
                return -ENOMEM;
        }
-        currentpar = (struct pvr2fb_par *)(fb_info + 1);
+        currentpar = fb_info->par;
        for (i = 0; i < ARRAY_SIZE(board_driver); i++) {
                struct pvr2_board *pvr_board = board_driver + i;
@@ -1102,7 +1108,7 @@ static int __init pvr2fb_init(void)
                if (ret != 0) {
                        printk(KERN_ERR "pvr2fb: Failed init of %s device\n",
                                pvr_board->name);
-                        kfree(fb_info);
+                        framebuffer_release(fb_info);
                        break;
                }
        }
@@ -1126,7 +1132,7 @@ static void __exit pvr2fb_exit(void)
 #endif
        unregister_framebuffer(fb_info);
-        kfree(fb_info);
+        framebuffer_release(fb_info);
 }
 module_init(pvr2fb_init);
diff --git a/drivers/video/stifb.c b/drivers/video/stifb.c
index c97709ecbad0..e7c8db2eb49b 100644
--- a/drivers/video/stifb.c
+++ b/drivers/video/stifb.c
@@ -1100,13 +1100,18 @@ stifb_init_fb(struct sti_struct *sti, int bpp_pref)
        /* only supported cards are allowed */
        switch (fb->id) {
        case CRT_ID_VISUALIZE_EG:
-                /* look for a double buffering device like e.g. the 
+                /* Visualize cards can run either in "double buffer" or
-                   "INTERNAL_EG_DX1024" in the RDI precisionbook laptop
+                  "standard" mode. Depending on the mode, the card reports
-                   which won't work. The same device in non-double 
+                  a different device name, e.g. "INTERNAL_EG_DX1024" in double
-                   buffering mode returns "INTERNAL_EG_X1024". */
+                  buffer mode and "INTERNAL_EG_X1024" in standard mode.
-                if (strstr(sti->outptr.dev_name, "EG_DX")) {
+                  Since this driver only supports standard mode, we check
-                   printk(KERN_WARNING 
+                  if the device name contains the string "DX" and tell the
-                        "stifb: ignoring '%s'. Disable double buffering in IPL menu.\n",
+                  user how to reconfigure the card. */
+                if (strstr(sti->outptr.dev_name, "DX")) {
+                   printk(KERN_WARNING "WARNING: stifb framebuffer driver does not "
+                        "support '%s' in double-buffer mode.\n"
+                        KERN_WARNING "WARNING: Please disable the double-buffer mode "
+                        "in IPL menu (the PARISC-BIOS).\n",
                        sti->outptr.dev_name);
                   goto out_err0;
                }