120 files changed, 1968 insertions, 719 deletions
diff --git a/drivers/acpi/processor_idle.c b/drivers/acpi/processor_idle.c
index 05a17812d521..ff64d333e95f 100644
--- a/drivers/acpi/processor_idle.c
+++ b/drivers/acpi/processor_idle.c
@@ -838,7 +838,7 @@ int acpi_processor_cst_has_changed (struct acpi_processor *pr)
        /* Fall back to the default idle loop */
        pm_idle = pm_idle_save;
-        synchronize_kernel();
+        synchronize_sched();  /* Relies on interrupts forcing exit from idle. */
        pr->flags.power = 0;
        result = acpi_processor_get_power_info(pr);
diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c
index e7ca06626566..119c94093a13 100644
--- a/drivers/acpi/scan.c
+++ b/drivers/acpi/scan.c
@@ -379,8 +379,8 @@ ACPI_DEVICE_ATTR(eject, 0200, NULL, acpi_eject_store);
 /**
 * setup_sys_fs_device_files - sets up the device files under device namespace
- * @@dev:       acpi_device object
+ * @dev:        acpi_device object
- * @@func:      function pointer to create or destroy the device file
+ * @func:       function pointer to create or destroy the device file
 */
 static void
 setup_sys_fs_device_files (
diff --git a/drivers/base/platform.c b/drivers/base/platform.c
index cd6453905a9b..3a5f4c991797 100644
--- a/drivers/base/platform.c
+++ b/drivers/base/platform.c
@@ -115,7 +115,7 @@ int platform_add_devices(struct platform_device **devs, int num)
 /**
 *      platform_device_register - add a platform-level device
- *      @dev:   platform device we're adding
+ *      @pdev:  platform device we're adding
 *
 */
 int platform_device_register(struct platform_device * pdev)
@@ -174,7 +174,7 @@ int platform_device_register(struct platform_device * pdev)
 /**
 *      platform_device_unregister - remove a platform-level device
- *      @dev:   platform device we're removing
+ *      @pdev:  platform device we're removing
 *
 *      Note that this function will also release all memory- and port-based
 *      resources owned by the device (@dev->resource).
diff --git a/drivers/block/nbd.c b/drivers/block/nbd.c
index efdf04450bf7..9e268ddedfbd 100644
--- a/drivers/block/nbd.c
+++ b/drivers/block/nbd.c
@@ -78,6 +78,7 @@
 #define DBG_RX          0x0200
 #define DBG_TX          0x0400
 static unsigned int debugflags;
+static unsigned int nbds_max = 16;
 #endif /* NDEBUG */
 static struct nbd_device nbd_dev[MAX_NBD];
@@ -647,7 +648,13 @@ static int __init nbd_init(void)
                return -EIO;
        }
-        for (i = 0; i < MAX_NBD; i++) {
+        if (nbds_max > MAX_NBD) {
+                printk(KERN_CRIT "nbd: cannot allocate more than %u nbds; %u requested.\n", MAX_NBD,
+                                nbds_max);
+                return -EINVAL;
+        }
+        for (i = 0; i < nbds_max; i++) {
                struct gendisk *disk = alloc_disk(1);
                if (!disk)
                        goto out;
@@ -673,7 +680,7 @@ static int __init nbd_init(void)
        dprintk(DBG_INIT, "nbd: debugflags=0x%x\n", debugflags);
        devfs_mk_dir("nbd");
-        for (i = 0; i < MAX_NBD; i++) {
+        for (i = 0; i < nbds_max; i++) {
                struct gendisk *disk = nbd_dev[i].disk;
                nbd_dev[i].file = NULL;
                nbd_dev[i].magic = LO_MAGIC;
@@ -706,8 +713,9 @@ out:
 static void __exit nbd_cleanup(void)
 {
        int i;
-        for (i = 0; i < MAX_NBD; i++) {
+        for (i = 0; i < nbds_max; i++) {
                struct gendisk *disk = nbd_dev[i].disk;
+                nbd_dev[i].magic = 0;
                if (disk) {
                        del_gendisk(disk);
                        blk_cleanup_queue(disk->queue);
@@ -725,6 +733,8 @@ module_exit(nbd_cleanup);
 MODULE_DESCRIPTION("Network Block Device");
 MODULE_LICENSE("GPL");
+module_param(nbds_max, int, 0444);
+MODULE_PARM_DESC(nbds_max, "How many network block devices to initialize.");
 #ifndef NDEBUG
 module_param(debugflags, int, 0644);
 MODULE_PARM_DESC(debugflags, "flags for controlling debug output");
diff --git a/drivers/block/noop-iosched.c b/drivers/block/noop-iosched.c
index 888c477e02b3..b1730b62c37e 100644
--- a/drivers/block/noop-iosched.c
+++ b/drivers/block/noop-iosched.c
@@ -13,34 +13,13 @@
 static int elevator_noop_merge(request_queue_t *q, struct request **req,
                               struct bio *bio)
 {
-        struct list_head *entry = &q->queue_head;
-        struct request *__rq;
        int ret;
-        if ((ret = elv_try_last_merge(q, bio))) {
+        ret = elv_try_last_merge(q, bio);
+        if (ret != ELEVATOR_NO_MERGE)
                *req = q->last_merge;
-                return ret;
-        }
-        while ((entry = entry->prev) != &q->queue_head) {
+        return ret;
-                __rq = list_entry_rq(entry);
-                if (__rq->flags & (REQ_SOFTBARRIER | REQ_HARDBARRIER))
-                        break;
-                else if (__rq->flags & REQ_STARTED)
-                        break;
-                if (!blk_fs_request(__rq))
-                        continue;
-                if ((ret = elv_try_merge(__rq, bio))) {
-                        *req = __rq;
-                        q->last_merge = __rq;
-                        return ret;
-                }
-        }
-        return ELEVATOR_NO_MERGE;
 }
 static void elevator_noop_merge_requests(request_queue_t *q, struct request *req,
diff --git a/drivers/cdrom/cdrom.c b/drivers/cdrom/cdrom.c
index 9deca49c71f0..beaa561f2ed8 100644
--- a/drivers/cdrom/cdrom.c
+++ b/drivers/cdrom/cdrom.c
@@ -645,7 +645,7 @@ static int cdrom_mrw_exit(struct cdrom_device_info *cdi)
                ret = cdrom_mrw_bgformat_susp(cdi, 0);
        }
-        if (!ret)
+        if (!ret && cdi->media_written)
                ret = cdrom_flush_cache(cdi);
        return ret;
diff --git a/drivers/char/Kconfig b/drivers/char/Kconfig
index 97ac4edf4655..e162dab64ffd 100644
--- a/drivers/char/Kconfig
+++ b/drivers/char/Kconfig
@@ -982,7 +982,7 @@ config MAX_RAW_DEVS
 config HANGCHECK_TIMER
        tristate "Hangcheck timer"
-        depends on X86_64 || X86
+        depends on X86_64 || X86 || IA64 || PPC64 || ARCH_S390
        help
          The hangcheck-timer module detects when the system has gone
          out to lunch past a certain margin.  It can reboot the system
diff --git a/drivers/char/agp/ali-agp.c b/drivers/char/agp/ali-agp.c
index c86a22c5499b..0212febda654 100644
--- a/drivers/char/agp/ali-agp.c
+++ b/drivers/char/agp/ali-agp.c
@@ -192,7 +192,7 @@ static struct aper_size_info_32 ali_generic_sizes[7] =
        {4, 1024, 0, 3}
 };
-struct agp_bridge_driver ali_generic_bridge = {
+static struct agp_bridge_driver ali_generic_bridge = {
        .owner                  = THIS_MODULE,
        .aperture_sizes         = ali_generic_sizes,
        .size_type              = U32_APER_SIZE,
@@ -215,7 +215,7 @@ struct agp_bridge_driver ali_generic_bridge = {
        .agp_destroy_page       = ali_destroy_page,
 };
-struct agp_bridge_driver ali_m1541_bridge = {
+static struct agp_bridge_driver ali_m1541_bridge = {
        .owner                  = THIS_MODULE,
        .aperture_sizes         = ali_generic_sizes,
        .size_type              = U32_APER_SIZE,
diff --git a/drivers/char/agp/amd-k7-agp.c b/drivers/char/agp/amd-k7-agp.c
index f1ea87ea6b65..e62a3c2c44a9 100644
--- a/drivers/char/agp/amd-k7-agp.c
+++ b/drivers/char/agp/amd-k7-agp.c
@@ -358,7 +358,7 @@ static struct gatt_mask amd_irongate_masks[] =
        {.mask = 1, .type = 0}
 };
-struct agp_bridge_driver amd_irongate_driver = {
+static struct agp_bridge_driver amd_irongate_driver = {
        .owner                  = THIS_MODULE,
        .aperture_sizes         = amd_irongate_sizes,
        .size_type              = LVL2_APER_SIZE,
diff --git a/drivers/char/agp/amd64-agp.c b/drivers/char/agp/amd64-agp.c
index 905f0629c44f..399c042f68f0 100644
--- a/drivers/char/agp/amd64-agp.c
+++ b/drivers/char/agp/amd64-agp.c
@@ -243,7 +243,7 @@ static void amd64_cleanup(void)
 }
-struct agp_bridge_driver amd_8151_driver = {
+static struct agp_bridge_driver amd_8151_driver = {
        .owner                  = THIS_MODULE,
        .aperture_sizes         = amd_8151_sizes,
        .size_type              = U32_APER_SIZE,
diff --git a/drivers/char/agp/ati-agp.c b/drivers/char/agp/ati-agp.c
index 757dde006fc9..a65f8827c283 100644
--- a/drivers/char/agp/ati-agp.c
+++ b/drivers/char/agp/ati-agp.c
@@ -393,7 +393,7 @@ static int ati_free_gatt_table(struct agp_bridge_data *bridge)
        return 0;
 }
-struct agp_bridge_driver ati_generic_bridge = {
+static struct agp_bridge_driver ati_generic_bridge = {
        .owner                  = THIS_MODULE,
        .aperture_sizes         = ati_generic_sizes,
        .size_type              = LVL2_APER_SIZE,
diff --git a/drivers/char/agp/backend.c b/drivers/char/agp/backend.c
index c3442f3c6480..2f3dfb63bdc6 100644
--- a/drivers/char/agp/backend.c
+++ b/drivers/char/agp/backend.c
@@ -97,7 +97,7 @@ void agp_backend_release(struct agp_bridge_data *bridge)
 EXPORT_SYMBOL(agp_backend_release);
-struct { int mem, agp; } maxes_table[] = {
+static struct { int mem, agp; } maxes_table[] = {
        {0, 0},
        {32, 4},
        {64, 28},
@@ -322,7 +322,7 @@ static int __init agp_init(void)
        return 0;
 }
-void __exit agp_exit(void)
+static void __exit agp_exit(void)
 {
 }
diff --git a/drivers/char/agp/efficeon-agp.c b/drivers/char/agp/efficeon-agp.c
index 2a87cecdc912..1383c3165ea1 100644
--- a/drivers/char/agp/efficeon-agp.c
+++ b/drivers/char/agp/efficeon-agp.c
@@ -303,7 +303,7 @@ static int efficeon_remove_memory(struct agp_memory * mem, off_t pg_start, int t
 }
-struct agp_bridge_driver efficeon_driver = {
+static struct agp_bridge_driver efficeon_driver = {
        .owner                  = THIS_MODULE,
        .aperture_sizes         = efficeon_generic_sizes,
        .size_type              = LVL2_APER_SIZE,
diff --git a/drivers/char/agp/frontend.c b/drivers/char/agp/frontend.c
index f633623ac802..3dfb6648547b 100644
--- a/drivers/char/agp/frontend.c
+++ b/drivers/char/agp/frontend.c
@@ -235,7 +235,7 @@ static void agp_insert_into_pool(struct agp_memory * temp)
 /* File private list routines */
-struct agp_file_private *agp_find_private(pid_t pid)
+static struct agp_file_private *agp_find_private(pid_t pid)
 {
        struct agp_file_private *curr;
@@ -250,7 +250,7 @@ struct agp_file_private *agp_find_private(pid_t pid)
        return NULL;
 }
-void agp_insert_file_private(struct agp_file_private * priv)
+static void agp_insert_file_private(struct agp_file_private * priv)
 {
        struct agp_file_private *prev;
@@ -262,7 +262,7 @@ void agp_insert_file_private(struct agp_file_private * priv)
        agp_fe.file_priv_list = priv;
 }
-void agp_remove_file_private(struct agp_file_private * priv)
+static void agp_remove_file_private(struct agp_file_private * priv)
 {
        struct agp_file_private *next;
        struct agp_file_private *prev;
diff --git a/drivers/char/agp/nvidia-agp.c b/drivers/char/agp/nvidia-agp.c
index 4f7a3e8bc919..80dafa3030bd 100644
--- a/drivers/char/agp/nvidia-agp.c
+++ b/drivers/char/agp/nvidia-agp.c
@@ -288,7 +288,7 @@ static struct gatt_mask nvidia_generic_masks[] =
 };
-struct agp_bridge_driver nvidia_driver = {
+static struct agp_bridge_driver nvidia_driver = {
        .owner                  = THIS_MODULE,
        .aperture_sizes         = nvidia_generic_sizes,
        .size_type              = U8_APER_SIZE,
diff --git a/drivers/char/agp/sis-agp.c b/drivers/char/agp/sis-agp.c
index cfccacb2a647..ebc05554045c 100644
--- a/drivers/char/agp/sis-agp.c
+++ b/drivers/char/agp/sis-agp.c
@@ -119,7 +119,7 @@ static struct aper_size_info_8 sis_generic_sizes[7] =
        {4, 1024, 0, 3}
 };
-struct agp_bridge_driver sis_driver = {
+static struct agp_bridge_driver sis_driver = {
        .owner                  = THIS_MODULE,
        .aperture_sizes         = sis_generic_sizes,
        .size_type              = U8_APER_SIZE,
diff --git a/drivers/char/agp/sworks-agp.c b/drivers/char/agp/sworks-agp.c
index bb338d9134e0..10c23302dd84 100644
--- a/drivers/char/agp/sworks-agp.c
+++ b/drivers/char/agp/sworks-agp.c
@@ -409,7 +409,7 @@ static void serverworks_agp_enable(struct agp_bridge_data *bridge, u32 mode)
        agp_device_command(command, 0);
 }
-struct agp_bridge_driver sworks_driver = {
+static struct agp_bridge_driver sworks_driver = {
        .owner                  = THIS_MODULE,
        .aperture_sizes         = serverworks_sizes,
        .size_type              = LVL2_APER_SIZE,
diff --git a/drivers/char/agp/via-agp.c b/drivers/char/agp/via-agp.c
index e1451dd9b6a7..c847df575cf5 100644
--- a/drivers/char/agp/via-agp.c
+++ b/drivers/char/agp/via-agp.c
@@ -170,7 +170,7 @@ static void via_tlbflush_agp3(struct agp_memory *mem)
 }
-struct agp_bridge_driver via_agp3_driver = {
+static struct agp_bridge_driver via_agp3_driver = {
        .owner                  = THIS_MODULE,
        .aperture_sizes         = agp3_generic_sizes,
        .size_type              = U8_APER_SIZE,
@@ -193,7 +193,7 @@ struct agp_bridge_driver via_agp3_driver = {
        .agp_destroy_page       = agp_generic_destroy_page,
 };
-struct agp_bridge_driver via_driver = {
+static struct agp_bridge_driver via_driver = {
        .owner                  = THIS_MODULE,
        .aperture_sizes         = via_generic_sizes,
        .size_type              = U8_APER_SIZE,
diff --git a/drivers/char/dtlk.c b/drivers/char/dtlk.c
index 903e4c3cc209..a229915ce1b2 100644
--- a/drivers/char/dtlk.c
+++ b/drivers/char/dtlk.c
@@ -52,7 +52,7 @@
 #define KERNEL
 #include <linux/types.h>
 #include <linux/fs.h>
-#include <linux/mm.h>           /* for verify_area */
+#include <linux/mm.h>
 #include <linux/errno.h>        /* for -EBUSY */
 #include <linux/ioport.h>       /* for request_region */
 #include <linux/delay.h>        /* for loops_per_jiffy */
diff --git a/drivers/char/hangcheck-timer.c b/drivers/char/hangcheck-timer.c
index 83d6b37b36cd..78e650fc5b41 100644
--- a/drivers/char/hangcheck-timer.c
+++ b/drivers/char/hangcheck-timer.c
@@ -3,7 +3,7 @@
 *
 * Driver for a little io fencing timer.
 *
- * Copyright (C) 2002 Oracle Corporation.  All rights reserved.
+ * Copyright (C) 2002, 2003 Oracle.  All rights reserved.
 *
 * Author: Joel Becker <joel.becker@oracle.com>
 *
@@ -44,11 +44,14 @@
 #include <linux/fs.h>
 #include <linux/mm.h>
 #include <linux/reboot.h>
+#include <linux/smp_lock.h>
 #include <linux/init.h>
+#include <linux/delay.h>
 #include <asm/uaccess.h>
+#include <linux/sysrq.h>
-#define VERSION_STR "0.5.0"
+#define VERSION_STR "0.9.0"
 #define DEFAULT_IOFENCE_MARGIN 60       /* Default fudge factor, in seconds */
 #define DEFAULT_IOFENCE_TICK 180        /* Default timer timeout, in seconds */
@@ -56,18 +59,89 @@
 static int hangcheck_tick = DEFAULT_IOFENCE_TICK;
 static int hangcheck_margin = DEFAULT_IOFENCE_MARGIN;
 static int hangcheck_reboot;  /* Defaults to not reboot */
+static int hangcheck_dump_tasks;  /* Defaults to not dumping SysRQ T */
-/* Driver options */
+/* options - modular */
 module_param(hangcheck_tick, int, 0);
 MODULE_PARM_DESC(hangcheck_tick, "Timer delay.");
 module_param(hangcheck_margin, int, 0);
 MODULE_PARM_DESC(hangcheck_margin, "If the hangcheck timer has been delayed more than hangcheck_margin seconds, the driver will fire.");
 module_param(hangcheck_reboot, int, 0);
 MODULE_PARM_DESC(hangcheck_reboot, "If nonzero, the machine will reboot when the timer margin is exceeded.");
+module_param(hangcheck_dump_tasks, int, 0);
+MODULE_PARM_DESC(hangcheck_dump_tasks, "If nonzero, the machine will dump the system task state when the timer margin is exceeded.");
-MODULE_AUTHOR("Joel Becker");
+MODULE_AUTHOR("Oracle");
 MODULE_DESCRIPTION("Hangcheck-timer detects when the system has gone out to lunch past a certain margin.");
 MODULE_LICENSE("GPL");
+MODULE_VERSION(VERSION_STR);
+/* options - nonmodular */
+#ifndef MODULE
+static int __init hangcheck_parse_tick(char *str)
+{
+        int par;
+        if (get_option(&str,&par))
+                hangcheck_tick = par;
+        return 1;
+}
+static int __init hangcheck_parse_margin(char *str)
+{
+        int par;
+        if (get_option(&str,&par))
+                hangcheck_margin = par;
+        return 1;
+}
+static int __init hangcheck_parse_reboot(char *str)
+{
+        int par;
+        if (get_option(&str,&par))
+                hangcheck_reboot = par;
+        return 1;
+}
+static int __init hangcheck_parse_dump_tasks(char *str)
+{
+        int par;
+        if (get_option(&str,&par))
+                hangcheck_dump_tasks = par;
+        return 1;
+}
+__setup("hcheck_tick", hangcheck_parse_tick);
+__setup("hcheck_margin", hangcheck_parse_margin);
+__setup("hcheck_reboot", hangcheck_parse_reboot);
+__setup("hcheck_dump_tasks", hangcheck_parse_dump_tasks);
+#endif /* not MODULE */
+#if defined(CONFIG_X86) || defined(CONFIG_X86_64)
+# define HAVE_MONOTONIC
+# define TIMER_FREQ 1000000000ULL
+#elif defined(CONFIG_ARCH_S390)
+/* FA240000 is 1 Second in the IBM time universe (Page 4-38 Principles of Op for zSeries */
+# define TIMER_FREQ 0xFA240000ULL
+#elif defined(CONFIG_IA64)
+# define TIMER_FREQ ((unsigned long long)local_cpu_data->itc_freq)
+#elif defined(CONFIG_PPC64)
+# define TIMER_FREQ (HZ*loops_per_jiffy)
+#endif
+#ifdef HAVE_MONOTONIC
+extern unsigned long long monotonic_clock(void);
+#else
+static inline unsigned long long monotonic_clock(void)
+{
+# ifdef __s390__
+        /* returns the TOD.  see 4-38 Principles of Op of zSeries */
+        return get_clock();
+# else
+        return get_cycles();
+# endif  /* __s390__ */
+}
+#endif  /* HAVE_MONOTONIC */
 /* Last time scheduled */
@@ -78,7 +152,6 @@ static void hangcheck_fire(unsigned long);
 static struct timer_list hangcheck_ticktock =
                TIMER_INITIALIZER(hangcheck_fire, 0, 0);
-extern unsigned long long monotonic_clock(void);
 static void hangcheck_fire(unsigned long data)
 {
@@ -92,6 +165,12 @@ static void hangcheck_fire(unsigned long data)
                tsc_diff = (cur_tsc + (~0ULL - hangcheck_tsc)); /* or something */
        if (tsc_diff > hangcheck_tsc_margin) {
+                if (hangcheck_dump_tasks) {
+                        printk(KERN_CRIT "Hangcheck: Task state:\n");
+#ifdef CONFIG_MAGIC_SYSRQ
+                        handle_sysrq('t', NULL, NULL);
+#endif  /* CONFIG_MAGIC_SYSRQ */
+                }
                if (hangcheck_reboot) {
                        printk(KERN_CRIT "Hangcheck: hangcheck is restarting the machine.\n");
                        machine_restart(NULL);
@@ -108,10 +187,16 @@ static int __init hangcheck_init(void)
 {
        printk("Hangcheck: starting hangcheck timer %s (tick is %d seconds, margin is %d seconds).\n",
               VERSION_STR, hangcheck_tick, hangcheck_margin);
+#if defined (HAVE_MONOTONIC)
-        hangcheck_tsc_margin = hangcheck_margin + hangcheck_tick;
+        printk("Hangcheck: Using monotonic_clock().\n");
-        hangcheck_tsc_margin *= 1000000000;
+#elif defined(__s390__)
+        printk("Hangcheck: Using TOD.\n");
+#else
+        printk("Hangcheck: Using get_cycles().\n");
+#endif  /* HAVE_MONOTONIC */
+        hangcheck_tsc_margin =
+                (unsigned long long)(hangcheck_margin + hangcheck_tick);
+        hangcheck_tsc_margin *= (unsigned long long)TIMER_FREQ;
        hangcheck_tsc = monotonic_clock();
        mod_timer(&hangcheck_ticktock, jiffies + (hangcheck_tick*HZ));
@@ -123,6 +208,7 @@ static int __init hangcheck_init(void)
 static void __exit hangcheck_exit(void)
 {
        del_timer_sync(&hangcheck_ticktock);
+        printk("Hangcheck: Stopped hangcheck timer.\n");
 }
 module_init(hangcheck_init);
diff --git a/drivers/char/ipmi/ipmi_bt_sm.c b/drivers/char/ipmi/ipmi_bt_sm.c
index 225b330115bb..5ce9c6269033 100644
--- a/drivers/char/ipmi/ipmi_bt_sm.c
+++ b/drivers/char/ipmi/ipmi_bt_sm.c
@@ -235,7 +235,6 @@ static void reset_flags(struct si_sm_data *bt)
        if (BT_STATUS & BT_B_BUSY) BT_CONTROL(BT_B_BUSY);
        BT_CONTROL(BT_CLR_WR_PTR);
        BT_CONTROL(BT_SMS_ATN);
-        BT_INTMASK_W(BT_BMC_HWRST);
 #ifdef DEVELOPMENT_ONLY_NOT_FOR_PRODUCTION
        if (BT_STATUS & BT_B2H_ATN) {
                int i;
diff --git a/drivers/char/ipmi/ipmi_msghandler.c b/drivers/char/ipmi/ipmi_msghandler.c
index a6606a1aced7..d7fb452af7f9 100644
--- a/drivers/char/ipmi/ipmi_msghandler.c
+++ b/drivers/char/ipmi/ipmi_msghandler.c
@@ -2588,28 +2588,20 @@ handle_msg_timeout(struct ipmi_recv_msg *msg)
        deliver_response(msg);
 }
-static void
+static struct ipmi_smi_msg *
-send_from_recv_msg(ipmi_smi_t intf, struct ipmi_recv_msg *recv_msg,
+smi_from_recv_msg(ipmi_smi_t intf, struct ipmi_recv_msg *recv_msg,
-                   struct ipmi_smi_msg *smi_msg,
+                  unsigned char seq, long seqid)
-                   unsigned char seq, long seqid)
 {
-        if (!smi_msg)
+        struct ipmi_smi_msg *smi_msg = ipmi_alloc_smi_msg();
-                smi_msg = ipmi_alloc_smi_msg();
        if (!smi_msg)
                /* If we can't allocate the message, then just return, we
                   get 4 retries, so this should be ok. */
-                return;
+                return NULL;
        memcpy(smi_msg->data, recv_msg->msg.data, recv_msg->msg.data_len);
        smi_msg->data_size = recv_msg->msg.data_len;
        smi_msg->msgid = STORE_SEQ_IN_MSGID(seq, seqid);
                
-        /* Send the new message.  We send with a zero priority.  It
-           timed out, I doubt time is that critical now, and high
-           priority messages are really only for messages to the local
-           MC, which don't get resent. */
-        intf->handlers->sender(intf->send_info, smi_msg, 0);
 #ifdef DEBUG_MSGING
        {
                int m;
@@ -2619,6 +2611,7 @@ send_from_recv_msg(ipmi_smi_t intf, struct ipmi_recv_msg *recv_msg,
                printk("\n");
        }
 #endif
+        return smi_msg;
 }
 static void
@@ -2683,14 +2676,13 @@ ipmi_timeout_handler(long timeout_period)
                                        intf->timed_out_ipmb_commands++;
                                spin_unlock(&intf->counter_lock);
                        } else {
+                                struct ipmi_smi_msg *smi_msg;
                                /* More retries, send again. */
                                /* Start with the max timer, set to normal
                                   timer after the message is sent. */
                                ent->timeout = MAX_MSG_TIMEOUT;
                                ent->retries_left--;
-                                send_from_recv_msg(intf, ent->recv_msg, NULL,
-                                                   j, ent->seqid);
                                spin_lock(&intf->counter_lock);
                                if (ent->recv_msg->addr.addr_type
                                    == IPMI_LAN_ADDR_TYPE)
@@ -2698,6 +2690,20 @@ ipmi_timeout_handler(long timeout_period)
                                else
                                        intf->retransmitted_ipmb_commands++;
                                spin_unlock(&intf->counter_lock);
+                                smi_msg = smi_from_recv_msg(intf,
+                                                ent->recv_msg, j, ent->seqid);
+                                if(!smi_msg)
+                                        continue;
+                                spin_unlock_irqrestore(&(intf->seq_lock),flags);
+                                /* Send the new message.  We send with a zero
+                                 * priority.  It timed out, I doubt time is
+                                 * that critical now, and high priority
+                                 * messages are really only for messages to the
+                                 * local MC, which don't get resent. */
+                                intf->handlers->sender(intf->send_info,
+                                                        smi_msg, 0);
+                                spin_lock_irqsave(&(intf->seq_lock), flags);
                        }
                }
                spin_unlock_irqrestore(&(intf->seq_lock), flags);
diff --git a/drivers/char/ipmi/ipmi_si_intf.c b/drivers/char/ipmi/ipmi_si_intf.c
index 29de259a981e..5419440087fd 100644
--- a/drivers/char/ipmi/ipmi_si_intf.c
+++ b/drivers/char/ipmi/ipmi_si_intf.c
@@ -100,6 +100,11 @@ enum si_intf_state {
        /* FIXME - add watchdog stuff. */
 };
+/* Some BT-specific defines we need here. */
+#define IPMI_BT_INTMASK_REG             2
+#define IPMI_BT_INTMASK_CLEAR_IRQ_BIT   2
+#define IPMI_BT_INTMASK_ENABLE_IRQ_BIT  1
 enum si_type {
    SI_KCS, SI_SMIC, SI_BT
 };
@@ -875,6 +880,17 @@ static irqreturn_t si_irq_handler(int irq, void *data, struct pt_regs *regs)
        return IRQ_HANDLED;
 }
+static irqreturn_t si_bt_irq_handler(int irq, void *data, struct pt_regs *regs)
+{
+        struct smi_info *smi_info = data;
+        /* We need to clear the IRQ flag for the BT interface. */
+        smi_info->io.outputb(&smi_info->io, IPMI_BT_INTMASK_REG,
+                             IPMI_BT_INTMASK_CLEAR_IRQ_BIT
+                             | IPMI_BT_INTMASK_ENABLE_IRQ_BIT);
+        return si_irq_handler(irq, data, regs);
+}
 static struct ipmi_smi_handlers handlers =
 {
        .owner                  = THIS_MODULE,
@@ -1001,11 +1017,22 @@ static int std_irq_setup(struct smi_info *info)
        if (!info->irq)
                return 0;
-        rv = request_irq(info->irq,
+        if (info->si_type == SI_BT) {
-                         si_irq_handler,
+                rv = request_irq(info->irq,
-                         SA_INTERRUPT,
+                                 si_bt_irq_handler,
-                         DEVICE_NAME,
+                                 SA_INTERRUPT,
-                         info);
+                                 DEVICE_NAME,
+                                 info);
+                if (!rv)
+                        /* Enable the interrupt in the BT interface. */
+                        info->io.outputb(&info->io, IPMI_BT_INTMASK_REG,
+                                         IPMI_BT_INTMASK_ENABLE_IRQ_BIT);
+        } else
+                rv = request_irq(info->irq,
+                                 si_irq_handler,
+                                 SA_INTERRUPT,
+                                 DEVICE_NAME,
+                                 info);
        if (rv) {
                printk(KERN_WARNING
                       "ipmi_si: %s unable to claim interrupt %d,"
@@ -1024,6 +1051,9 @@ static void std_irq_cleanup(struct smi_info *info)
        if (!info->irq)
                return;
+        if (info->si_type == SI_BT)
+                /* Disable the interrupt in the BT interface. */
+                info->io.outputb(&info->io, IPMI_BT_INTMASK_REG, 0);
        free_irq(info->irq, info);
 }
@@ -1526,8 +1556,17 @@ static int try_init_acpi(int intf_num, struct smi_info **new_info)
                info->irq_setup = NULL;
        }
-        regspacings[intf_num] = spmi->addr.register_bit_width / 8;
+        if (spmi->addr.register_bit_width) {
-        info->io.regspacing = spmi->addr.register_bit_width / 8;
+                /* A (hopefully) properly formed register bit width. */
+                regspacings[intf_num] = spmi->addr.register_bit_width / 8;
+                info->io.regspacing = spmi->addr.register_bit_width / 8;
+        } else {
+                /* Some broken systems get this wrong and set the value
+                 * to zero.  Assume it is the default spacing.  If that
+                 * is wrong, too bad, the vendor should fix the tables. */
+                regspacings[intf_num] = DEFAULT_REGSPACING;
+                info->io.regspacing = DEFAULT_REGSPACING;
+        }
        regsizes[intf_num] = regspacings[intf_num];
        info->io.regsize = regsizes[intf_num];
        regshifts[intf_num] = spmi->addr.register_bit_offset;
@@ -1623,7 +1662,13 @@ static int decode_dmi(dmi_header_t *dm, int intf_num)
                }
        } else {
                /* Old DMI spec. */
-                ipmi_data->base_addr = base_addr;
+                /* Note that technically, the lower bit of the base
+                 * address should be 1 if the address is I/O and 0 if
+                 * the address is in memory.  So many systems get that
+                 * wrong (and all that I have seen are I/O) so we just
+                 * ignore that bit and assume I/O.  Systems that use
+                 * memory should use the newer spec, anyway. */
+                ipmi_data->base_addr = base_addr & 0xfffe;
                ipmi_data->addr_space = IPMI_IO_ADDR_SPACE;
                ipmi_data->offset = 1;
        }
@@ -2199,7 +2244,7 @@ static int init_one_smi(int intf_num, struct smi_info **smi)
        /* Wait until we know that we are out of any interrupt
           handlers might have been running before we freed the
           interrupt. */
-        synchronize_kernel();
+        synchronize_sched();
        if (new_smi->si_sm) {
                if (new_smi->handlers)
@@ -2312,7 +2357,7 @@ static void __exit cleanup_one_si(struct smi_info *to_clean)
        /* Wait until we know that we are out of any interrupt
           handlers might have been running before we freed the
           interrupt. */
-        synchronize_kernel();
+        synchronize_sched();
        /* Wait for the timer to stop.  This avoids problems with race
           conditions removing the timer here. */
diff --git a/drivers/char/ipmi/ipmi_watchdog.c b/drivers/char/ipmi/ipmi_watchdog.c
index fd7093879c66..fcd1c02a32cb 100644
--- a/drivers/char/ipmi/ipmi_watchdog.c
+++ b/drivers/char/ipmi/ipmi_watchdog.c
@@ -709,11 +709,11 @@ static int ipmi_close(struct inode *ino, struct file *filep)
                if (expect_close == 42) {
                        ipmi_watchdog_state = WDOG_TIMEOUT_NONE;
                        ipmi_set_timeout(IPMI_SET_TIMEOUT_NO_HB);
-                        clear_bit(0, &ipmi_wdog_open);
                } else {
                        printk(KERN_CRIT PFX "Unexpected close, not stopping watchdog!\n");
                        ipmi_heartbeat();
                }
+                clear_bit(0, &ipmi_wdog_open);
        }
        ipmi_fasync (-1, filep, 0);
diff --git a/drivers/char/rio/rio_linux.c b/drivers/char/rio/rio_linux.c
index a91ae271cf0a..763893e289b3 100644
--- a/drivers/char/rio/rio_linux.c
+++ b/drivers/char/rio/rio_linux.c
@@ -221,7 +221,7 @@ static int rio_probe_addrs[]= {0xc0000, 0xd0000, 0xe0000};
 /* Set the mask to all-ones. This alas, only supports 32 interrupts. 
   Some architectures may need more. -- Changed to LONG to
   support up to 64 bits on 64bit architectures. -- REW 20/06/99 */
-long rio_irqmask = -1;
+static long rio_irqmask = -1;
 MODULE_AUTHOR("Rogier Wolff <R.E.Wolff@bitwizard.nl>, Patrick van de Lageweg <patrick@bitwizard.nl>");
 MODULE_DESCRIPTION("RIO driver");
diff --git a/drivers/char/s3c2410-rtc.c b/drivers/char/s3c2410-rtc.c
index 8e61be34a1d3..ed867db550a9 100644
--- a/drivers/char/s3c2410-rtc.c
+++ b/drivers/char/s3c2410-rtc.c
@@ -116,7 +116,7 @@ static void s3c2410_rtc_setfreq(int freq)
 /* Time read/write */
-static void s3c2410_rtc_gettime(struct rtc_time *rtc_tm)
+static int s3c2410_rtc_gettime(struct rtc_time *rtc_tm)
 {
        unsigned int have_retried = 0;
@@ -151,6 +151,8 @@ static void s3c2410_rtc_gettime(struct rtc_time *rtc_tm)
        rtc_tm->tm_year += 100;
        rtc_tm->tm_mon -= 1;
+        return 0;
 }
@@ -171,7 +173,7 @@ static int s3c2410_rtc_settime(struct rtc_time *tm)
        return 0;
 }
-static void s3c2410_rtc_getalarm(struct rtc_wkalrm *alrm)
+static int s3c2410_rtc_getalarm(struct rtc_wkalrm *alrm)
 {
        struct rtc_time *alm_tm = &alrm->time;
        unsigned int alm_en;
@@ -231,6 +233,8 @@ static void s3c2410_rtc_getalarm(struct rtc_wkalrm *alrm)
        }
        /* todo - set alrm->enabled ? */
+        return 0;
 }
 static int s3c2410_rtc_setalarm(struct rtc_wkalrm *alrm)
diff --git a/drivers/char/specialix.c b/drivers/char/specialix.c
index c789d5ceac76..50e0b612a8a2 100644
--- a/drivers/char/specialix.c
+++ b/drivers/char/specialix.c
@@ -1987,10 +1987,9 @@ static inline int sx_set_serial_info(struct specialix_port * port,
        func_enter();
        /*
-        error = verify_area(VERIFY_READ, (void *) newinfo, sizeof(tmp));
+        if (!access_ok(VERIFY_READ, (void *) newinfo, sizeof(tmp))) {
-        if (error) {
                func_exit();
-                return error;
+                return -EFAULT;
        }
        */
        if (copy_from_user(&tmp, newinfo, sizeof(tmp))) {
@@ -2046,14 +2045,12 @@ static inline int sx_get_serial_info(struct specialix_port * port,
 {
        struct serial_struct tmp;
        struct specialix_board *bp = port_Board(port);
-        //      int error;
        
        func_enter();
        /*
-        error = verify_area(VERIFY_WRITE, (void *) retinfo, sizeof(tmp));
+        if (!access_ok(VERIFY_WRITE, (void *) retinfo, sizeof(tmp)))
-        if (error)
+                return -EFAULT;
-                return error;
        */
        memset(&tmp, 0, sizeof(tmp));
diff --git a/drivers/char/stallion.c b/drivers/char/stallion.c
index de166608c59e..b8899f560b5e 100644
--- a/drivers/char/stallion.c
+++ b/drivers/char/stallion.c
@@ -466,7 +466,7 @@ static int	stl_parsebrd(stlconf_t *confp, char **argp);
 static unsigned long stl_atol(char *str);
-int             stl_init(void);
+static int      stl_init(void);
 static int      stl_open(struct tty_struct *tty, struct file *filp);
 static void     stl_close(struct tty_struct *tty, struct file *filp);
 static int      stl_write(struct tty_struct *tty, const unsigned char *buf, int count);
@@ -3063,7 +3063,7 @@ static struct tty_operations stl_ops = {
 /*****************************************************************************/
-int __init stl_init(void)
+static int __init stl_init(void)
 {
        int i;
        printk(KERN_INFO "%s: version %s\n", stl_drvtitle, stl_drvversion);
diff --git a/drivers/char/vt_ioctl.c b/drivers/char/vt_ioctl.c
index 5d386f4bea49..8971484b956b 100644
--- a/drivers/char/vt_ioctl.c
+++ b/drivers/char/vt_ioctl.c
@@ -24,6 +24,7 @@
 #include <linux/major.h>
 #include <linux/fs.h>
 #include <linux/console.h>
+#include <linux/signal.h>
 #include <asm/io.h>
 #include <asm/uaccess.h>
@@ -641,7 +642,7 @@ int vt_ioctl(struct tty_struct *tty, struct file * file,
                extern int spawnpid, spawnsig;
                if (!perm || !capable(CAP_KILL))
                  return -EPERM;
-                if (arg < 1 || arg > _NSIG || arg == SIGKILL)
+                if (!valid_signal(arg) || arg < 1 || arg == SIGKILL)
                  return -EINVAL;
                spawnpid = current->pid;
                spawnsig = arg;
diff --git a/drivers/cpufreq/cpufreq.c b/drivers/cpufreq/cpufreq.c
index b30001f31610..8e561313d094 100644
--- a/drivers/cpufreq/cpufreq.c
+++ b/drivers/cpufreq/cpufreq.c
@@ -223,7 +223,7 @@ static inline void adjust_jiffies(unsigned long val, struct cpufreq_freqs *ci)
        }
        if ((val == CPUFREQ_PRECHANGE  && ci->old < ci->new) ||
            (val == CPUFREQ_POSTCHANGE && ci->old > ci->new) ||
-            (val == CPUFREQ_RESUMECHANGE)) {
+            (val == CPUFREQ_RESUMECHANGE || val == CPUFREQ_SUSPENDCHANGE)) {
                loops_per_jiffy = cpufreq_scale(l_p_j_ref, l_p_j_ref_freq, ci->new);
                dprintk("scaling loops_per_jiffy to %lu for frequency %u kHz\n", loops_per_jiffy, ci->new);
        }
@@ -866,11 +866,90 @@ EXPORT_SYMBOL(cpufreq_get);
 /**
+ *      cpufreq_suspend - let the low level driver prepare for suspend
+ */
+static int cpufreq_suspend(struct sys_device * sysdev, u32 state)
+{
+        int cpu = sysdev->id;
+        unsigned int ret = 0;
+        unsigned int cur_freq = 0;
+        struct cpufreq_policy *cpu_policy;
+        dprintk("resuming cpu %u\n", cpu);
+        if (!cpu_online(cpu))
+                return 0;
+        /* we may be lax here as interrupts are off. Nonetheless
+         * we need to grab the correct cpu policy, as to check
+         * whether we really run on this CPU.
+         */
+        cpu_policy = cpufreq_cpu_get(cpu);
+        if (!cpu_policy)
+                return -EINVAL;
+        /* only handle each CPU group once */
+        if (unlikely(cpu_policy->cpu != cpu)) {
+                cpufreq_cpu_put(cpu_policy);
+                return 0;
+        }
+        if (cpufreq_driver->suspend) {
+                ret = cpufreq_driver->suspend(cpu_policy, state);
+                if (ret) {
+                        printk(KERN_ERR "cpufreq: suspend failed in ->suspend "
+                                        "step on CPU %u\n", cpu_policy->cpu);
+                        cpufreq_cpu_put(cpu_policy);
+                        return ret;
+                }
+        }
+        if (cpufreq_driver->flags & CPUFREQ_CONST_LOOPS)
+                goto out;
+        if (cpufreq_driver->get)
+                cur_freq = cpufreq_driver->get(cpu_policy->cpu);
+        if (!cur_freq || !cpu_policy->cur) {
+                printk(KERN_ERR "cpufreq: suspend failed to assert current "
+                       "frequency is what timing core thinks it is.\n");
+                goto out;
+        }
+        if (unlikely(cur_freq != cpu_policy->cur)) {
+                struct cpufreq_freqs freqs;
+                if (!(cpufreq_driver->flags & CPUFREQ_PM_NO_WARN))
+                        printk(KERN_DEBUG "Warning: CPU frequency is %u, "
+                               "cpufreq assumed %u kHz.\n",
+                               cur_freq, cpu_policy->cur);
+                freqs.cpu = cpu;
+                freqs.old = cpu_policy->cur;
+                freqs.new = cur_freq;
+                notifier_call_chain(&cpufreq_transition_notifier_list,
+                                    CPUFREQ_SUSPENDCHANGE, &freqs);
+                adjust_jiffies(CPUFREQ_SUSPENDCHANGE, &freqs);
+                cpu_policy->cur = cur_freq;
+        }
+ out:
+        cpufreq_cpu_put(cpu_policy);
+        return 0;
+}
+/**
 *      cpufreq_resume -  restore proper CPU frequency handling after resume
 *
 *      1.) resume CPUfreq hardware support (cpufreq_driver->resume())
 *      2.) if ->target and !CPUFREQ_CONST_LOOPS: verify we're in sync
- *      3.) schedule call cpufreq_update_policy() ASAP as interrupts are restored.
+ *      3.) schedule call cpufreq_update_policy() ASAP as interrupts are
+ *          restored.
 */
 static int cpufreq_resume(struct sys_device * sysdev)
 {
@@ -915,21 +994,26 @@ static int cpufreq_resume(struct sys_device * sysdev)
                        cur_freq = cpufreq_driver->get(cpu_policy->cpu);
                if (!cur_freq || !cpu_policy->cur) {
-                        printk(KERN_ERR "cpufreq: resume failed to assert current frequency is what timing core thinks it is.\n");
+                        printk(KERN_ERR "cpufreq: resume failed to assert "
+                                        "current frequency is what timing core "
+                                        "thinks it is.\n");
                        goto out;
                }
                if (unlikely(cur_freq != cpu_policy->cur)) {
                        struct cpufreq_freqs freqs;
-                        printk(KERN_WARNING "Warning: CPU frequency is %u, "
+                        if (!(cpufreq_driver->flags & CPUFREQ_PM_NO_WARN))
-                               "cpufreq assumed %u kHz.\n", cur_freq, cpu_policy->cur);
+                                printk(KERN_WARNING "Warning: CPU frequency"
+                                       "is %u, cpufreq assumed %u kHz.\n",
+                                       cur_freq, cpu_policy->cur);
                        freqs.cpu = cpu;
                        freqs.old = cpu_policy->cur;
                        freqs.new = cur_freq;
-                        notifier_call_chain(&cpufreq_transition_notifier_list, CPUFREQ_RESUMECHANGE, &freqs);
+                        notifier_call_chain(&cpufreq_transition_notifier_list,
+                                        CPUFREQ_RESUMECHANGE, &freqs);
                        adjust_jiffies(CPUFREQ_RESUMECHANGE, &freqs);
                        cpu_policy->cur = cur_freq;
@@ -945,6 +1029,7 @@ out:
 static struct sysdev_driver cpufreq_sysdev_driver = {
        .add            = cpufreq_add_dev,
        .remove         = cpufreq_remove_dev,
+        .suspend        = cpufreq_suspend,
        .resume         = cpufreq_resume,
 };
diff --git a/drivers/ide/ppc/pmac.c b/drivers/ide/ppc/pmac.c
index 6dc273a81327..569f16767442 100644
--- a/drivers/ide/ppc/pmac.c
+++ b/drivers/ide/ppc/pmac.c
@@ -1204,6 +1204,8 @@ pmac_ide_do_suspend(ide_hwif_t *hwif)
        }
 #endif /* CONFIG_BLK_DEV_IDE_PMAC_BLINK */
+        disable_irq(pmif->irq);
        /* The media bay will handle itself just fine */
        if (pmif->mediabay)
                return 0;
@@ -1236,7 +1238,6 @@ pmac_ide_do_resume(ide_hwif_t *hwif)
                ppc_md.feature_call(PMAC_FTR_IDE_ENABLE, pmif->node, pmif->aapl_bus_id, 1);
                msleep(10);
                ppc_md.feature_call(PMAC_FTR_IDE_RESET, pmif->node, pmif->aapl_bus_id, 0);
-                msleep(jiffies_to_msecs(IDE_WAKEUP_DELAY));
                /* Kauai has it different */
                if (pmif->kauai_fcr) {
@@ -1244,11 +1245,15 @@ pmac_ide_do_resume(ide_hwif_t *hwif)
                        fcr |= KAUAI_FCR_UATA_RESET_N | KAUAI_FCR_UATA_ENABLE;
                        writel(fcr, pmif->kauai_fcr);
                }
+                msleep(jiffies_to_msecs(IDE_WAKEUP_DELAY));
        }
        /* Sanitize drive timings */
        sanitize_timings(pmif);
+        enable_irq(pmif->irq);
        return 0;
 }
diff --git a/drivers/infiniband/hw/mthca/mthca_memfree.c b/drivers/infiniband/hw/mthca/mthca_memfree.c
index 986f2180404b..637b30e35592 100644
--- a/drivers/infiniband/hw/mthca/mthca_memfree.c
+++ b/drivers/infiniband/hw/mthca/mthca_memfree.c
@@ -32,10 +32,11 @@
 * $Id$
 */
+#include <linux/mm.h>
 #include "mthca_memfree.h"
 #include "mthca_dev.h"
 #include "mthca_cmd.h"
-#include <linux/mm.h>
 /*
 * We allocate in as big chunks as we can, up to a maximum of 256 KB
diff --git a/drivers/input/joystick/spaceorb.c b/drivers/input/joystick/spaceorb.c
index c76cf8ff29c0..874367bfab08 100644
--- a/drivers/input/joystick/spaceorb.c
+++ b/drivers/input/joystick/spaceorb.c
@@ -116,7 +116,7 @@ static void spaceorb_process_packet(struct spaceorb *spaceorb, struct pt_regs *r
                case 'K':                               /* Button data */
                        if (spaceorb->idx != 5) return;
-                        for (i = 0; i < 7; i++)
+                        for (i = 0; i < 6; i++)
                                input_report_key(dev, spaceorb_buttons[i], (data[2] >> i) & 1);
                        break;
diff --git a/drivers/input/keyboard/atkbd.c b/drivers/input/keyboard/atkbd.c
index f7304f0ce542..ff66ed4ee2cd 100644
--- a/drivers/input/keyboard/atkbd.c
+++ b/drivers/input/keyboard/atkbd.c
@@ -678,7 +678,7 @@ static void atkbd_disconnect(struct serio *serio)
        atkbd_disable(atkbd);
        /* make sure we don't have a command in flight */
-        synchronize_kernel();
+        synchronize_sched();  /* Allow atkbd_interrupt()s to complete. */
        flush_scheduled_work();
        device_remove_file(&serio->dev, &atkbd_attr_extra);
diff --git a/drivers/isdn/capi/capi.c b/drivers/isdn/capi/capi.c
index 06163538bb20..12dee8e9fbbe 100644
--- a/drivers/isdn/capi/capi.c
+++ b/drivers/isdn/capi/capi.c
@@ -60,12 +60,12 @@ MODULE_LICENSE("GPL");
 static struct class_simple *capi_class;
-int capi_major = 68;            /* allocated */
+static int capi_major = 68;             /* allocated */
 #ifdef CONFIG_ISDN_CAPI_MIDDLEWARE
 #define CAPINC_NR_PORTS 32
 #define CAPINC_MAX_PORTS        256
-int capi_ttymajor = 191;
+static int capi_ttymajor = 191;
-int capi_ttyminors = CAPINC_NR_PORTS;
+static int capi_ttyminors = CAPINC_NR_PORTS;
 #endif /* CONFIG_ISDN_CAPI_MIDDLEWARE */
 module_param_named(major, capi_major, uint, 0);
@@ -268,7 +268,7 @@ static void capiminor_free(struct capiminor *mp)
        kfree(mp);
 }
-struct capiminor *capiminor_find(unsigned int minor)
+static struct capiminor *capiminor_find(unsigned int minor)
 {
        struct list_head *l;
        struct capiminor *p = NULL;
@@ -1166,7 +1166,7 @@ static int capinc_tty_write_room(struct tty_struct *tty)
        return room;
 }
-int capinc_tty_chars_in_buffer(struct tty_struct *tty)
+static int capinc_tty_chars_in_buffer(struct tty_struct *tty)
 {
        struct capiminor *mp = (struct capiminor *)tty->driver_data;
        if (!mp || !mp->nccip) {
diff --git a/drivers/isdn/capi/kcapi_proc.c b/drivers/isdn/capi/kcapi_proc.c
index 16dc5418ff41..2cc8b27e4c3b 100644
--- a/drivers/isdn/capi/kcapi_proc.c
+++ b/drivers/isdn/capi/kcapi_proc.c
@@ -89,14 +89,14 @@ static int contrstats_show(struct seq_file *seq, void *v)
        return 0;
 }
-struct seq_operations seq_controller_ops = {
+static struct seq_operations seq_controller_ops = {
        .start  = controller_start,
        .next   = controller_next,
        .stop   = controller_stop,
        .show   = controller_show,
 };
-struct seq_operations seq_contrstats_ops = {
+static struct seq_operations seq_contrstats_ops = {
        .start  = controller_start,
        .next   = controller_next,
        .stop   = controller_stop,
@@ -192,14 +192,14 @@ applstats_show(struct seq_file *seq, void *v)
        return 0;
 }
-struct seq_operations seq_applications_ops = {
+static struct seq_operations seq_applications_ops = {
        .start  = applications_start,
        .next   = applications_next,
        .stop   = applications_stop,
        .show   = applications_show,
 };
-struct seq_operations seq_applstats_ops = {
+static struct seq_operations seq_applstats_ops = {
        .start  = applications_start,
        .next   = applications_next,
        .stop   = applications_stop,
@@ -287,7 +287,7 @@ static int capi_driver_show(struct seq_file *seq, void *v)
        return 0;
 }
-struct seq_operations seq_capi_driver_ops = {
+static struct seq_operations seq_capi_driver_ops = {
        .start  = capi_driver_start,
        .next   = capi_driver_next,
        .stop   = capi_driver_stop,
diff --git a/drivers/isdn/divert/isdn_divert.c b/drivers/isdn/divert/isdn_divert.c
index 1eb112213f0c..0bfd698726a6 100644
--- a/drivers/isdn/divert/isdn_divert.c
+++ b/drivers/isdn/divert/isdn_divert.c
@@ -383,7 +383,7 @@ divert_rule *getruleptr(int idx)
 /*************************************************/
 /* called from common module on an incoming call */
 /*************************************************/
-int isdn_divert_icall(isdn_ctrl *ic)
+static int isdn_divert_icall(isdn_ctrl *ic)
 { int retval = 0;
  unsigned long flags;
  struct call_struc *cs = NULL; 
@@ -552,7 +552,7 @@ void deleteprocs(void)
 /****************************************************/
 /* put a address including address type into buffer */
 /****************************************************/
-int put_address(char *st, u_char *p, int len)
+static int put_address(char *st, u_char *p, int len)
 { u_char retval = 0;
  u_char adr_typ = 0; /* network standard */
@@ -595,7 +595,7 @@ int put_address(char *st, u_char *p, int len)
 /*************************************/
 /* report a succesfull interrogation */
 /*************************************/
-int interrogate_success(isdn_ctrl *ic, struct call_struc *cs)
+static int interrogate_success(isdn_ctrl *ic, struct call_struc *cs)
 { char *src = ic->parm.dss1_io.data;
  int restlen = ic->parm.dss1_io.datalen;
  int cnt = 1;
@@ -689,7 +689,7 @@ int interrogate_success(isdn_ctrl *ic, struct call_struc *cs)
 /*********************************************/
 /* callback for protocol specific extensions */
 /*********************************************/
-int prot_stat_callback(isdn_ctrl *ic)
+static int prot_stat_callback(isdn_ctrl *ic)
 { struct call_struc *cs, *cs1;
  int i;
  unsigned long flags;
@@ -781,7 +781,7 @@ int prot_stat_callback(isdn_ctrl *ic)
 /***************************/
 /* status callback from HL */
 /***************************/
-int isdn_divert_stat_callback(isdn_ctrl *ic)
+static int isdn_divert_stat_callback(isdn_ctrl *ic)
 { struct call_struc *cs, *cs1;
  unsigned long flags;
  int retval;
diff --git a/drivers/macintosh/adbhid.c b/drivers/macintosh/adbhid.c
index 8f93d01d8928..db654e8bd67e 100644
--- a/drivers/macintosh/adbhid.c
+++ b/drivers/macintosh/adbhid.c
@@ -555,6 +555,42 @@ adbhid_buttons_input(unsigned char *data, int nb, struct pt_regs *regs, int auto
 #endif /* CONFIG_PMAC_BACKLIGHT */
                        input_report_key(&adbhid[id]->input, KEY_BRIGHTNESSUP, down);
                        break;
+                case 0xc:       /* videomode switch */
+                        input_report_key(&adbhid[id]->input, KEY_SWITCHVIDEOMODE, down);
+                        break;
+                case 0xd:       /* keyboard illumination toggle */
+                        input_report_key(&adbhid[id]->input, KEY_KBDILLUMTOGGLE, down);
+                        break;
+                case 0xe:       /* keyboard illumination decrease */
+                        input_report_key(&adbhid[id]->input, KEY_KBDILLUMDOWN, down);
+                        break;
+                case 0xf:
+                        switch (data[1]) {
+                        case 0x8f:
+                        case 0x0f:
+                                /* keyboard illumination increase */
+                                input_report_key(&adbhid[id]->input, KEY_KBDILLUMUP, down);
+                                break;
+                        case 0x7f:
+                        case 0xff:
+                                /* keypad overlay toogle */
+                                break;
+                        default:
+                                printk(KERN_INFO "Unhandled ADB_MISC event %02x, %02x, %02x, %02x\n",
+                                       data[0], data[1], data[2], data[3]);
+                                break;
+                        }
+                        break;
+                default:
+                        printk(KERN_INFO "Unhandled ADB_MISC event %02x, %02x, %02x, %02x\n",
+                               data[0], data[1], data[2], data[3]);
+                        break;
                }
          }
          break;
@@ -775,6 +811,10 @@ adbhid_input_register(int id, int default_id, int original_handler_id,
                        set_bit(KEY_BRIGHTNESSUP, adbhid[id]->input.keybit);
                        set_bit(KEY_BRIGHTNESSDOWN, adbhid[id]->input.keybit);
                        set_bit(KEY_EJECTCD, adbhid[id]->input.keybit);
+                        set_bit(KEY_SWITCHVIDEOMODE, adbhid[id]->input.keybit);
+                        set_bit(KEY_KBDILLUMTOGGLE, adbhid[id]->input.keybit);
+                        set_bit(KEY_KBDILLUMDOWN, adbhid[id]->input.keybit);
+                        set_bit(KEY_KBDILLUMUP, adbhid[id]->input.keybit);
                        break;
                }
                if (adbhid[id]->name[0])
diff --git a/drivers/macintosh/via-pmu.c b/drivers/macintosh/via-pmu.c
index fdea1a3a631d..e654aa5eecd4 100644
--- a/drivers/macintosh/via-pmu.c
+++ b/drivers/macintosh/via-pmu.c
@@ -2351,6 +2351,10 @@ pmac_suspend_devices(void)
                return -EBUSY;
        }
+        /* Disable clock spreading on some machines */
+        pmac_tweak_clock_spreading(0);
+        /* Stop preemption */
        preempt_disable();
        /* Make sure the decrementer won't interrupt us */
@@ -2417,11 +2421,12 @@ pmac_wakeup_devices(void)
        /* Re-enable local CPU interrupts */
        local_irq_enable();
        mdelay(100);
        preempt_enable();
+        /* Re-enable clock spreading on some machines */
+        pmac_tweak_clock_spreading(1);
        /* Resume devices */
        device_resume();
diff --git a/drivers/md/dm-crypt.c b/drivers/md/dm-crypt.c
index 77619a56e2bf..0dd6c2b5391b 100644
--- a/drivers/md/dm-crypt.c
+++ b/drivers/md/dm-crypt.c
@@ -331,25 +331,19 @@ crypt_alloc_buffer(struct crypt_config *cc, unsigned int size,
        struct bio *bio;
        unsigned int nr_iovecs = (size + PAGE_SIZE - 1) >> PAGE_SHIFT;
        int gfp_mask = GFP_NOIO | __GFP_HIGHMEM;
-        unsigned long flags = current->flags;
        unsigned int i;
        /*
-         * Tell VM to act less aggressively and fail earlier.
+         * Use __GFP_NOMEMALLOC to tell the VM to act less aggressively and
-         * This is not necessary but increases throughput.
+         * to fail earlier.  This is not necessary but increases throughput.
         * FIXME: Is this really intelligent?
         */
-        current->flags &= ~PF_MEMALLOC;
        if (base_bio)
-                bio = bio_clone(base_bio, GFP_NOIO);
+                bio = bio_clone(base_bio, GFP_NOIO|__GFP_NOMEMALLOC);
        else
-                bio = bio_alloc(GFP_NOIO, nr_iovecs);
+                bio = bio_alloc(GFP_NOIO|__GFP_NOMEMALLOC, nr_iovecs);
-        if (!bio) {
+        if (!bio)
-                if (flags & PF_MEMALLOC)
-                        current->flags |= PF_MEMALLOC;
                return NULL;
-        }
        /* if the last bio was not complete, continue where that one ended */
        bio->bi_idx = *bio_vec_idx;
@@ -386,9 +380,6 @@ crypt_alloc_buffer(struct crypt_config *cc, unsigned int size,
                size -= bv->bv_len;
        }
-        if (flags & PF_MEMALLOC)
-                current->flags |= PF_MEMALLOC;
        if (!bio->bi_size) {
                bio_put(bio);
                return NULL;
diff --git a/drivers/md/multipath.c b/drivers/md/multipath.c
index c9b134cd1532..1891e4930dcc 100644
--- a/drivers/md/multipath.c
+++ b/drivers/md/multipath.c
@@ -355,7 +355,7 @@ static int multipath_remove_disk(mddev_t *mddev, int number)
                        goto abort;
                }
                p->rdev = NULL;
-                synchronize_kernel();
+                synchronize_rcu();
                if (atomic_read(&rdev->nr_pending)) {
                        /* lost the race, try later */
                        err = -EBUSY;
diff --git a/drivers/md/raid1.c b/drivers/md/raid1.c
index a389394b52f6..83380b5d6593 100644
--- a/drivers/md/raid1.c
+++ b/drivers/md/raid1.c
@@ -797,7 +797,7 @@ static int raid1_remove_disk(mddev_t *mddev, int number)
                        goto abort;
                }
                p->rdev = NULL;
-                synchronize_kernel();
+                synchronize_rcu();
                if (atomic_read(&rdev->nr_pending)) {
                        /* lost the race, try later */
                        err = -EBUSY;
diff --git a/drivers/md/raid10.c b/drivers/md/raid10.c
index b100bfe4fdca..e9dc2876a626 100644
--- a/drivers/md/raid10.c
+++ b/drivers/md/raid10.c
@@ -977,7 +977,7 @@ static int raid10_remove_disk(mddev_t *mddev, int number)
                        goto abort;
                }
                p->rdev = NULL;
-                synchronize_kernel();
+                synchronize_rcu();
                if (atomic_read(&rdev->nr_pending)) {
                        /* lost the race, try later */
                        err = -EBUSY;
diff --git a/drivers/md/raid5.c b/drivers/md/raid5.c
index 52c3a81c4aa7..e96e2a10a9c9 100644
--- a/drivers/md/raid5.c
+++ b/drivers/md/raid5.c
@@ -1873,7 +1873,7 @@ static int raid5_remove_disk(mddev_t *mddev, int number)
                        goto abort;
                }
                p->rdev = NULL;
-                synchronize_kernel();
+                synchronize_rcu();
                if (atomic_read(&rdev->nr_pending)) {
                        /* lost the race, try later */
                        err = -EBUSY;
diff --git a/drivers/md/raid6main.c b/drivers/md/raid6main.c
index 7e30ab29691a..8a33f351e092 100644
--- a/drivers/md/raid6main.c
+++ b/drivers/md/raid6main.c
@@ -2038,7 +2038,7 @@ static int raid6_remove_disk(mddev_t *mddev, int number)
                        goto abort;
                }
                p->rdev = NULL;
-                synchronize_kernel();
+                synchronize_rcu();
                if (atomic_read(&rdev->nr_pending)) {
                        /* lost the race, try later */
                        err = -EBUSY;
diff --git a/drivers/media/common/ir-common.c b/drivers/media/common/ir-common.c
index 8c842e2f59a2..84a49d2ec919 100644
--- a/drivers/media/common/ir-common.c
+++ b/drivers/media/common/ir-common.c
@@ -131,10 +131,10 @@ IR_KEYTAB_TYPE ir_codes_winfast[IR_KEYTAB_SIZE] = {
        [ 18 ] = KEY_KP0,
        [  0 ] = KEY_POWER,
-//      [ 27 ] = MTS button
+        [ 27 ] = KEY_LANGUAGE,  //MTS button
        [  2 ] = KEY_TUNER,     // TV/FM
        [ 30 ] = KEY_VIDEO,
-//      [ 22 ] = display button
+        [ 22 ] = KEY_INFO,      //display button
        [  4 ] = KEY_VOLUMEUP,
        [  8 ] = KEY_VOLUMEDOWN,
        [ 12 ] = KEY_CHANNELUP,
@@ -142,7 +142,7 @@ IR_KEYTAB_TYPE ir_codes_winfast[IR_KEYTAB_SIZE] = {
        [  3 ] = KEY_ZOOM,      // fullscreen
        [ 31 ] = KEY_SUBTITLE,  // closed caption/teletext
        [ 32 ] = KEY_SLEEP,
-//      [ 41 ] = boss key
+        [ 41 ] = KEY_SEARCH,    //boss key
        [ 20 ] = KEY_MUTE,
        [ 43 ] = KEY_RED,
        [ 44 ] = KEY_GREEN,
@@ -150,17 +150,17 @@ IR_KEYTAB_TYPE ir_codes_winfast[IR_KEYTAB_SIZE] = {
        [ 46 ] = KEY_BLUE,
        [ 24 ] = KEY_KPPLUS,    //fine tune +
        [ 25 ] = KEY_KPMINUS,   //fine tune -
-//      [ 42 ] = picture in picture
+        [ 42 ] = KEY_ANGLE,     //picture in picture
-        [ 33 ] = KEY_KPDOT,
+        [ 33 ] = KEY_KPDOT,
        [ 19 ] = KEY_KPENTER,
-//      [ 17 ] = recall
+        [ 17 ] = KEY_AGAIN,     //recall
        [ 34 ] = KEY_BACK,
        [ 35 ] = KEY_PLAYPAUSE,
        [ 36 ] = KEY_NEXT,
-//      [ 37 ] = time shifting
+        [ 37 ] = KEY_T,         //time shifting
        [ 38 ] = KEY_STOP,
-        [ 39 ] = KEY_RECORD
+        [ 39 ] = KEY_RECORD,
-//      [ 40 ] = snapshot
+        [ 40 ] = KEY_SHUFFLE    //snapshot
 };
 EXPORT_SYMBOL_GPL(ir_codes_winfast);
diff --git a/drivers/media/dvb/frontends/cx22702.c b/drivers/media/dvb/frontends/cx22702.c
index 1930b513eefa..011860ce36cc 100644
--- a/drivers/media/dvb/frontends/cx22702.c
+++ b/drivers/media/dvb/frontends/cx22702.c
@@ -32,6 +32,7 @@
 #include <linux/slab.h>
 #include <linux/delay.h>
 #include "dvb_frontend.h"
+#include "dvb-pll.h"
 #include "cx22702.h"
@@ -203,7 +204,19 @@ static int cx22702_set_tps (struct dvb_frontend* fe, struct dvb_frontend_paramet
        /* set PLL */
        cx22702_writereg (state, 0x0D, cx22702_readreg(state,0x0D) &0xfe);
-        state->config->pll_set(fe, p);
+        if (state->config->pll_set) {
+                state->config->pll_set(fe, p);
+        } else if (state->config->pll_desc) {
+                u8 pllbuf[4];
+                struct i2c_msg msg = { .addr = state->config->pll_address,
+                                       .buf = pllbuf, .len = 4 };
+                dvb_pll_configure(state->config->pll_desc, pllbuf,
+                                  p->frequency,
+                                  p->u.ofdm.bandwidth);
+                i2c_transfer(state->i2c, &msg, 1);
+        } else {
+                BUG();
+        }
        cx22702_writereg (state, 0x0D, cx22702_readreg(state,0x0D) | 1);
        /* set inversion */
diff --git a/drivers/media/dvb/frontends/cx22702.h b/drivers/media/dvb/frontends/cx22702.h
index 6e34f997aba2..559fdb906669 100644
--- a/drivers/media/dvb/frontends/cx22702.h
+++ b/drivers/media/dvb/frontends/cx22702.h
@@ -36,6 +36,9 @@ struct cx22702_config
        u8 demod_address;
        /* PLL maintenance */
+        u8 pll_address;
+        struct dvb_pll_desc *pll_desc;
        int (*pll_init)(struct dvb_frontend* fe);
        int (*pll_set)(struct dvb_frontend* fe, struct dvb_frontend_parameters* params);
 };
diff --git a/drivers/media/video/Kconfig b/drivers/media/video/Kconfig
index c1b3542dad88..d3dd4228b72d 100644
--- a/drivers/media/video/Kconfig
+++ b/drivers/media/video/Kconfig
@@ -252,6 +252,7 @@ config VIDEO_SAA7134_DVB
        depends on VIDEO_SAA7134 && DVB_CORE
        select VIDEO_BUF_DVB
        select DVB_MT352
+        select DVB_CX22702
        ---help---
          This adds support for DVB cards based on the
          Philips saa7134 chip.
diff --git a/drivers/media/video/bttv-driver.c b/drivers/media/video/bttv-driver.c
index c13f222fe6bd..033cc5498f23 100644
--- a/drivers/media/video/bttv-driver.c
+++ b/drivers/media/video/bttv-driver.c
@@ -3169,7 +3169,7 @@ static struct video_device radio_template =
 /* ----------------------------------------------------------------------- */
 /* some debug code                                                         */
-int bttv_risc_decode(u32 risc)
+static int bttv_risc_decode(u32 risc)
 {
        static char *instr[16] = {
                [ BT848_RISC_WRITE     >> 28 ] = "write",
@@ -3206,8 +3206,8 @@ int bttv_risc_decode(u32 risc)
        return incr[risc >> 28] ? incr[risc >> 28] : 1;
 }
-void bttv_risc_disasm(struct bttv *btv,
+static void bttv_risc_disasm(struct bttv *btv,
-                      struct btcx_riscmem *risc)
+                             struct btcx_riscmem *risc)
 {
        unsigned int i,j,n;
diff --git a/drivers/media/video/cx88/cx88-core.c b/drivers/media/video/cx88/cx88-core.c
index 26a6138015cb..1ff79b5a8835 100644
--- a/drivers/media/video/cx88/cx88-core.c
+++ b/drivers/media/video/cx88/cx88-core.c
@@ -429,7 +429,7 @@ int cx88_sram_channel_setup(struct cx88_core *core,
 /* ------------------------------------------------------------------ */
 /* debug helper code                                                  */
-int cx88_risc_decode(u32 risc)
+static int cx88_risc_decode(u32 risc)
 {
        static char *instr[16] = {
                [ RISC_SYNC    >> 28 ] = "sync",
@@ -542,7 +542,7 @@ void cx88_sram_channel_dump(struct cx88_core *core,
               core->name,cx_read(ch->cnt2_reg));
 }
-char *cx88_pci_irqs[32] = {
+static char *cx88_pci_irqs[32] = {
        "vid", "aud", "ts", "vip", "hst", "5", "6", "tm1",
        "src_dma", "dst_dma", "risc_rd_err", "risc_wr_err",
        "brdg_err", "src_dma_err", "dst_dma_err", "ipb_dma_err",
@@ -1206,7 +1206,6 @@ void cx88_core_put(struct cx88_core *core, struct pci_dev *pci)
 /* ------------------------------------------------------------------ */
 EXPORT_SYMBOL(cx88_print_ioctl);
-EXPORT_SYMBOL(cx88_pci_irqs);
 EXPORT_SYMBOL(cx88_vid_irqs);
 EXPORT_SYMBOL(cx88_mpeg_irqs);
 EXPORT_SYMBOL(cx88_print_irqbits);
diff --git a/drivers/media/video/cx88/cx88-dvb.c b/drivers/media/video/cx88/cx88-dvb.c
index bc6f18c45357..9d15d3d5a2b7 100644
--- a/drivers/media/video/cx88/cx88-dvb.c
+++ b/drivers/media/video/cx88/cx88-dvb.c
@@ -31,7 +31,7 @@
 #include <linux/suspend.h>
 /* those two frontends need merging via linuxtv cvs ... */
-#define HAVE_CX22702 0
+#define HAVE_CX22702 1
 #define HAVE_OR51132 1
 #include "cx88.h"
@@ -91,7 +91,7 @@ static void dvb_buf_release(struct videobuf_queue *q, struct videobuf_buffer *vb
        cx88_free_buffer(dev->pci, (struct cx88_buffer*)vb);
 }
-struct videobuf_queue_ops dvb_qops = {
+static struct videobuf_queue_ops dvb_qops = {
        .buf_setup    = dvb_buf_setup,
        .buf_prepare  = dvb_buf_prepare,
        .buf_queue    = dvb_buf_queue,
@@ -191,7 +191,7 @@ static int or51132_set_ts_param(struct dvb_frontend* fe,
        return 0;
 }
-struct or51132_config pchdtv_hd3000 = {
+static struct or51132_config pchdtv_hd3000 = {
        .demod_address    = 0x15,
        .pll_address      = 0x61,
        .pll_desc         = &dvb_pll_thomson_dtt7610,
@@ -243,10 +243,8 @@ static int dvb_register(struct cx8802_dev *dev)
                break;
 #endif
        default:
-                printk("%s: The frontend of your DVB/ATSC card isn't supported yet\n"
+                printk("%s: The frontend of your DVB/ATSC card isn't supported yet\n",
-                       "%s: you might want to look out for patches here:\n"
+                       dev->core->name);
-                       "%s:     http://dl.bytesex.org/patches/\n",
-                       dev->core->name, dev->core->name, dev->core->name);
                break;
        }
        if (NULL == dev->dvb.frontend) {
@@ -308,9 +306,11 @@ static int __devinit dvb_probe(struct pci_dev *pci_dev,
                            dev);
        err = dvb_register(dev);
        if (0 != err)
-                goto fail_free;
+                goto fail_fini;
        return 0;
+ fail_fini:
+        cx8802_fini_common(dev);
 fail_free:
        kfree(dev);
 fail_core:
diff --git a/drivers/media/video/cx88/cx88-i2c.c b/drivers/media/video/cx88/cx88-i2c.c
index 60800172c026..0725b1288f4f 100644
--- a/drivers/media/video/cx88/cx88-i2c.c
+++ b/drivers/media/video/cx88/cx88-i2c.c
@@ -45,7 +45,7 @@ MODULE_PARM_DESC(i2c_scan,"scan i2c bus at insmod time");
 /* ----------------------------------------------------------------------- */
-void cx8800_bit_setscl(void *data, int state)
+static void cx8800_bit_setscl(void *data, int state)
 {
        struct cx88_core *core = data;
@@ -57,7 +57,7 @@ void cx8800_bit_setscl(void *data, int state)
        cx_read(MO_I2C);
 }
-void cx8800_bit_setsda(void *data, int state)
+static void cx8800_bit_setsda(void *data, int state)
 {
        struct cx88_core *core = data;
diff --git a/drivers/media/video/cx88/cx88-vbi.c b/drivers/media/video/cx88/cx88-vbi.c
index 471e508b0746..0584ff476387 100644
--- a/drivers/media/video/cx88/cx88-vbi.c
+++ b/drivers/media/video/cx88/cx88-vbi.c
@@ -46,9 +46,9 @@ void cx8800_vbi_fmt(struct cx8800_dev *dev, struct v4l2_format *f)
        }
 }
-int cx8800_start_vbi_dma(struct cx8800_dev    *dev,
+static int cx8800_start_vbi_dma(struct cx8800_dev    *dev,
-                         struct cx88_dmaqueue *q,
+                                struct cx88_dmaqueue *q,
-                         struct cx88_buffer   *buf)
+                                struct cx88_buffer   *buf)
 {
        struct cx88_core *core = dev->core;
diff --git a/drivers/media/video/cx88/cx88-video.c b/drivers/media/video/cx88/cx88-video.c
index 701f594e1816..d1f5c92f0ce5 100644
--- a/drivers/media/video/cx88/cx88-video.c
+++ b/drivers/media/video/cx88/cx88-video.c
@@ -325,7 +325,7 @@ static struct cx88_ctrl cx8800_ctls[] = {
                .shift                 = 0,
        }
 };
-const int CX8800_CTLS = ARRAY_SIZE(cx8800_ctls);
+static const int CX8800_CTLS = ARRAY_SIZE(cx8800_ctls);
 /* ------------------------------------------------------------------- */
 /* resource management                                                 */
@@ -665,7 +665,7 @@ static void buffer_release(struct videobuf_queue *q, struct videobuf_buffer *vb)
        cx88_free_buffer(fh->dev->pci,buf);
 }
-struct videobuf_queue_ops cx8800_video_qops = {
+static struct videobuf_queue_ops cx8800_video_qops = {
        .buf_setup    = buffer_setup,
        .buf_prepare  = buffer_prepare,
        .buf_queue    = buffer_queue,
@@ -1924,7 +1924,7 @@ static struct file_operations video_fops =
        .llseek        = no_llseek,
 };
-struct video_device cx8800_video_template =
+static struct video_device cx8800_video_template =
 {
        .name          = "cx8800-video",
        .type          = VID_TYPE_CAPTURE|VID_TYPE_TUNER|VID_TYPE_SCALES,
@@ -1933,7 +1933,7 @@ struct video_device cx8800_video_template =
        .minor         = -1,
 };
-struct video_device cx8800_vbi_template =
+static struct video_device cx8800_vbi_template =
 {
        .name          = "cx8800-vbi",
        .type          = VID_TYPE_TELETEXT|VID_TYPE_TUNER,
@@ -1951,7 +1951,7 @@ static struct file_operations radio_fops =
        .llseek        = no_llseek,
 };
-struct video_device cx8800_radio_template =
+static struct video_device cx8800_radio_template =
 {
        .name          = "cx8800-radio",
        .type          = VID_TYPE_TUNER,
@@ -2226,7 +2226,7 @@ static int cx8800_resume(struct pci_dev *pci_dev)
 /* ----------------------------------------------------------- */
-struct pci_device_id cx8800_pci_tbl[] = {
+static struct pci_device_id cx8800_pci_tbl[] = {
        {
                .vendor       = 0x14f1,
                .device       = 0x8800,
diff --git a/drivers/media/video/cx88/cx88.h b/drivers/media/video/cx88/cx88.h
index b351d9eae615..88eaaaba5ad8 100644
--- a/drivers/media/video/cx88/cx88.h
+++ b/drivers/media/video/cx88/cx88.h
@@ -420,7 +420,6 @@ struct cx8802_dev {
 /* ----------------------------------------------------------- */
 /* cx88-core.c                                                 */
-extern char *cx88_pci_irqs[32];
 extern char *cx88_vid_irqs[32];
 extern char *cx88_mpeg_irqs[32];
 extern void cx88_print_irqbits(char *name, char *tag, char **strings,
@@ -472,9 +471,6 @@ extern void cx88_core_put(struct cx88_core *core,
 /* cx88-vbi.c                                                  */
 void cx8800_vbi_fmt(struct cx8800_dev *dev, struct v4l2_format *f);
-int cx8800_start_vbi_dma(struct cx8800_dev    *dev,
-                         struct cx88_dmaqueue *q,
-                         struct cx88_buffer   *buf);
 int cx8800_stop_vbi_dma(struct cx8800_dev *dev);
 int cx8800_restart_vbi_queue(struct cx8800_dev    *dev,
                             struct cx88_dmaqueue *q);
diff --git a/drivers/media/video/msp3400.c b/drivers/media/video/msp3400.c
index c97df705df5e..7fbb8581a87d 100644
--- a/drivers/media/video/msp3400.c
+++ b/drivers/media/video/msp3400.c
@@ -380,7 +380,9 @@ static void msp3400c_setvolume(struct i2c_client *client,
        int val = 0, bal = 0;
        if (!muted) {
-                val = (volume * 0x7F / 65535) << 8;
+                /* 0x7f instead if 0x73 here has sound quality issues,
+                 * probably due to overmodulation + clipping ... */
+                val = (volume * 0x73 / 65535) << 8;
        }
        if (val) {
                bal = (balance / 256) - 128;
@@ -997,7 +999,13 @@ static int msp34xx_modus(int norm)
 {
        switch (norm) {
        case VIDEO_MODE_PAL:
+#if 1
+                /* experimental: not sure this works with all chip versions */
+                return 0x7003;
+#else
+                /* previous value, try this if it breaks ... */
                return 0x1003;
+#endif
        case VIDEO_MODE_NTSC:  /* BTSC */
                return 0x2003;
        case VIDEO_MODE_SECAM:
@@ -1264,6 +1272,7 @@ static int msp34xxg_thread(void *data)
        int val, std, i;
        printk("msp34xxg: daemon started\n");
+        msp->source = 1; /* default */
        for (;;) {
                d2printk(KERN_DEBUG "msp34xxg: thread: sleep\n");
                msp34xx_sleep(msp,-1);
@@ -1334,8 +1343,9 @@ static void msp34xxg_set_source(struct i2c_client *client, int source)
        /* fix matrix mode to stereo and let the msp choose what
         * to output according to 'source', as recommended
+         * for MONO (source==0) downmixing set bit[7:0] to 0x30
         */
-        int value = (source&0x07)<<8|(source==0 ? 0x00:0x20);
+        int value = (source&0x07)<<8|(source==0 ? 0x30:0x20);
        dprintk("msp34xxg: set source to %d (0x%x)\n", source, value);
        msp3400c_write(client,
                       I2C_MSP3400C_DFP,
@@ -1359,7 +1369,7 @@ static void msp34xxg_set_source(struct i2c_client *client, int source)
        msp3400c_write(client,
                       I2C_MSP3400C_DEM,
                       0x22, /* a2 threshold for stereo/bilingual */
-                       source==0 ? 0x7f0:stereo_threshold);
+                       stereo_threshold);
        msp->source=source;
 }
@@ -1394,7 +1404,7 @@ static void msp34xxg_detect_stereo(struct i2c_client *client)
 static void msp34xxg_set_audmode(struct i2c_client *client, int audmode)
 {
        struct msp3400c *msp = i2c_get_clientdata(client);
-        int source = 0;
+        int source;
        switch (audmode) {
        case V4L2_TUNER_MODE_MONO:
@@ -1410,9 +1420,10 @@ static void msp34xxg_set_audmode(struct i2c_client *client, int audmode)
        case V4L2_TUNER_MODE_LANG2:
                source=4; /* stereo or B */
                break;
-        default: /* doing nothing: a safe, sane default */
+        default:
                audmode = 0;
-                return;
+                source  = 1;
+                break;
        }
        msp->audmode = audmode;
        msp34xxg_set_source(client, source);
@@ -1514,12 +1525,9 @@ static int msp_attach(struct i2c_adapter *adap, int addr, int kind)
        msp->opmode = opmode;
        if (OPMODE_AUTO == msp->opmode) {
-#if 0 /* seems to work for ivtv only, disable by default for now ... */
                if (HAVE_SIMPLER(msp))
                        msp->opmode = OPMODE_SIMPLER;
-                else
+                else if (HAVE_SIMPLE(msp))
-#endif
-                if (HAVE_SIMPLE(msp))
                        msp->opmode = OPMODE_SIMPLE;
                else
                        msp->opmode = OPMODE_MANUAL;
diff --git a/drivers/media/video/saa7134/saa7134-cards.c b/drivers/media/video/saa7134/saa7134-cards.c
index 180d3175ea5b..c51eb7f078d3 100644
--- a/drivers/media/video/saa7134/saa7134-cards.c
+++ b/drivers/media/video/saa7134/saa7134-cards.c
@@ -183,12 +183,12 @@ struct saa7134_board saa7134_boards[] = {
                .name           = "LifeView FlyTV Platinum FM",
                .audio_clock    = 0x00200000,
                .tuner_type     = TUNER_PHILIPS_TDA8290,
-//              .gpiomask       = 0xe000,
+                .gpiomask       = 0x1E000,      /* Set GP16 and unused 15,14,13 to Output */
                .inputs         = {{
                        .name = name_tv,
                        .vmux = 1,
                        .amux = TV,
-//                      .gpio = 0x0000,
+                        .gpio = 0x10000,        /* GP16=1 selects TV input */
                        .tv   = 1,
                },{
 /*                      .name = name_tv_mono,
@@ -212,12 +212,12 @@ struct saa7134_board saa7134_boards[] = {
                        .amux = LINE2,
 //                      .gpio = 0x4000,
                }},
-/*              .radio = {
+                .radio = {
                        .name = name_radio,
-                        .amux = LINE2,
+                        .amux = TV,
-                        .gpio = 0x2000,
+                        .gpio = 0x00000,        /* GP16=0 selects FM radio antenna */
                },
-*/      },
+        },
        [SAA7134_BOARD_EMPRESS] = {
                /* "Gert Vervoort" <gert.vervoort@philips.com> */
                .name           = "EMPRESS",
@@ -1628,11 +1628,17 @@ struct pci_device_id saa7134_pci_tbl[] = {
        },{
                .vendor       = PCI_VENDOR_ID_PHILIPS,
                .device       = PCI_DEVICE_ID_PHILIPS_SAA7133,
-                .subvendor    = 0x5168,
+                .subvendor    = 0x5168, /* Animation Technologies (LifeView) */
                .subdevice    = 0x0214, /* Standard PCI, LR214WF */
                .driver_data  = SAA7134_BOARD_FLYTVPLATINUM_FM,
        },{
                .vendor       = PCI_VENDOR_ID_PHILIPS,
+                .device       = PCI_DEVICE_ID_PHILIPS_SAA7133,
+                .subvendor    = 0x1489, /* KYE */
+                .subdevice    = 0x0214, /* Genius VideoWonder ProTV */
+                .driver_data  = SAA7134_BOARD_FLYTVPLATINUM_FM, /* is an LR214WF actually */
+        },{
+                .vendor       = PCI_VENDOR_ID_PHILIPS,
                .device       = PCI_DEVICE_ID_PHILIPS_SAA7134,
                .subvendor    = 0x16be,
                .subdevice    = 0x0003,
@@ -1948,6 +1954,7 @@ int saa7134_board_init1(struct saa7134_dev *dev)
                dev->has_remote = 1;
                board_flyvideo(dev);
                break;
+        case SAA7134_BOARD_FLYTVPLATINUM_FM:
        case SAA7134_BOARD_CINERGY400:
        case SAA7134_BOARD_CINERGY600:
        case SAA7134_BOARD_CINERGY600_MK3:
diff --git a/drivers/media/video/saa7134/saa7134-dvb.c b/drivers/media/video/saa7134/saa7134-dvb.c
index dd4a6c8ee65f..c2873ae029f9 100644
--- a/drivers/media/video/saa7134/saa7134-dvb.c
+++ b/drivers/media/video/saa7134/saa7134-dvb.c
@@ -172,7 +172,7 @@ static int fe_request_firmware(struct dvb_frontend* fe,
        return request_firmware(fw, name, &dev->pci->dev);
 }
-struct tda1004x_config medion_cardbus = {
+static struct tda1004x_config medion_cardbus = {
        .demod_address = 0x08,  /* not sure this is correct */
        .invert        = 0,
        .invert_oclk   = 0,
diff --git a/drivers/media/video/saa7134/saa7134-input.c b/drivers/media/video/saa7134/saa7134-input.c
index 727d437e07df..ca50cf531f20 100644
--- a/drivers/media/video/saa7134/saa7134-input.c
+++ b/drivers/media/video/saa7134/saa7134-input.c
@@ -379,6 +379,7 @@ int saa7134_input_init1(struct saa7134_dev *dev)
        switch (dev->board) {
        case SAA7134_BOARD_FLYVIDEO2000:
        case SAA7134_BOARD_FLYVIDEO3000:
+        case SAA7134_BOARD_FLYTVPLATINUM_FM:
                ir_codes     = flyvideo_codes;
                mask_keycode = 0xEC00000;
                mask_keydown = 0x0040000;
diff --git a/drivers/media/video/tvaudio.c b/drivers/media/video/tvaudio.c
index 065eb4007b1d..80dc34f18c2c 100644
--- a/drivers/media/video/tvaudio.c
+++ b/drivers/media/video/tvaudio.c
@@ -991,7 +991,7 @@ static int tda9874a_initialize(struct CHIPSTATE *chip)
 {
        if (tda9874a_SIF > 2)
                tda9874a_SIF = 1;
-        if (tda9874a_STD >= 8)
+        if (tda9874a_STD > 8)
                tda9874a_STD = 0;
        if(tda9874a_AMSEL > 1)
                tda9874a_AMSEL = 0;
diff --git a/drivers/net/gt96100eth.h b/drivers/net/gt96100eth.h
index 2f4bfd4dacbe..395869c5ed3e 100644
--- a/drivers/net/gt96100eth.h
+++ b/drivers/net/gt96100eth.h
@@ -214,7 +214,7 @@ typedef struct {
        u32 cmdstat;
        u32 next;
        u32 buff_ptr;
-} gt96100_td_t __attribute__ ((packed));
+} __attribute__ ((packed)) gt96100_td_t;
 typedef struct {
 #ifdef DESC_BE
@@ -227,7 +227,7 @@ typedef struct {
        u32 cmdstat;
        u32 next;
        u32 buff_ptr;
-} gt96100_rd_t __attribute__ ((packed));
+} __attribute__ ((packed)) gt96100_rd_t;
 /* Values for the Tx command-status descriptor entry. */
diff --git a/drivers/net/hp100.c b/drivers/net/hp100.c
index acb170152bbd..b3a898c5a585 100644
--- a/drivers/net/hp100.c
+++ b/drivers/net/hp100.c
@@ -13,8 +13,8 @@
 ** This driver has only been tested with
 ** -- HP J2585B 10/100 Mbit/s PCI Busmaster
 ** -- HP J2585A 10/100 Mbit/s PCI 
-** -- HP J2970  10 Mbit/s PCI Combo 10base-T/BNC
+** -- HP J2970A 10 Mbit/s PCI Combo 10base-T/BNC
-** -- HP J2973  10 Mbit/s PCI 10base-T
+** -- HP J2973A 10 Mbit/s PCI 10base-T
 ** -- HP J2573  10/100 ISA
 ** -- Compex ReadyLink ENET100-VG4  10/100 Mbit/s PCI / EISA
 ** -- Compex FreedomLine 100/VG  10/100 Mbit/s ISA / EISA / PCI
diff --git a/drivers/net/ppp_deflate.c b/drivers/net/ppp_deflate.c
index 507d6328d4eb..3872088fdd10 100644
--- a/drivers/net/ppp_deflate.c
+++ b/drivers/net/ppp_deflate.c
@@ -87,8 +87,7 @@ static void z_comp_free(void *arg)
        if (state) {
                zlib_deflateEnd(&state->strm);
-                if (state->strm.workspace)
+                vfree(state->strm.workspace);
-                        vfree(state->strm.workspace);
                kfree(state);
        }
 }
@@ -308,8 +307,7 @@ static void z_decomp_free(void *arg)
        if (state) {
                zlib_inflateEnd(&state->strm);
-                if (state->strm.workspace)
+                kfree(state->strm.workspace);
-                        kfree(state->strm.workspace);
                kfree(state);
        }
 }
diff --git a/drivers/net/ppp_generic.c b/drivers/net/ppp_generic.c
index c456dc81b873..3b377f6cd4a0 100644
--- a/drivers/net/ppp_generic.c
+++ b/drivers/net/ppp_generic.c
@@ -2467,14 +2467,10 @@ static void ppp_destroy_interface(struct ppp *ppp)
        skb_queue_purge(&ppp->mrq);
 #endif /* CONFIG_PPP_MULTILINK */
 #ifdef CONFIG_PPP_FILTER
-        if (ppp->pass_filter) {
+        kfree(ppp->pass_filter);
-                kfree(ppp->pass_filter);
+        ppp->pass_filter = NULL;
-                ppp->pass_filter = NULL;
+        kfree(ppp->active_filter);
-        }
+        ppp->active_filter = NULL;
-        if (ppp->active_filter) {
-                kfree(ppp->active_filter);
-                ppp->active_filter = NULL;
-        }
 #endif /* CONFIG_PPP_FILTER */
        kfree(ppp);
diff --git a/drivers/net/r8169.c b/drivers/net/r8169.c
index 07e2df09491f..c59507f8a76b 100644
--- a/drivers/net/r8169.c
+++ b/drivers/net/r8169.c
@@ -2385,7 +2385,7 @@ core_down:
        }
        /* Give a racing hard_start_xmit a few cycles to complete. */
-        synchronize_kernel();
+        synchronize_sched();  /* FIXME: should this be synchronize_irq()? */
        /*
         * And now for the 50k$ question: are IRQ disabled or not ?
diff --git a/drivers/net/tg3.c b/drivers/net/tg3.c
index 903d0ced7ddb..058c70c6f1ac 100644
--- a/drivers/net/tg3.c
+++ b/drivers/net/tg3.c
@@ -5830,7 +5830,7 @@ static int tg3_test_interrupt(struct tg3 *tp)
        free_irq(tp->pdev->irq, dev);
        err = request_irq(tp->pdev->irq, tg3_test_isr,
-                          SA_SHIRQ, dev->name, dev);
+                          SA_SHIRQ | SA_SAMPLE_RANDOM, dev->name, dev);
        if (err)
                return err;
@@ -5852,10 +5852,10 @@ static int tg3_test_interrupt(struct tg3 *tp)
        
        if (tp->tg3_flags2 & TG3_FLG2_USING_MSI)
                err = request_irq(tp->pdev->irq, tg3_msi,
-                                  0, dev->name, dev);
+                                  SA_SAMPLE_RANDOM, dev->name, dev);
        else
                err = request_irq(tp->pdev->irq, tg3_interrupt,
-                                  SA_SHIRQ, dev->name, dev);
+                                  SA_SHIRQ | SA_SAMPLE_RANDOM, dev->name, dev);
        if (err)
                return err;
@@ -5908,7 +5908,7 @@ static int tg3_test_msi(struct tg3 *tp)
        tp->tg3_flags2 &= ~TG3_FLG2_USING_MSI;
        err = request_irq(tp->pdev->irq, tg3_interrupt,
-                          SA_SHIRQ, dev->name, dev);
+                          SA_SHIRQ | SA_SAMPLE_RANDOM, dev->name, dev);
        if (err)
                return err;
@@ -5965,10 +5965,10 @@ static int tg3_open(struct net_device *dev)
        }
        if (tp->tg3_flags2 & TG3_FLG2_USING_MSI)
                err = request_irq(tp->pdev->irq, tg3_msi,
-                                  0, dev->name, dev);
+                                  SA_SAMPLE_RANDOM, dev->name, dev);
        else
                err = request_irq(tp->pdev->irq, tg3_interrupt,
-                                  SA_SHIRQ, dev->name, dev);
+                                  SA_SHIRQ | SA_SAMPLE_RANDOM, dev->name, dev);
        if (err) {
                if (tp->tg3_flags2 & TG3_FLG2_USING_MSI) {
diff --git a/drivers/net/wan/cycx_x25.c b/drivers/net/wan/cycx_x25.c
index 5b48cd8568f5..02d57c0b4243 100644
--- a/drivers/net/wan/cycx_x25.c
+++ b/drivers/net/wan/cycx_x25.c
@@ -436,9 +436,7 @@ static int cycx_wan_new_if(struct wan_device *wandev, struct net_device *dev,
        }
        if (err) {
-                if (chan->local_addr)
+                kfree(chan->local_addr);
-                        kfree(chan->local_addr);
                kfree(chan);
                return err;
        }
@@ -458,9 +456,7 @@ static int cycx_wan_del_if(struct wan_device *wandev, struct net_device *dev)
                struct cycx_x25_channel *chan = dev->priv;
                if (chan->svc) {
-                        if (chan->local_addr)
+                        kfree(chan->local_addr);
-                                kfree(chan->local_addr);
                        if (chan->state == WAN_CONNECTED)
                                del_timer(&chan->timer);
                }
diff --git a/drivers/net/wan/pc300_tty.c b/drivers/net/wan/pc300_tty.c
index 29f84ad08730..8454bf6caaa7 100644
--- a/drivers/net/wan/pc300_tty.c
+++ b/drivers/net/wan/pc300_tty.c
@@ -400,10 +400,8 @@ static void cpc_tty_close(struct tty_struct *tty, struct file *flip)
                cpc_tty->buf_rx.last = NULL;
        }
        
-        if (cpc_tty->buf_tx) {
+        kfree(cpc_tty->buf_tx);
-                kfree(cpc_tty->buf_tx);
+        cpc_tty->buf_tx = NULL;
-                cpc_tty->buf_tx = NULL;
-        }
        CPC_TTY_DBG("%s: TTY closed\n",cpc_tty->name);
        
@@ -666,7 +664,7 @@ static void cpc_tty_rx_work(void * data)
        unsigned long port;
        int i, j;
        st_cpc_tty_area *cpc_tty; 
-        volatile st_cpc_rx_buf * buf;
+        volatile st_cpc_rx_buf *buf;
        char flags=0,flg_rx=1; 
        struct tty_ldisc *ld;
@@ -680,9 +678,9 @@ static void cpc_tty_rx_work(void * data)
                        cpc_tty = &cpc_tty_area[port];
                
                        if ((buf=cpc_tty->buf_rx.first) != 0) {
-                                if(cpc_tty->tty) {
+                                if (cpc_tty->tty) {
                                        ld = tty_ldisc_ref(cpc_tty->tty);
-                                        if(ld) {
+                                        if (ld) {
                                                if (ld->receive_buf) {
                                                        CPC_TTY_DBG("%s: call line disc. receive_buf\n",cpc_tty->name);
                                                        ld->receive_buf(cpc_tty->tty, (char *)(buf->data), &flags, buf->size);
@@ -691,7 +689,7 @@ static void cpc_tty_rx_work(void * data)
                                        }
                                }       
                                cpc_tty->buf_rx.first = cpc_tty->buf_rx.first->next;
-                                kfree((unsigned char *)buf);
+                                kfree(buf);
                                buf = cpc_tty->buf_rx.first;
                                flg_rx = 1;
                        }
@@ -733,7 +731,7 @@ static void cpc_tty_rx_disc_frame(pc300ch_t *pc300chan)
 void cpc_tty_receive(pc300dev_t *pc300dev)
 {
-        st_cpc_tty_area    *cpc_tty; 
+        st_cpc_tty_area *cpc_tty; 
        pc300ch_t *pc300chan = (pc300ch_t *)pc300dev->chan; 
        pc300_t *card = (pc300_t *)pc300chan->card; 
        int ch = pc300chan->channel; 
@@ -742,7 +740,7 @@ void cpc_tty_receive(pc300dev_t *pc300dev)
        int rx_len, rx_aux; 
        volatile unsigned char status; 
        unsigned short first_bd = pc300chan->rx_first_bd;
-        st_cpc_rx_buf   *new=NULL;
+        st_cpc_rx_buf *new = NULL;
        unsigned char dsr_rx;
        if (pc300dev->cpc_tty == NULL) { 
@@ -762,7 +760,7 @@ void cpc_tty_receive(pc300dev_t *pc300dev)
                        if (status & DST_EOM) {
                                break;
                        }
-                        ptdescr=(pcsca_bd_t __iomem *)(card->hw.rambase+cpc_readl(&ptdescr->next));
+                        ptdescr = (pcsca_bd_t __iomem *)(card->hw.rambase+cpc_readl(&ptdescr->next));
                }
                        
                if (!rx_len) { 
@@ -771,10 +769,7 @@ void cpc_tty_receive(pc300dev_t *pc300dev)
                                cpc_writel(card->hw.scabase + DRX_REG(EDAL, ch), 
                                                RX_BD_ADDR(ch, pc300chan->rx_last_bd)); 
                        }
-                        if (new) {
+                        kfree(new);
-                                kfree(new);
-                                new = NULL;
-                        }
                        return; 
                }
                
@@ -787,7 +782,7 @@ void cpc_tty_receive(pc300dev_t *pc300dev)
                        continue;
                } 
                
-                new = (st_cpc_rx_buf *) kmalloc(rx_len + sizeof(st_cpc_rx_buf), GFP_ATOMIC);
+                new = (st_cpc_rx_buf *)kmalloc(rx_len + sizeof(st_cpc_rx_buf), GFP_ATOMIC);
                if (new == 0) {
                        cpc_tty_rx_disc_frame(pc300chan);
                        continue;
diff --git a/drivers/net/wan/sdla_chdlc.c b/drivers/net/wan/sdla_chdlc.c
index afbe0024e3e1..496d29237e92 100644
--- a/drivers/net/wan/sdla_chdlc.c
+++ b/drivers/net/wan/sdla_chdlc.c
@@ -3664,15 +3664,10 @@ static void wanpipe_tty_close(struct tty_struct *tty, struct file * filp)
                chdlc_disable_comm_shutdown(card);
                unlock_adapter_irq(&card->wandev.lock,&smp_flags);
-                if (card->tty_buf){
+                kfree(card->tty_buf);
-                        kfree(card->tty_buf);
+                card->tty_buf = NULL;                   
-                        card->tty_buf=NULL;                     
+                kfree(card->tty_rx);
-                }
+                card->tty_rx = NULL;
-                if (card->tty_rx){
-                        kfree(card->tty_rx);
-                        card->tty_rx=NULL;
-                }
        }
        return;
 }
diff --git a/drivers/net/wan/x25_asy.c b/drivers/net/wan/x25_asy.c
index 8c5cfcb55826..1c540d825551 100644
--- a/drivers/net/wan/x25_asy.c
+++ b/drivers/net/wan/x25_asy.c
@@ -107,13 +107,9 @@ static struct x25_asy *x25_asy_alloc(void)
 static void x25_asy_free(struct x25_asy *sl)
 {
        /* Free all X.25 frame buffers. */
-        if (sl->rbuff)  {
+        kfree(sl->rbuff);
-                kfree(sl->rbuff);
-        }
        sl->rbuff = NULL;
-        if (sl->xbuff)  {
+        kfree(sl->xbuff);
-                kfree(sl->xbuff);
-        }
        sl->xbuff = NULL;
        if (!test_and_clear_bit(SLF_INUSE, &sl->flags)) {
@@ -134,10 +130,8 @@ static int x25_asy_change_mtu(struct net_device *dev, int newmtu)
        {
                printk("%s: unable to grow X.25 buffers, MTU change cancelled.\n",
                       dev->name);
-                if (xbuff != NULL)  
+                kfree(xbuff);
-                        kfree(xbuff);
+                kfree(rbuff);
-                if (rbuff != NULL)  
-                        kfree(rbuff);
                return -ENOMEM;
        }
@@ -169,10 +163,8 @@ static int x25_asy_change_mtu(struct net_device *dev, int newmtu)
        spin_unlock_bh(&sl->lock);
-        if (xbuff != NULL) 
+        kfree(xbuff);
-                kfree(xbuff);
+        kfree(rbuff);
-        if (rbuff != NULL)
-                kfree(rbuff);
        return 0;
 }
diff --git a/drivers/pci/hotplug.c b/drivers/pci/hotplug.c
index d471b3ea5d12..021d0f76bc4c 100644
--- a/drivers/pci/hotplug.c
+++ b/drivers/pci/hotplug.c
@@ -120,6 +120,10 @@ static int pci_visit_bridge (struct pci_visit * fn,
 /**
 * pci_visit_dev - scans the pci buses.
+ * @fn: callback functions that are called while visiting
+ * @wrapped_dev: the device to scan
+ * @wrapped_parent: the bus where @wrapped_dev is connected to
+ *
 * Every bus and every function is presented to a custom
 * function that can act upon it.
 */
diff --git a/drivers/pci/rom.c b/drivers/pci/rom.c
index 3e64ff64b38c..838575e3fac6 100644
--- a/drivers/pci/rom.c
+++ b/drivers/pci/rom.c
@@ -14,7 +14,7 @@
 /**
 * pci_enable_rom - enable ROM decoding for a PCI device
- * @dev: PCI device to enable
+ * @pdev: PCI device to enable
 *
 * Enable ROM decoding on @dev.  This involves simply turning on the last
 * bit of the PCI ROM BAR.  Note that some cards may share address decoders
@@ -32,7 +32,7 @@ static void pci_enable_rom(struct pci_dev *pdev)
 /**
 * pci_disable_rom - disable ROM decoding for a PCI device
- * @dev: PCI device to disable
+ * @pdev: PCI device to disable
 *
 * Disable ROM decoding on a PCI device by turning off the last bit in the
 * ROM BAR.
@@ -47,7 +47,7 @@ static void pci_disable_rom(struct pci_dev *pdev)
 /**
 * pci_map_rom - map a PCI ROM to kernel space
- * @dev: pointer to pci device struct
+ * @pdev: pointer to pci device struct
 * @size: pointer to receive size of pci window over ROM
 * @return: kernel virtual pointer to image of ROM
 *
@@ -132,7 +132,7 @@ void __iomem *pci_map_rom(struct pci_dev *pdev, size_t *size)
 /**
 * pci_map_rom_copy - map a PCI ROM to kernel space, create a copy
- * @dev: pointer to pci device struct
+ * @pdev: pointer to pci device struct
 * @size: pointer to receive size of pci window over ROM
 * @return: kernel virtual pointer to image of ROM
 *
@@ -166,7 +166,7 @@ void __iomem *pci_map_rom_copy(struct pci_dev *pdev, size_t *size)
 /**
 * pci_unmap_rom - unmap the ROM from kernel space
- * @dev: pointer to pci device struct
+ * @pdev: pointer to pci device struct
 * @rom: virtual address of the previous mapping
 *
 * Remove a mapping of a previously mapped ROM
@@ -187,7 +187,7 @@ void pci_unmap_rom(struct pci_dev *pdev, void __iomem *rom)
 /**
 * pci_remove_rom - disable the ROM and remove its sysfs attribute
- * @dev: pointer to pci device struct
+ * @pdev: pointer to pci device struct
 *
 * Remove the rom file in sysfs and disable ROM decoding.
 */
@@ -206,7 +206,7 @@ void pci_remove_rom(struct pci_dev *pdev)
 /**
 * pci_cleanup_rom - internal routine for freeing the ROM copy created
 * by pci_map_rom_copy called from remove.c
- * @dev: pointer to pci device struct
+ * @pdev: pointer to pci device struct
 *
 * Free the copied ROM if we allocated one.
 */
diff --git a/drivers/pnp/manager.c b/drivers/pnp/manager.c
index 639e04253482..65ecef738537 100644
--- a/drivers/pnp/manager.c
+++ b/drivers/pnp/manager.c
@@ -253,7 +253,7 @@ void pnp_init_resource_table(struct pnp_resource_table *table)
 /**
 * pnp_clean_resources - clears resources that were not manually set
- * @res - the resources to clean
+ * @res: the resources to clean
 *
 */
 static void pnp_clean_resource_table(struct pnp_resource_table * res)
diff --git a/drivers/pnp/pnpacpi/rsparser.c b/drivers/pnp/pnpacpi/rsparser.c
index c0ddb1eb8c4d..dd61e09029b1 100644
--- a/drivers/pnp/pnpacpi/rsparser.c
+++ b/drivers/pnp/pnpacpi/rsparser.c
@@ -94,8 +94,8 @@ static void
 pnpacpi_parse_allocated_dmaresource(struct pnp_resource_table * res, int dma)
 {
        int i = 0;
-        while (!(res->dma_resource[i].flags & IORESOURCE_UNSET) &&
+        while (i < PNP_MAX_DMA &&
-                        i < PNP_MAX_DMA)
+                        !(res->dma_resource[i].flags & IORESOURCE_UNSET))
                i++;
        if (i < PNP_MAX_DMA) {
                res->dma_resource[i].flags = IORESOURCE_DMA;  // Also clears _UNSET flag
diff --git a/drivers/pnp/pnpbios/rsparser.c b/drivers/pnp/pnpbios/rsparser.c
index 618ac15a9e90..79bce7b75740 100644
--- a/drivers/pnp/pnpbios/rsparser.c
+++ b/drivers/pnp/pnpbios/rsparser.c
@@ -72,7 +72,9 @@ static void
 pnpbios_parse_allocated_dmaresource(struct pnp_resource_table * res, int dma)
 {
        int i = 0;
-        while (!(res->dma_resource[i].flags & IORESOURCE_UNSET) && i < PNP_MAX_DMA) i++;
+        while (i < PNP_MAX_DMA &&
+                        !(res->dma_resource[i].flags & IORESOURCE_UNSET))
+                i++;
        if (i < PNP_MAX_DMA) {
                res->dma_resource[i].flags = IORESOURCE_DMA;  // Also clears _UNSET flag
                if (dma == -1) {
diff --git a/drivers/s390/block/dasd.c b/drivers/s390/block/dasd.c
index b755bac6ccbc..02cfe244e069 100644
--- a/drivers/s390/block/dasd.c
+++ b/drivers/s390/block/dasd.c
@@ -7,7 +7,7 @@
 * Bugreports.to..: <Linux390@de.ibm.com>
 * (C) IBM Corporation, IBM Deutschland Entwicklung GmbH, 1999-2001
 *
- * $Revision: 1.158 $
+ * $Revision: 1.161 $
 */
 #include <linux/config.h>
@@ -1131,13 +1131,17 @@ __dasd_process_blk_queue(struct dasd_device * device)
        request_queue_t *queue;
        struct request *req;
        struct dasd_ccw_req *cqr;
-        int nr_queued;
+        int nr_queued, feature_ro;
        queue = device->request_queue;
        /* No queue ? Then there is nothing to do. */
        if (queue == NULL)
                return;
+        feature_ro = dasd_get_feature(device->cdev, DASD_FEATURE_READONLY);
+        if (feature_ro < 0)     /* no devmap */
+                return;
        /*
         * We requeue request from the block device queue to the ccw
         * queue only in two states. In state DASD_STATE_READY the
@@ -1157,8 +1161,8 @@ __dasd_process_blk_queue(struct dasd_device * device)
               elv_next_request(queue) &&
                nr_queued < DASD_CHANQ_MAX_SIZE) {
                req = elv_next_request(queue);
-                if (test_bit(DASD_FLAG_RO, &device->flags) &&
-                    rq_data_dir(req) == WRITE) {
+                if (feature_ro && rq_data_dir(req) == WRITE) {
                        DBF_DEV_EVENT(DBF_ERR, device,
                                      "Rejecting write request %p",
                                      req);
@@ -1631,6 +1635,7 @@ dasd_setup_queue(struct dasd_device * device)
        blk_queue_max_hw_segments(device->request_queue, -1L);
        blk_queue_max_segment_size(device->request_queue, -1L);
        blk_queue_segment_boundary(device->request_queue, -1L);
+        blk_queue_ordered(device->request_queue, 1);
 }
 /*
@@ -1803,13 +1808,17 @@ dasd_generic_set_online (struct ccw_device *cdev,
 {
        struct dasd_device *device;
-        int rc;
+        int feature_diag, rc;
+        feature_diag = dasd_get_feature(cdev, DASD_FEATURE_USEDIAG);
+        if (feature_diag < 0)
+                return feature_diag;
        device = dasd_create_device(cdev);
        if (IS_ERR(device))
                return PTR_ERR(device);
-        if (test_bit(DASD_FLAG_USE_DIAG, &device->flags)) {
+        if (feature_diag) {
                if (!dasd_diag_discipline_pointer) {
                        printk (KERN_WARNING
                                "dasd_generic couldn't online device %s "
diff --git a/drivers/s390/block/dasd_cmb.c b/drivers/s390/block/dasd_cmb.c
index ed1ab474c0c6..4f365bff275c 100644
--- a/drivers/s390/block/dasd_cmb.c
+++ b/drivers/s390/block/dasd_cmb.c
@@ -1,5 +1,5 @@
 /*
- * linux/drivers/s390/block/dasd_cmb.c ($Revision: 1.6 $)
+ * linux/drivers/s390/block/dasd_cmb.c ($Revision: 1.9 $)
 *
 * Linux on zSeries Channel Measurement Facility support
 *  (dasd device driver interface)
@@ -23,7 +23,6 @@
 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 */
 #include <linux/init.h>
-#include <linux/ioctl32.h>
 #include <linux/module.h>
 #include <asm/ccwdev.h>
 #include <asm/cmb.h>
@@ -84,27 +83,13 @@ dasd_ioctl_readall_cmb(struct block_device *bdev, int no, long args)
 static inline int
 ioctl_reg(unsigned int no, dasd_ioctl_fn_t handler)
 {
-        int ret;
+        return dasd_ioctl_no_register(THIS_MODULE, no, handler);
-        ret = dasd_ioctl_no_register(THIS_MODULE, no, handler);
-#ifdef CONFIG_COMPAT
-        if (ret)
-                return ret;
-        ret = register_ioctl32_conversion(no, NULL);
-        if (ret)
-                dasd_ioctl_no_unregister(THIS_MODULE, no, handler);
-#endif
-        return ret;
 }
 static inline void
 ioctl_unreg(unsigned int no, dasd_ioctl_fn_t handler)
 {
        dasd_ioctl_no_unregister(THIS_MODULE, no, handler);
-#ifdef CONFIG_COMPAT
-        unregister_ioctl32_conversion(no);
-#endif
 }
 static void
diff --git a/drivers/s390/block/dasd_devmap.c b/drivers/s390/block/dasd_devmap.c
index ad1841a96c87..1aedc48e5f85 100644
--- a/drivers/s390/block/dasd_devmap.c
+++ b/drivers/s390/block/dasd_devmap.c
@@ -11,7 +11,7 @@
 * functions may not be called from interrupt context. In particular
 * dasd_get_device is a no-no from interrupt context.
 *
- * $Revision: 1.37 $
+ * $Revision: 1.40 $
 */
 #include <linux/config.h>
@@ -513,14 +513,6 @@ dasd_create_device(struct ccw_device *cdev)
        if (!devmap->device) {
                devmap->device = device;
                device->devindex = devmap->devindex;
-                if (devmap->features & DASD_FEATURE_READONLY)
-                        set_bit(DASD_FLAG_RO, &device->flags);
-                else
-                        clear_bit(DASD_FLAG_RO, &device->flags);
-                if (devmap->features & DASD_FEATURE_USEDIAG)
-                        set_bit(DASD_FLAG_USE_DIAG, &device->flags);
-                else
-                        clear_bit(DASD_FLAG_USE_DIAG, &device->flags);
                get_device(&cdev->dev);
                device->cdev = cdev;
                rc = 0;
@@ -651,14 +643,8 @@ dasd_ro_store(struct device *dev, const char *buf, size_t count)
                devmap->features |= DASD_FEATURE_READONLY;
        else
                devmap->features &= ~DASD_FEATURE_READONLY;
-        if (devmap->device) {
+        if (devmap->device && devmap->device->gdp)
-                if (devmap->device->gdp)
+                set_disk_ro(devmap->device->gdp, ro_flag);
-                        set_disk_ro(devmap->device->gdp, ro_flag);
-                if (ro_flag)
-                        set_bit(DASD_FLAG_RO, &devmap->device->flags);
-                else
-                        clear_bit(DASD_FLAG_RO, &devmap->device->flags);
-        }
        spin_unlock(&dasd_devmap_lock);
        return count;
 }
@@ -739,6 +725,45 @@ static struct attribute_group dasd_attr_group = {
        .attrs = dasd_attrs,
 };
+/*
+ * Return value of the specified feature.
+ */
+int
+dasd_get_feature(struct ccw_device *cdev, int feature)
+{
+        struct dasd_devmap *devmap;
+        devmap = dasd_find_busid(cdev->dev.bus_id);
+        if (IS_ERR(devmap))
+                return (int) PTR_ERR(devmap);
+        return ((devmap->features & feature) != 0);
+}
+/*
+ * Set / reset given feature.
+ * Flag indicates wether to set (!=0) or the reset (=0) the feature.
+ */
+int
+dasd_set_feature(struct ccw_device *cdev, int feature, int flag)
+{
+        struct dasd_devmap *devmap;
+        devmap = dasd_find_busid(cdev->dev.bus_id);
+        if (IS_ERR(devmap))
+                return (int) PTR_ERR(devmap);
+        spin_lock(&dasd_devmap_lock);
+        if (flag)
+                devmap->features |= feature;
+        else
+                devmap->features &= ~feature;
+        spin_unlock(&dasd_devmap_lock);
+        return 0;
+}
 int
 dasd_add_sysfs_files(struct ccw_device *cdev)
 {
diff --git a/drivers/s390/block/dasd_eckd.c b/drivers/s390/block/dasd_eckd.c
index 838aedf78a56..811060e10c00 100644
--- a/drivers/s390/block/dasd_eckd.c
+++ b/drivers/s390/block/dasd_eckd.c
@@ -7,7 +7,7 @@
 * Bugreports.to..: <Linux390@de.ibm.com>
 * (C) IBM Corporation, IBM Deutschland Entwicklung GmbH, 1999,2000
 *
- * $Revision: 1.69 $
+ * $Revision: 1.71 $
 */
 #include <linux/config.h>
@@ -1101,7 +1101,8 @@ dasd_eckd_build_cp(struct dasd_device * device, struct request *req)
                                if (dasd_eckd_cdl_special(blk_per_trk, recid)){
                                        rcmd |= 0x8;
                                        count = dasd_eckd_cdl_reclen(recid);
-                                        if (count < blksize)
+                                        if (count < blksize &&
+                                            rq_data_dir(req) == READ)
                                                memset(dst + count, 0xe5,
                                                       blksize - count);
                                }
diff --git a/drivers/s390/block/dasd_genhd.c b/drivers/s390/block/dasd_genhd.c
index 1d52db406b2e..96c49349701f 100644
--- a/drivers/s390/block/dasd_genhd.c
+++ b/drivers/s390/block/dasd_genhd.c
@@ -9,7 +9,7 @@
 *
 * gendisk related functions for the dasd driver.
 *
- * $Revision: 1.48 $
+ * $Revision: 1.50 $
 */
 #include <linux/config.h>
@@ -31,12 +31,16 @@ int
 dasd_gendisk_alloc(struct dasd_device *device)
 {
        struct gendisk *gdp;
-        int len;
+        int len, feature_ro;
        /* Make sure the minor for this device exists. */
        if (device->devindex >= DASD_PER_MAJOR)
                return -EBUSY;
+        feature_ro = dasd_get_feature(device->cdev, DASD_FEATURE_READONLY);
+        if (feature_ro < 0)
+                return feature_ro;
        gdp = alloc_disk(1 << DASD_PARTN_BITS);
        if (!gdp)
                return -ENOMEM;
@@ -71,7 +75,7 @@ dasd_gendisk_alloc(struct dasd_device *device)
        sprintf(gdp->devfs_name, "dasd/%s", device->cdev->dev.bus_id);
-        if (test_bit(DASD_FLAG_RO, &device->flags))
+        if (feature_ro)
                set_disk_ro(gdp, 1);
        gdp->private_data = device;
        gdp->queue = device->request_queue;
diff --git a/drivers/s390/block/dasd_int.h b/drivers/s390/block/dasd_int.h
index 4586e0ecc526..a9f38b235981 100644
--- a/drivers/s390/block/dasd_int.h
+++ b/drivers/s390/block/dasd_int.h
@@ -6,7 +6,7 @@
 * Bugreports.to..: <Linux390@de.ibm.com>
 * (C) IBM Corporation, IBM Deutschland Entwicklung GmbH, 1999,2000
 *
- * $Revision: 1.63 $
+ * $Revision: 1.64 $
 */
 #ifndef DASD_INT_H
@@ -329,8 +329,6 @@ struct dasd_device {
 #define DASD_STOPPED_DC_EIO  16        /* disconnected, return -EIO */
 /* per device flags */
-#define DASD_FLAG_RO            0       /* device is read-only */
-#define DASD_FLAG_USE_DIAG      1       /* use diag disciplnie */
 #define DASD_FLAG_DSC_ERROR     2       /* return -EIO when disconnected */
 #define DASD_FLAG_OFFLINE       3       /* device is in offline processing */
@@ -501,6 +499,9 @@ void dasd_devmap_exit(void);
 struct dasd_device *dasd_create_device(struct ccw_device *);
 void dasd_delete_device(struct dasd_device *);
+int dasd_get_feature(struct ccw_device *, int);
+int dasd_set_feature(struct ccw_device *, int, int);
 int dasd_add_sysfs_files(struct ccw_device *);
 void dasd_remove_sysfs_files(struct ccw_device *);
diff --git a/drivers/s390/block/dasd_ioctl.c b/drivers/s390/block/dasd_ioctl.c
index f1892baa3b18..980c555aa538 100644
--- a/drivers/s390/block/dasd_ioctl.c
+++ b/drivers/s390/block/dasd_ioctl.c
@@ -7,6 +7,8 @@
 * Bugreports.to..: <Linux390@de.ibm.com>
 * (C) IBM Corporation, IBM Deutschland Entwicklung GmbH, 1999-2001
 *
+ * $Revision: 1.45 $
+ *
 * i/o controls for the dasd driver.
 */
 #include <linux/config.h>
@@ -294,6 +296,7 @@ dasd_ioctl_format(struct block_device *bdev, int no, long args)
 {
        struct dasd_device *device;
        struct format_data_t fdata;
+        int feature_ro;
        if (!capable(CAP_SYS_ADMIN))
                return -EACCES;
@@ -304,7 +307,11 @@ dasd_ioctl_format(struct block_device *bdev, int no, long args)
        if (device == NULL)
                return -ENODEV;
-        if (test_bit(DASD_FLAG_RO, &device->flags))
+        feature_ro = dasd_get_feature(device->cdev, DASD_FEATURE_READONLY);
+        if (feature_ro < 0)
+                return feature_ro;
+        if (feature_ro)
                return -EROFS;
        if (copy_from_user(&fdata, (void __user *) args,
                           sizeof (struct format_data_t)))
@@ -377,7 +384,7 @@ dasd_ioctl_information(struct block_device *bdev, int no, long args)
        struct dasd_device *device;
        struct dasd_information2_t *dasd_info;
        unsigned long flags;
-        int rc;
+        int rc, feature_ro;
        struct ccw_device *cdev;
        device = bdev->bd_disk->private_data;
@@ -387,6 +394,10 @@ dasd_ioctl_information(struct block_device *bdev, int no, long args)
        if (!device->discipline->fill_info)
                return -EINVAL;
+        feature_ro = dasd_get_feature(device->cdev, DASD_FEATURE_READONLY);
+        if (feature_ro < 0)
+                return feature_ro;
        dasd_info = kmalloc(sizeof(struct dasd_information2_t), GFP_KERNEL);
        if (dasd_info == NULL)
                return -ENOMEM;
@@ -415,9 +426,8 @@ dasd_ioctl_information(struct block_device *bdev, int no, long args)
        if ((device->state < DASD_STATE_READY) ||
            (dasd_check_blocksize(device->bp_block)))
                dasd_info->format = DASD_FORMAT_NONE;
-        
-        dasd_info->features |= test_bit(DASD_FLAG_RO, &device->flags) ?
+        dasd_info->features |= feature_ro;
-                DASD_FEATURE_READONLY : DASD_FEATURE_DEFAULT;
        if (device->discipline)
                memcpy(dasd_info->type, device->discipline->name, 4);
@@ -460,7 +470,7 @@ static int
 dasd_ioctl_set_ro(struct block_device *bdev, int no, long args)
 {
        struct dasd_device *device;
-        int intval;
+        int intval, rc;
        if (!capable(CAP_SYS_ADMIN))
                return -EACCES;
@@ -472,12 +482,11 @@ dasd_ioctl_set_ro(struct block_device *bdev, int no, long args)
        device =  bdev->bd_disk->private_data;
        if (device == NULL)
                return -ENODEV;
        set_disk_ro(bdev->bd_disk, intval);
-        if (intval)
+        rc = dasd_set_feature(device->cdev, DASD_FEATURE_READONLY, intval);
-                set_bit(DASD_FLAG_RO, &device->flags);
-        else
+        return rc;
-                clear_bit(DASD_FLAG_RO, &device->flags);
-        return 0;
 }
 /*
diff --git a/drivers/s390/block/dasd_proc.c b/drivers/s390/block/dasd_proc.c
index 353d41118c62..d7f19745911f 100644
--- a/drivers/s390/block/dasd_proc.c
+++ b/drivers/s390/block/dasd_proc.c
@@ -9,7 +9,7 @@
 *
 * /proc interface for the dasd driver.
 *
- * $Revision: 1.30 $
+ * $Revision: 1.31 $
 */
 #include <linux/config.h>
@@ -54,6 +54,7 @@ dasd_devices_show(struct seq_file *m, void *v)
 {
        struct dasd_device *device;
        char *substr;
+        int feature;
        device = dasd_device_from_devindex((unsigned long) v - 1);
        if (IS_ERR(device))
@@ -77,7 +78,10 @@ dasd_devices_show(struct seq_file *m, void *v)
        else
                seq_printf(m, " is ????????");
        /* Print devices features. */
-        substr = test_bit(DASD_FLAG_RO, &device->flags) ? "(ro)" : " ";
+        feature = dasd_get_feature(device->cdev, DASD_FEATURE_READONLY);
+        if (feature < 0)
+                return 0;
+        substr = feature ? "(ro)" : " ";
        seq_printf(m, "%4s: ", substr);
        /* Print device status information. */
        switch ((device != NULL) ? device->state : -1) {
diff --git a/drivers/s390/cio/airq.c b/drivers/s390/cio/airq.c
index 3720e77b465f..83e6a060668e 100644
--- a/drivers/s390/cio/airq.c
+++ b/drivers/s390/cio/airq.c
@@ -45,7 +45,7 @@ s390_register_adapter_interrupt (adapter_int_handler_t handler)
        else
                ret = (cmpxchg(&adapter_handler, NULL, handler) ? -EBUSY : 0);
        if (!ret)
-                synchronize_kernel();
+                synchronize_sched();  /* Allow interrupts to complete. */
        sprintf (dbf_txt, "ret:%d", ret);
        CIO_TRACE_EVENT (4, dbf_txt);
@@ -65,7 +65,7 @@ s390_unregister_adapter_interrupt (adapter_int_handler_t handler)
                ret = -EINVAL;
        else {
                adapter_handler = NULL;
-                synchronize_kernel();
+                synchronize_sched();  /* Allow interrupts to complete. */
                ret = 0;
        }
        sprintf (dbf_txt, "ret:%d", ret);
diff --git a/drivers/s390/cio/cio.c b/drivers/s390/cio/cio.c
index 99ce5a567982..1d9b3f18d8de 100644
--- a/drivers/s390/cio/cio.c
+++ b/drivers/s390/cio/cio.c
@@ -1,7 +1,7 @@
 /*
 *  drivers/s390/cio/cio.c
 *   S/390 common I/O routines -- low level i/o calls
- *   $Revision: 1.131 $
+ *   $Revision: 1.133 $
 *
 *    Copyright (C) 1999-2002 IBM Deutschland Entwicklung GmbH,
 *                            IBM Corporation
@@ -228,7 +228,7 @@ cio_start_key (struct subchannel *sch,	/* subchannel structure */
 int
 cio_start (struct subchannel *sch, struct ccw1 *cpa, __u8 lpm)
 {
-        return cio_start_key(sch, cpa, lpm, default_storage_key);
+        return cio_start_key(sch, cpa, lpm, PAGE_DEFAULT_KEY);
 }
 /*
diff --git a/drivers/s390/cio/device_ops.c b/drivers/s390/cio/device_ops.c
index 11e260e0b9c9..02d01a0de16c 100644
--- a/drivers/s390/cio/device_ops.c
+++ b/drivers/s390/cio/device_ops.c
@@ -1,7 +1,7 @@
 /*
 *  drivers/s390/cio/device_ops.c
 *
- *   $Revision: 1.55 $
+ *   $Revision: 1.56 $
 *
 *    Copyright (C) 2002 IBM Deutschland Entwicklung GmbH,
 *                       IBM Corporation
@@ -128,7 +128,7 @@ ccw_device_start(struct ccw_device *cdev, struct ccw1 *cpa,
                 unsigned long intparm, __u8 lpm, unsigned long flags)
 {
        return ccw_device_start_key(cdev, cpa, intparm, lpm,
-                                    default_storage_key, flags);
+                                    PAGE_DEFAULT_KEY, flags);
 }
 int
@@ -137,7 +137,7 @@ ccw_device_start_timeout(struct ccw_device *cdev, struct ccw1 *cpa,
                         int expires)
 {
        return ccw_device_start_timeout_key(cdev, cpa, intparm, lpm,
-                                            default_storage_key, flags,
+                                            PAGE_DEFAULT_KEY, flags,
                                            expires);
 }
diff --git a/drivers/s390/cio/qdio.h b/drivers/s390/cio/qdio.h
index 9ad14db24143..b6daadac4e8b 100644
--- a/drivers/s390/cio/qdio.h
+++ b/drivers/s390/cio/qdio.h
@@ -1,7 +1,9 @@
 #ifndef _CIO_QDIO_H
 #define _CIO_QDIO_H
-#define VERSION_CIO_QDIO_H "$Revision: 1.26 $"
+#include <asm/page.h>
+#define VERSION_CIO_QDIO_H "$Revision: 1.32 $"
 #ifdef CONFIG_QDIO_DEBUG
 #define QDIO_VERBOSE_LEVEL 9
@@ -42,7 +44,7 @@
 #define QDIO_Q_LAPS 5
-#define QDIO_STORAGE_KEY 0
+#define QDIO_STORAGE_KEY PAGE_DEFAULT_KEY
 #define L2_CACHELINE_SIZE 256
 #define INDICATORS_PER_CACHELINE (L2_CACHELINE_SIZE/sizeof(__u32))
diff --git a/drivers/s390/crypto/z90main.c b/drivers/s390/crypto/z90main.c
index a98c00c02559..9ec29bb41b28 100644
--- a/drivers/s390/crypto/z90main.c
+++ b/drivers/s390/crypto/z90main.c
@@ -385,8 +385,8 @@ static int z90crypt_release(struct inode *, struct file *);
 static ssize_t z90crypt_read(struct file *, char __user *, size_t, loff_t *);
 static ssize_t z90crypt_write(struct file *, const char __user *,
                                                        size_t, loff_t *);
-static int z90crypt_ioctl(struct inode *, struct file *,
+static long z90crypt_unlocked_ioctl(struct file *, unsigned int, unsigned long);
-                          unsigned int, unsigned long);
+static long z90crypt_compat_ioctl(struct file *, unsigned int, unsigned long);
 static void z90crypt_reader_task(unsigned long);
 static void z90crypt_schedule_reader_task(unsigned long);
@@ -433,12 +433,15 @@ static atomic_t total_open;
 static atomic_t z90crypt_step;
 static struct file_operations z90crypt_fops = {
-        .owner   = THIS_MODULE,
+        .owner          = THIS_MODULE,
-        .read    = z90crypt_read,
+        .read           = z90crypt_read,
-        .write   = z90crypt_write,
+        .write          = z90crypt_write,
-        .ioctl   = z90crypt_ioctl,
+        .unlocked_ioctl = z90crypt_unlocked_ioctl,
-        .open    = z90crypt_open,
+#ifdef CONFIG_COMPAT
-        .release = z90crypt_release
+        .compat_ioctl   = z90crypt_compat_ioctl,
+#endif
+        .open           = z90crypt_open,
+        .release        = z90crypt_release
 };
 #ifndef Z90CRYPT_USE_HOTPLUG
@@ -474,14 +477,13 @@ struct ica_rsa_modexpo_32 { // For 32-bit callers
        compat_uptr_t   n_modulus;
 };
-static int
+static long
-trans_modexpo32(unsigned int fd, unsigned int cmd, unsigned long arg,
+trans_modexpo32(struct file *filp, unsigned int cmd, unsigned long arg)
-                struct file *file)
 {
        struct ica_rsa_modexpo_32 __user *mex32u = compat_ptr(arg);
        struct ica_rsa_modexpo_32  mex32k;
        struct ica_rsa_modexpo __user *mex64;
-        int ret = 0;
+        long ret = 0;
        unsigned int i;
        if (!access_ok(VERIFY_WRITE, mex32u, sizeof(struct ica_rsa_modexpo_32)))
@@ -498,7 +500,7 @@ trans_modexpo32(unsigned int fd, unsigned int cmd, unsigned long arg,
            __put_user(compat_ptr(mex32k.b_key), &mex64->b_key)           ||
            __put_user(compat_ptr(mex32k.n_modulus), &mex64->n_modulus))
                return -EFAULT;
-        ret = sys_ioctl(fd, cmd, (unsigned long)mex64);
+        ret = z90crypt_unlocked_ioctl(filp, cmd, (unsigned long)mex64);
        if (!ret)
                if (__get_user(i, &mex64->outputdatalength) ||
                    __put_user(i, &mex32u->outputdatalength))
@@ -518,14 +520,13 @@ struct ica_rsa_modexpo_crt_32 { // For 32-bit callers
        compat_uptr_t   u_mult_inv;
 };
-static int
+static long
-trans_modexpo_crt32(unsigned int fd, unsigned int cmd, unsigned long arg,
+trans_modexpo_crt32(struct file *filp, unsigned int cmd, unsigned long arg)
-                    struct file *file)
 {
        struct ica_rsa_modexpo_crt_32 __user *crt32u = compat_ptr(arg);
        struct ica_rsa_modexpo_crt_32  crt32k;
        struct ica_rsa_modexpo_crt __user *crt64;
-        int ret = 0;
+        long ret = 0;
        unsigned int i;
        if (!access_ok(VERIFY_WRITE, crt32u,
@@ -546,9 +547,8 @@ trans_modexpo_crt32(unsigned int fd, unsigned int cmd, unsigned long arg,
            __put_user(compat_ptr(crt32k.np_prime), &crt64->np_prime)     ||
            __put_user(compat_ptr(crt32k.nq_prime), &crt64->nq_prime)     ||
            __put_user(compat_ptr(crt32k.u_mult_inv), &crt64->u_mult_inv))
-                ret = -EFAULT;
+                return -EFAULT;
-        if (!ret)
+        ret = z90crypt_unlocked_ioctl(filp, cmd, (unsigned long)crt64);
-                ret = sys_ioctl(fd, cmd, (unsigned long)crt64);
        if (!ret)
                if (__get_user(i, &crt64->outputdatalength) ||
                    __put_user(i, &crt32u->outputdatalength))
@@ -556,66 +556,34 @@ trans_modexpo_crt32(unsigned int fd, unsigned int cmd, unsigned long arg,
        return ret;
 }
-static int compatible_ioctls[] = {
+static long
-        ICAZ90STATUS, Z90QUIESCE, Z90STAT_TOTALCOUNT, Z90STAT_PCICACOUNT,
+z90crypt_compat_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
-        Z90STAT_PCICCCOUNT, Z90STAT_PCIXCCCOUNT, Z90STAT_PCIXCCMCL2COUNT,
-        Z90STAT_PCIXCCMCL3COUNT, Z90STAT_CEX2CCOUNT, Z90STAT_REQUESTQ_COUNT,
-        Z90STAT_PENDINGQ_COUNT, Z90STAT_TOTALOPEN_COUNT, Z90STAT_DOMAIN_INDEX,
-        Z90STAT_STATUS_MASK, Z90STAT_QDEPTH_MASK, Z90STAT_PERDEV_REQCNT,
-};
-static void z90_unregister_ioctl32s(void)
-{
-        int i;
-        unregister_ioctl32_conversion(ICARSAMODEXPO);
-        unregister_ioctl32_conversion(ICARSACRT);
-        for(i = 0; i < ARRAY_SIZE(compatible_ioctls); i++)
-                unregister_ioctl32_conversion(compatible_ioctls[i]);
-}
-static int z90_register_ioctl32s(void)
-{
-        int result, i;
-        result = register_ioctl32_conversion(ICARSAMODEXPO, trans_modexpo32);
-        if (result == -EBUSY) {
-                unregister_ioctl32_conversion(ICARSAMODEXPO);
-                result = register_ioctl32_conversion(ICARSAMODEXPO,
-                                                     trans_modexpo32);
-        }
-        if (result)
-                return result;
-        result = register_ioctl32_conversion(ICARSACRT, trans_modexpo_crt32);
-        if (result == -EBUSY) {
-                unregister_ioctl32_conversion(ICARSACRT);
-                result = register_ioctl32_conversion(ICARSACRT,
-                                                     trans_modexpo_crt32);
-        }
-        if (result)
-                return result;
-        for(i = 0; i < ARRAY_SIZE(compatible_ioctls); i++) {
-                result = register_ioctl32_conversion(compatible_ioctls[i], 0);
-                if (result == -EBUSY) {
-                        unregister_ioctl32_conversion(compatible_ioctls[i]);
-                        result = register_ioctl32_conversion(
-                                                       compatible_ioctls[i], 0);
-                }
-                if (result)
-                        return result;
-        }
-        return 0;
-}
-#else // !CONFIG_COMPAT
-static inline void z90_unregister_ioctl32s(void)
-{
-}
-static inline int z90_register_ioctl32s(void)
 {
-        return 0;
+        switch (cmd) {
+        case ICAZ90STATUS:
+        case Z90QUIESCE:
+        case Z90STAT_TOTALCOUNT:
+        case Z90STAT_PCICACOUNT:
+        case Z90STAT_PCICCCOUNT:
+        case Z90STAT_PCIXCCCOUNT:
+        case Z90STAT_PCIXCCMCL2COUNT:
+        case Z90STAT_PCIXCCMCL3COUNT:
+        case Z90STAT_CEX2CCOUNT:
+        case Z90STAT_REQUESTQ_COUNT:
+        case Z90STAT_PENDINGQ_COUNT:
+        case Z90STAT_TOTALOPEN_COUNT:
+        case Z90STAT_DOMAIN_INDEX:
+        case Z90STAT_STATUS_MASK:
+        case Z90STAT_QDEPTH_MASK:
+        case Z90STAT_PERDEV_REQCNT:
+                return z90crypt_unlocked_ioctl(filp, cmd, arg);
+        case ICARSAMODEXPO:
+                return trans_modexpo32(filp, cmd, arg);
+        case ICARSACRT:
+                return trans_modexpo_crt32(filp, cmd, arg);
+        default:
+                return -ENOIOCTLCMD;
+        }
 }
 #endif
@@ -730,14 +698,9 @@ z90crypt_init_module(void)
        reader_timer.expires = jiffies + (READERTIME * HZ / 1000);
        add_timer(&reader_timer);
-        if ((result = z90_register_ioctl32s()))
-                goto init_module_cleanup;
        return 0; // success
 init_module_cleanup:
-        z90_unregister_ioctl32s();
 #ifndef Z90CRYPT_USE_HOTPLUG
        if ((nresult = misc_deregister(&z90crypt_misc_device)))
                PRINTK("misc_deregister failed with %d.\n", nresult);
@@ -763,8 +726,6 @@ z90crypt_cleanup_module(void)
        PDEBUG("PID %d\n", PID());
-        z90_unregister_ioctl32s();
        remove_proc_entry("driver/z90crypt", 0);
 #ifndef Z90CRYPT_USE_HOTPLUG
@@ -800,7 +761,7 @@ z90crypt_cleanup_module(void)
 *     z90crypt_release
 *     z90crypt_read
 *     z90crypt_write
- *     z90crypt_ioctl
+ *     z90crypt_unlocked_ioctl
 *     z90crypt_status
 *     z90crypt_status_write
 *       disable_card
@@ -1804,9 +1765,8 @@ z90crypt_rsa(struct priv_data *private_data_p, pid_t pid,
 * This function is a little long, but it's really just one large switch
 * statement.
 */
-static int
+static long
-z90crypt_ioctl(struct inode *inode, struct file *filp,
+z90crypt_unlocked_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
-               unsigned int cmd, unsigned long arg)
 {
        struct priv_data *private_data_p = filp->private_data;
        unsigned char *status;
diff --git a/drivers/s390/net/smsgiucv.c b/drivers/s390/net/smsgiucv.c
index a3d285859564..1e3f7f3c662f 100644
--- a/drivers/s390/net/smsgiucv.c
+++ b/drivers/s390/net/smsgiucv.c
@@ -32,7 +32,7 @@ struct smsg_callback {
        struct list_head list;
        char *prefix;
        int len;
-        void (*callback)(char *str);
+        void (*callback)(char *from, char *str);
 };
 MODULE_AUTHOR
@@ -55,8 +55,9 @@ smsg_message_pending(iucv_MessagePending *eib, void *pgm_data)
 {
        struct smsg_callback *cb;
        unsigned char *msg;
+        unsigned char sender[9];
        unsigned short len;
-        int rc;
+        int rc, i;
        len = eib->ln1msg2.ipbfln1f;
        msg = kmalloc(len + 1, GFP_ATOMIC|GFP_DMA);
@@ -69,10 +70,18 @@ smsg_message_pending(iucv_MessagePending *eib, void *pgm_data)
        if (rc == 0) {
                msg[len] = 0;
                EBCASC(msg, len);
+                memcpy(sender, msg, 8);
+                sender[8] = 0;
+                /* Remove trailing whitespace from the sender name. */
+                for (i = 7; i >= 0; i--) {
+                        if (sender[i] != ' ' && sender[i] != '\t')
+                                break;
+                        sender[i] = 0;
+                }
                spin_lock(&smsg_list_lock);
                list_for_each_entry(cb, &smsg_list, list)
                        if (strncmp(msg + 8, cb->prefix, cb->len) == 0) {
-                                cb->callback(msg + 8);
+                                cb->callback(sender, msg + 8);
                                break;
                        }
                spin_unlock(&smsg_list_lock);
@@ -91,7 +100,7 @@ static struct device_driver smsg_driver = {
 };
 int
-smsg_register_callback(char *prefix, void (*callback)(char *str))
+smsg_register_callback(char *prefix, void (*callback)(char *from, char *str))
 {
        struct smsg_callback *cb;
@@ -108,7 +117,7 @@ smsg_register_callback(char *prefix, void (*callback)(char *str))
 }
 void
-smsg_unregister_callback(char *prefix, void (*callback)(char *str))
+smsg_unregister_callback(char *prefix, void (*callback)(char *from, char *str))
 {
        struct smsg_callback *cb, *tmp;
diff --git a/drivers/s390/net/smsgiucv.h b/drivers/s390/net/smsgiucv.h
index 04cd87152964..67f5d4f8378d 100644
--- a/drivers/s390/net/smsgiucv.h
+++ b/drivers/s390/net/smsgiucv.h
@@ -5,6 +5,6 @@
 * Author(s): Martin Schwidefsky (schwidefsky@de.ibm.com)
 */
-int  smsg_register_callback(char *, void (*)(char *));
+int  smsg_register_callback(char *, void (*)(char *, char *));
-void smsg_unregister_callback(char *, void (*)(char *));
+void smsg_unregister_callback(char *, void (*)(char *, char *));
diff --git a/drivers/scsi/pas16.c b/drivers/scsi/pas16.c
index e70dedb0d0a5..7976947c0322 100644
--- a/drivers/scsi/pas16.c
+++ b/drivers/scsi/pas16.c
@@ -137,7 +137,7 @@ static unsigned short pas16_addr = 0;
 static int pas16_irq = 0;
 
-int scsi_irq_translate[] =
+static const int scsi_irq_translate[] =
        { 0,  0,  1,  2,  3,  4,  5,  6, 0,  0,  7,  8,  9,  0, 10, 11 };
 /* The default_irqs array contains values used to set the irq into the
@@ -145,7 +145,7 @@ int scsi_irq_translate[] =
 * irq jumpers on the board).  The first value in the array will be
 * assigned to logical board 0, the next to board 1, etc.
 */
-int default_irqs[] __initdata = 
+static int default_irqs[] __initdata =
        {  PAS16_DEFAULT_BOARD_1_IRQ,
           PAS16_DEFAULT_BOARD_2_IRQ,
           PAS16_DEFAULT_BOARD_3_IRQ,
@@ -177,7 +177,7 @@ static struct base {
 #define NO_BASES (sizeof (bases) / sizeof (struct base))
-unsigned short  pas16_offset[ 8 ] =
+static const unsigned short  pas16_offset[ 8 ] =
    {
        0x1c00,    /* OUTPUT_DATA_REG */
        0x1c01,    /* INITIATOR_COMMAND_REG */
diff --git a/drivers/scsi/ultrastor.c b/drivers/scsi/ultrastor.c
index a00095cc74c6..97f4d9112b48 100644
--- a/drivers/scsi/ultrastor.c
+++ b/drivers/scsi/ultrastor.c
@@ -945,7 +945,7 @@ static int ultrastor_abort(Scsi_Cmnd *SCpnt)
               config.mscp[mscp_index].SCint, SCpnt);
 #endif
    if (config.mscp[mscp_index].SCint == 0)
-        return FAILURE;
+        return FAILED;
    if (config.mscp[mscp_index].SCint != SCpnt) panic("Bad abort");
    config.mscp[mscp_index].SCint = NULL;
diff --git a/drivers/serial/8250.c b/drivers/serial/8250.c
index 218b69372c0b..0d9358608fdf 100644
--- a/drivers/serial/8250.c
+++ b/drivers/serial/8250.c
@@ -51,7 +51,7 @@
 *   share_irqs - whether we pass SA_SHIRQ to request_irq().  This option
 *                is unsafe when used on edge-triggered interrupts.
 */
-unsigned int share_irqs = SERIAL8250_SHARE_IRQS;
+static unsigned int share_irqs = SERIAL8250_SHARE_IRQS;
 /*
 * Debugging.
diff --git a/drivers/serial/imx.c b/drivers/serial/imx.c
index c682c6308cde..01a8726a3f97 100644
--- a/drivers/serial/imx.c
+++ b/drivers/serial/imx.c
@@ -321,18 +321,39 @@ static void imx_break_ctl(struct uart_port *port, int break_state)
 #define TXTL 2 /* reset default */
 #define RXTL 1 /* reset default */
+static int imx_setup_ufcr(struct imx_port *sport, unsigned int mode)
+{
+        unsigned int val;
+        unsigned int ufcr_rfdiv;
+        /* set receiver / transmitter trigger level.
+         * RFDIV is set such way to satisfy requested uartclk value
+         */
+        val = TXTL<<10 | RXTL;
+        ufcr_rfdiv = (imx_get_perclk1() + sport->port.uartclk / 2) / sport->port.uartclk;
+        if(!ufcr_rfdiv)
+                ufcr_rfdiv = 1;
+        if(ufcr_rfdiv >= 7)
+                ufcr_rfdiv = 6;
+        else
+                ufcr_rfdiv = 6 - ufcr_rfdiv;
+        val |= UFCR_RFDIV & (ufcr_rfdiv << 7);
+        UFCR((u32)sport->port.membase) = val;
+        return 0;
+}
 static int imx_startup(struct uart_port *port)
 {
        struct imx_port *sport = (struct imx_port *)port;
        int retval;
-        unsigned int val;
        unsigned long flags;
-        /* set receiver / transmitter trigger level. We assume
+        imx_setup_ufcr(sport, 0);
-         * that RFDIV has been set by the arch setup or by the bootloader.
-         */
-        val = (UFCR((u32)sport->port.membase) & UFCR_RFDIV)  | TXTL<<10 | RXTL;
-        UFCR((u32)sport->port.membase) = val;
        /* disable the DREN bit (Data Ready interrupt enable) before
         * requesting IRQs
@@ -737,9 +758,12 @@ static void __init
 imx_console_get_options(struct imx_port *sport, int *baud,
                           int *parity, int *bits)
 {
        if ( UCR1((u32)sport->port.membase) | UCR1_UARTEN ) {
                /* ok, the port was enabled */
                unsigned int ucr2, ubir,ubmr, uartclk;
+                unsigned int baud_raw;
+                unsigned int ucfr_rfdiv;
                ucr2 = UCR2((u32)sport->port.membase);
@@ -758,9 +782,35 @@ imx_console_get_options(struct imx_port *sport, int *baud,
                ubir = UBIR((u32)sport->port.membase) & 0xffff;
                ubmr = UBMR((u32)sport->port.membase) & 0xffff;
-                uartclk = sport->port.uartclk;
-                *baud = ((uartclk/16) * (ubir + 1)) / (ubmr + 1);
+                ucfr_rfdiv = (UFCR((u32)sport->port.membase) & UFCR_RFDIV) >> 7;
+                if (ucfr_rfdiv == 6)
+                        ucfr_rfdiv = 7;
+                else
+                        ucfr_rfdiv = 6 - ucfr_rfdiv;
+                uartclk = imx_get_perclk1();
+                uartclk /= ucfr_rfdiv;
+                {       /*
+                         * The next code provides exact computation of
+                         *   baud_raw = round(((uartclk/16) * (ubir + 1)) / (ubmr + 1))
+                         * without need of float support or long long division,
+                         * which would be required to prevent 32bit arithmetic overflow
+                         */
+                        unsigned int mul = ubir + 1;
+                        unsigned int div = 16 * (ubmr + 1);
+                        unsigned int rem = uartclk % div;
+                        baud_raw = (uartclk / div) * mul;
+                        baud_raw += (rem * mul + div / 2) / div;
+                        *baud = (baud_raw + 50) / 100 * 100;
+                }
+                if(*baud != baud_raw)
+                        printk(KERN_INFO "Serial: Console IMX rounded baud rate from %d to %d\n",
+                                baud_raw, *baud);
        }
 }
@@ -787,6 +837,8 @@ imx_console_setup(struct console *co, char *options)
        else
                imx_console_get_options(sport, &baud, &parity, &bits);
+        imx_setup_ufcr(sport, 0);
        return uart_set_options(&sport->port, co, baud, parity, bits, flow);
 }
diff --git a/drivers/serial/ioc4_serial.c b/drivers/serial/ioc4_serial.c
index d054f1265701..ba4e13a22a50 100644
--- a/drivers/serial/ioc4_serial.c
+++ b/drivers/serial/ioc4_serial.c
@@ -838,7 +838,7 @@ static int inline port_init(struct ioc4_port *port)
        port->ip_tx_prod = readl(&port->ip_serial_regs->stcir) & PROD_CONS_MASK;
        writel(port->ip_tx_prod, &port->ip_serial_regs->stpir);
        port->ip_rx_cons = readl(&port->ip_serial_regs->srpir) & PROD_CONS_MASK;
-        writel(port->ip_rx_cons, &port->ip_serial_regs->srcir);
+        writel(port->ip_rx_cons | IOC4_SRCIR_ARM, &port->ip_serial_regs->srcir);
        /* Disable interrupts for this 16550 */
        uart = port->ip_uart_regs;
@@ -1272,8 +1272,9 @@ static inline int set_rx_timeout(struct ioc4_port *port, int timeout)
         * and set the rx threshold to that amount.  There are 4 chars
         * per ring entry, so we'll divide the number of chars that will
         * arrive in timeout by 4.
+         * So .... timeout * baud / 10 / HZ / 4, with HZ = 100.
         */
-        threshold = timeout * port->ip_baud / 10 / HZ / 4;
+        threshold = timeout * port->ip_baud / 4000;
        if (threshold == 0)
                threshold = 1;  /* otherwise we'll intr all the time! */
@@ -1285,8 +1286,10 @@ static inline int set_rx_timeout(struct ioc4_port *port, int timeout)
        writel(port->ip_sscr, &port->ip_serial_regs->sscr);
-        /* Now set the rx timeout to the given value */
+        /* Now set the rx timeout to the given value
-        timeout = timeout * IOC4_SRTR_HZ / HZ;
+         * again timeout * IOC4_SRTR_HZ / HZ
+         */
+        timeout = timeout * IOC4_SRTR_HZ / 100;
        if (timeout > IOC4_SRTR_CNT)
                timeout = IOC4_SRTR_CNT;
@@ -1380,7 +1383,7 @@ config_port(struct ioc4_port *port,
        if (port->ip_tx_lowat == 0)
                port->ip_tx_lowat = 1;
-        set_rx_timeout(port, port->ip_rx_timeout);
+        set_rx_timeout(port, 2);
        return 0;
 }
@@ -1685,8 +1688,8 @@ ioc4_change_speed(struct uart_port *the_port,
 {
        struct ioc4_port *port = get_ioc4_port(the_port);
        int baud, bits;
-        unsigned cflag, cval;
+        unsigned cflag;
-        int new_parity = 0, new_parity_enable = 0, new_stop = 1, new_data = 8;
+        int new_parity = 0, new_parity_enable = 0, new_stop = 0, new_data = 8;
        struct uart_info *info = the_port->info;
        cflag = new_termios->c_cflag;
@@ -1694,48 +1697,35 @@ ioc4_change_speed(struct uart_port *the_port,
        switch (cflag & CSIZE) {
        case CS5:
                new_data = 5;
-                cval = 0x00;
                bits = 7;
                break;
        case CS6:
                new_data = 6;
-                cval = 0x01;
                bits = 8;
                break;
        case CS7:
                new_data = 7;
-                cval = 0x02;
                bits = 9;
                break;
        case CS8:
                new_data = 8;
-                cval = 0x03;
                bits = 10;
                break;
        default:
                /* cuz we always need a default ... */
                new_data = 5;
-                cval = 0x00;
                bits = 7;
                break;
        }
        if (cflag & CSTOPB) {
-                cval |= 0x04;
                bits++;
                new_stop = 1;
        }
        if (cflag & PARENB) {
-                cval |= UART_LCR_PARITY;
                bits++;
                new_parity_enable = 1;
-        }
+                if (cflag & PARODD)
-        if (cflag & PARODD) {
+                        new_parity = 1;
-                cval |= UART_LCR_EPAR;
-                new_parity = 1;
-        }
-        if (cflag & IGNPAR) {
-                cval &= ~UART_LCR_PARITY;
-                new_parity_enable = 0;
        }
        baud = uart_get_baud_rate(the_port, new_termios, old_termios,
                                MIN_BAUD_SUPPORTED, MAX_BAUD_SUPPORTED);
@@ -1765,10 +1755,15 @@ ioc4_change_speed(struct uart_port *the_port,
                the_port->ignore_status_mask &= ~N_DATA_READY;
        }
-        if (cflag & CRTSCTS)
+        if (cflag & CRTSCTS) {
                info->flags |= ASYNC_CTS_FLOW;
-        else
+                port->ip_sscr |= IOC4_SSCR_HFC_EN;
+        }
+        else {
                info->flags &= ~ASYNC_CTS_FLOW;
+                port->ip_sscr &= ~IOC4_SSCR_HFC_EN;
+        }
+        writel(port->ip_sscr, &port->ip_serial_regs->sscr);
        /* Set the configuration and proper notification call */
        DPRINT_CONFIG(("%s : port 0x%p cflag 0%o "
@@ -1825,12 +1820,6 @@ static inline int ic4_startup_local(struct uart_port *the_port)
        /* set the speed of the serial port */
        ioc4_change_speed(the_port, info->tty->termios, (struct termios *)0);
-        /* enable hardware flow control - after ioc4_change_speed because
-         * ASYNC_CTS_FLOW is set there */
-        if (info->flags & ASYNC_CTS_FLOW) {
-                port->ip_sscr |= IOC4_SSCR_HFC_EN;
-                writel(port->ip_sscr, &port->ip_serial_regs->sscr);
-        }
        info->flags |= UIF_INITIALIZED;
        return 0;
 }
@@ -1847,7 +1836,6 @@ static void ioc4_cb_output_lowat(struct ioc4_port *port)
        }
 }
 /**
 * handle_intr - service any interrupts for the given port - 2nd level
 *                      called via sd_intr
diff --git a/drivers/serial/jsm/jsm.h b/drivers/serial/jsm/jsm.h
index e0717611c940..777829fa3300 100644
--- a/drivers/serial/jsm/jsm.h
+++ b/drivers/serial/jsm/jsm.h
@@ -393,7 +393,6 @@ int jsm_tty_init(struct jsm_board *);
 int jsm_uart_port_init(struct jsm_board *);
 int jsm_remove_uart_port(struct jsm_board *);
 void jsm_input(struct jsm_channel *ch);
-void jsm_carrier(struct jsm_channel *ch);
 void jsm_check_queue_flow_control(struct jsm_channel *ch);
 #endif
diff --git a/drivers/serial/jsm/jsm_neo.c b/drivers/serial/jsm/jsm_neo.c
index 9b79c1ff6c72..3a11a69feb44 100644
--- a/drivers/serial/jsm/jsm_neo.c
+++ b/drivers/serial/jsm/jsm_neo.c
@@ -688,7 +688,7 @@ static void neo_flush_uart_read(struct jsm_channel *ch)
 /*
 * No locks are assumed to be held when calling this function.
 */
-void neo_clear_break(struct jsm_channel *ch, int force)
+static void neo_clear_break(struct jsm_channel *ch, int force)
 {
        unsigned long lock_flags;
diff --git a/drivers/serial/jsm/jsm_tty.c b/drivers/serial/jsm/jsm_tty.c
index 24fe76c28833..98de2258fd06 100644
--- a/drivers/serial/jsm/jsm_tty.c
+++ b/drivers/serial/jsm/jsm_tty.c
@@ -31,6 +31,8 @@
 #include "jsm.h"
+static void jsm_carrier(struct jsm_channel *ch);
 static inline int jsm_get_mstat(struct jsm_channel *ch)
 {
        unsigned char mstat;
@@ -755,7 +757,7 @@ void jsm_input(struct jsm_channel *ch)
        jsm_printk(IOCTL, INFO, &ch->ch_bd->pci_dev, "finish\n");
 }
-void jsm_carrier(struct jsm_channel *ch)
+static void jsm_carrier(struct jsm_channel *ch)
 {
        struct jsm_board *bd;
diff --git a/drivers/serial/serial_cs.c b/drivers/serial/serial_cs.c
index 9034f9ad37c7..6eeb48f6a482 100644
--- a/drivers/serial/serial_cs.c
+++ b/drivers/serial/serial_cs.c
@@ -107,6 +107,13 @@ struct serial_info {
        int                     line[4];
 };
+struct serial_cfg_mem {
+        tuple_t tuple;
+        cisparse_t parse;
+        u_char buf[256];
+};
 static void serial_config(dev_link_t * link);
 static int serial_event(event_t event, int priority,
                        event_callback_args_t * args);
@@ -357,14 +364,24 @@ static int simple_config(dev_link_t *link)
        static int size_table[2] = { 8, 16 };
        client_handle_t handle = link->handle;
        struct serial_info *info = link->priv;
-        tuple_t tuple;
+        struct serial_cfg_mem *cfg_mem;
-        u_char buf[256];
+        tuple_t *tuple;
-        cisparse_t parse;
+        u_char *buf;
-        cistpl_cftable_entry_t *cf = &parse.cftable_entry;
+        cisparse_t *parse;
+        cistpl_cftable_entry_t *cf;
        config_info_t config;
        int i, j, try;
        int s;
+        cfg_mem = kmalloc(sizeof(struct serial_cfg_mem), GFP_KERNEL);
+        if (!cfg_mem)
+                return -1;
+        tuple = &cfg_mem->tuple;
+        parse = &cfg_mem->parse;
+        cf = &parse->cftable_entry;
+        buf = cfg_mem->buf;
        /* If the card is already configured, look up the port and irq */
        i = pcmcia_get_configuration_info(handle, &config);
        if ((i == CS_SUCCESS) && (config.Attributes & CONF_VALID_CLIENT)) {
@@ -377,21 +394,23 @@ static int simple_config(dev_link_t *link)
                        port = config.BasePort1 + 0x28;
                        info->slave = 1;
                }
-                if (info->slave)
+                if (info->slave) {
+                        kfree(cfg_mem);
                        return setup_serial(handle, info, port, config.AssignedIRQ);
+                }
        }
        link->conf.Vcc = config.Vcc;
        /* First pass: look for a config entry that looks normal. */
-        tuple.TupleData = (cisdata_t *) buf;
+        tuple->TupleData = (cisdata_t *) buf;
-        tuple.TupleOffset = 0;
+        tuple->TupleOffset = 0;
-        tuple.TupleDataMax = 255;
+        tuple->TupleDataMax = 255;
-        tuple.Attributes = 0;
+        tuple->Attributes = 0;
-        tuple.DesiredTuple = CISTPL_CFTABLE_ENTRY;
+        tuple->DesiredTuple = CISTPL_CFTABLE_ENTRY;
        /* Two tries: without IO aliases, then with aliases */
        for (s = 0; s < 2; s++) {
                for (try = 0; try < 2; try++) {
-                        i = first_tuple(handle, &tuple, &parse);
+                        i = first_tuple(handle, tuple, parse);
                        while (i != CS_NO_MORE_ITEMS) {
                                if (i != CS_SUCCESS)
                                        goto next_entry;
@@ -409,14 +428,14 @@ static int simple_config(dev_link_t *link)
                                                goto found_port;
                                }
 next_entry:
-                                i = next_tuple(handle, &tuple, &parse);
+                                i = next_tuple(handle, tuple, parse);
                        }
                }
        }
        /* Second pass: try to find an entry that isn't picky about
           its base address, then try to grab any standard serial port
           address, and finally try to get any free port. */
-        i = first_tuple(handle, &tuple, &parse);
+        i = first_tuple(handle, tuple, parse);
        while (i != CS_NO_MORE_ITEMS) {
                if ((i == CS_SUCCESS) && (cf->io.nwin > 0) &&
                    ((cf->io.flags & CISTPL_IO_LINES_MASK) <= 3)) {
@@ -429,7 +448,7 @@ next_entry:
                                        goto found_port;
                        }
                }
-                i = next_tuple(handle, &tuple, &parse);
+                i = next_tuple(handle, tuple, parse);
        }
      found_port:
@@ -437,6 +456,7 @@ next_entry:
                printk(KERN_NOTICE
                       "serial_cs: no usable port range found, giving up\n");
                cs_error(link->handle, RequestIO, i);
+                kfree(cfg_mem);
                return -1;
        }
@@ -450,9 +470,10 @@ next_entry:
        i = pcmcia_request_configuration(link->handle, &link->conf);
        if (i != CS_SUCCESS) {
                cs_error(link->handle, RequestConfiguration, i);
+                kfree(cfg_mem);
                return -1;
        }
+        kfree(cfg_mem);
        return setup_serial(handle, info, link->io.BasePort1, link->irq.AssignedIRQ);
 }
@@ -460,29 +481,39 @@ static int multi_config(dev_link_t * link)
 {
        client_handle_t handle = link->handle;
        struct serial_info *info = link->priv;
-        tuple_t tuple;
+        struct serial_cfg_mem *cfg_mem;
-        u_char buf[256];
+        tuple_t *tuple;
-        cisparse_t parse;
+        u_char *buf;
-        cistpl_cftable_entry_t *cf = &parse.cftable_entry;
+        cisparse_t *parse;
+        cistpl_cftable_entry_t *cf;
        config_info_t config;
-        int i, base2 = 0;
+        int i, rc, base2 = 0;
+        cfg_mem = kmalloc(sizeof(struct serial_cfg_mem), GFP_KERNEL);
+        if (!cfg_mem)
+                return -1;
+        tuple = &cfg_mem->tuple;
+        parse = &cfg_mem->parse;
+        cf = &parse->cftable_entry;
+        buf = cfg_mem->buf;
        i = pcmcia_get_configuration_info(handle, &config);
        if (i != CS_SUCCESS) {
                cs_error(handle, GetConfigurationInfo, i);
-                return -1;
+                rc = -1;
+                goto free_cfg_mem;
        }
        link->conf.Vcc = config.Vcc;
-        tuple.TupleData = (cisdata_t *) buf;
+        tuple->TupleData = (cisdata_t *) buf;
-        tuple.TupleOffset = 0;
+        tuple->TupleOffset = 0;
-        tuple.TupleDataMax = 255;
+        tuple->TupleDataMax = 255;
-        tuple.Attributes = 0;
+        tuple->Attributes = 0;
-        tuple.DesiredTuple = CISTPL_CFTABLE_ENTRY;
+        tuple->DesiredTuple = CISTPL_CFTABLE_ENTRY;
        /* First, look for a generic full-sized window */
        link->io.NumPorts1 = info->multi * 8;
-        i = first_tuple(handle, &tuple, &parse);
+        i = first_tuple(handle, tuple, parse);
        while (i != CS_NO_MORE_ITEMS) {
                /* The quad port cards have bad CIS's, so just look for a
                   window larger than 8 ports and assume it will be right */
@@ -497,14 +528,14 @@ static int multi_config(dev_link_t * link)
                        if (i == CS_SUCCESS)
                                break;
                }
-                i = next_tuple(handle, &tuple, &parse);
+                i = next_tuple(handle, tuple, parse);
        }
        /* If that didn't work, look for two windows */
        if (i != CS_SUCCESS) {
                link->io.NumPorts1 = link->io.NumPorts2 = 8;
                info->multi = 2;
-                i = first_tuple(handle, &tuple, &parse);
+                i = first_tuple(handle, tuple, parse);
                while (i != CS_NO_MORE_ITEMS) {
                        if ((i == CS_SUCCESS) && (cf->io.nwin == 2)) {
                                link->conf.ConfigIndex = cf->index;
@@ -517,13 +548,14 @@ static int multi_config(dev_link_t * link)
                                if (i == CS_SUCCESS)
                                        break;
                        }
-                        i = next_tuple(handle, &tuple, &parse);
+                        i = next_tuple(handle, tuple, parse);
                }
        }
        if (i != CS_SUCCESS) {
                cs_error(link->handle, RequestIO, i);
-                return -1;
+                rc = -1;
+                goto free_cfg_mem;
        }
        i = pcmcia_request_irq(link->handle, &link->irq);
@@ -541,7 +573,8 @@ static int multi_config(dev_link_t * link)
        i = pcmcia_request_configuration(link->handle, &link->conf);
        if (i != CS_SUCCESS) {
                cs_error(link->handle, RequestConfiguration, i);
-                return -1;
+                rc = -1;
+                goto free_cfg_mem;
        }
        /* The Oxford Semiconductor OXCF950 cards are in fact single-port:
@@ -554,17 +587,23 @@ static int multi_config(dev_link_t * link)
                        setup_serial(handle, info, link->io.BasePort1, link->irq.AssignedIRQ);
                        outb(12, base2 + 1);
                }
-                return 0;
+                rc = 0;
+                goto free_cfg_mem;
        }
        setup_serial(handle, info, link->io.BasePort1, link->irq.AssignedIRQ);
        /* The Nokia cards are not really multiport cards */
-        if (info->manfid == MANFID_NOKIA)
+        if (info->manfid == MANFID_NOKIA) {
-                return 0;
+                rc = 0;
+                goto free_cfg_mem;
+        }
        for (i = 0; i < info->multi - 1; i++)
-                setup_serial(handle, info, base2 + (8 * i), link->irq.AssignedIRQ);
+                setup_serial(handle, info, base2 + (8 * i),
+                                link->irq.AssignedIRQ);
-        return 0;
+        rc = 0;
+free_cfg_mem:
+        kfree(cfg_mem);
+        return rc;
 }
 /*======================================================================
@@ -579,39 +618,49 @@ void serial_config(dev_link_t * link)
 {
        client_handle_t handle = link->handle;
        struct serial_info *info = link->priv;
-        tuple_t tuple;
+        struct serial_cfg_mem *cfg_mem;
-        u_short buf[128];
+        tuple_t *tuple;
-        cisparse_t parse;
+        u_char *buf;
-        cistpl_cftable_entry_t *cf = &parse.cftable_entry;
+        cisparse_t *parse;
+        cistpl_cftable_entry_t *cf;
        int i, last_ret, last_fn;
        DEBUG(0, "serial_config(0x%p)\n", link);
-        tuple.TupleData = (cisdata_t *) buf;
+        cfg_mem = kmalloc(sizeof(struct serial_cfg_mem), GFP_KERNEL);
-        tuple.TupleOffset = 0;
+        if (!cfg_mem)
-        tuple.TupleDataMax = 255;
+                goto failed;
-        tuple.Attributes = 0;
+        tuple = &cfg_mem->tuple;
+        parse = &cfg_mem->parse;
+        cf = &parse->cftable_entry;
+        buf = cfg_mem->buf;
+        tuple->TupleData = (cisdata_t *) buf;
+        tuple->TupleOffset = 0;
+        tuple->TupleDataMax = 255;
+        tuple->Attributes = 0;
        /* Get configuration register information */
-        tuple.DesiredTuple = CISTPL_CONFIG;
+        tuple->DesiredTuple = CISTPL_CONFIG;
-        last_ret = first_tuple(handle, &tuple, &parse);
+        last_ret = first_tuple(handle, tuple, parse);
        if (last_ret != CS_SUCCESS) {
                last_fn = ParseTuple;
                goto cs_failed;
        }
-        link->conf.ConfigBase = parse.config.base;
+        link->conf.ConfigBase = parse->config.base;
-        link->conf.Present = parse.config.rmask[0];
+        link->conf.Present = parse->config.rmask[0];
        /* Configure card */
        link->state |= DEV_CONFIG;
        /* Is this a compliant multifunction card? */
-        tuple.DesiredTuple = CISTPL_LONGLINK_MFC;
+        tuple->DesiredTuple = CISTPL_LONGLINK_MFC;
-        tuple.Attributes = TUPLE_RETURN_COMMON | TUPLE_RETURN_LINK;
+        tuple->Attributes = TUPLE_RETURN_COMMON | TUPLE_RETURN_LINK;
-        info->multi = (first_tuple(handle, &tuple, &parse) == CS_SUCCESS);
+        info->multi = (first_tuple(handle, tuple, parse) == CS_SUCCESS);
        /* Is this a multiport card? */
-        tuple.DesiredTuple = CISTPL_MANFID;
+        tuple->DesiredTuple = CISTPL_MANFID;
-        if (first_tuple(handle, &tuple, &parse) == CS_SUCCESS) {
+        if (first_tuple(handle, tuple, parse) == CS_SUCCESS) {
                info->manfid = le16_to_cpu(buf[0]);
                for (i = 0; i < MULTI_COUNT; i++)
                        if ((info->manfid == multi_id[i].manfid) &&
@@ -623,13 +672,13 @@ void serial_config(dev_link_t * link)
        /* Another check for dual-serial cards: look for either serial or
           multifunction cards that ask for appropriate IO port ranges */
-        tuple.DesiredTuple = CISTPL_FUNCID;
+        tuple->DesiredTuple = CISTPL_FUNCID;
        if ((info->multi == 0) &&
-            ((first_tuple(handle, &tuple, &parse) != CS_SUCCESS) ||
+            ((first_tuple(handle, tuple, parse) != CS_SUCCESS) ||
-             (parse.funcid.func == CISTPL_FUNCID_MULTI) ||
+             (parse->funcid.func == CISTPL_FUNCID_MULTI) ||
-             (parse.funcid.func == CISTPL_FUNCID_SERIAL))) {
+             (parse->funcid.func == CISTPL_FUNCID_SERIAL))) {
-                tuple.DesiredTuple = CISTPL_CFTABLE_ENTRY;
+                tuple->DesiredTuple = CISTPL_CFTABLE_ENTRY;
-                if (first_tuple(handle, &tuple, &parse) == CS_SUCCESS) {
+                if (first_tuple(handle, tuple, parse) == CS_SUCCESS) {
                        if ((cf->io.nwin == 1) && (cf->io.win[0].len % 8 == 0))
                                info->multi = cf->io.win[0].len >> 3;
                        if ((cf->io.nwin == 2) && (cf->io.win[0].len == 8) &&
@@ -664,6 +713,7 @@ void serial_config(dev_link_t * link)
        link->dev = &info->node[0];
        link->state &= ~DEV_CONFIG_PENDING;
+        kfree(cfg_mem);
        return;
 cs_failed:
@@ -671,6 +721,7 @@ void serial_config(dev_link_t * link)
 failed:
        serial_remove(link);
        link->state &= ~DEV_CONFIG_PENDING;
+        kfree(cfg_mem);
 }
 /*======================================================================
diff --git a/drivers/serial/sn_console.c b/drivers/serial/sn_console.c
index ffaab9b90fd8..fee6418e84c4 100644
--- a/drivers/serial/sn_console.c
+++ b/drivers/serial/sn_console.c
@@ -787,7 +787,7 @@ static void __init sn_sal_switch_to_interrupts(struct sn_cons_port *port)
 static void sn_sal_console_write(struct console *, const char *, unsigned);
 static int __init sn_sal_console_setup(struct console *, char *);
-extern struct uart_driver sal_console_uart;
+static struct uart_driver sal_console_uart;
 extern struct tty_driver *uart_console_device(struct console *, int *);
 static struct console sal_console = {
@@ -801,7 +801,7 @@ static struct console sal_console = {
 #define SAL_CONSOLE     &sal_console
-struct uart_driver sal_console_uart = {
+static struct uart_driver sal_console_uart = {
        .owner = THIS_MODULE,
        .driver_name = "sn_console",
        .dev_name = DEVICE_NAME,
diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig
index 2a1c5965de22..6be8fbec0a0e 100644
--- a/drivers/video/Kconfig
+++ b/drivers/video/Kconfig
@@ -198,6 +198,14 @@ config FB_SA1100
          If you plan to use the LCD display with your SA-1100 system, say
          Y here.
+config FB_IMX
+        tristate "Motorola i.MX LCD support"
+        depends on FB && ARM && ARCH_IMX
+        select FB_CFB_FILLRECT
+        select FB_CFB_COPYAREA
+        select FB_CFB_IMAGEBLIT
+        select FB_SOFT_CURSOR
 config FB_CYBER2000
        tristate "CyberPro 2000/2010/5000 support"
        depends on FB && PCI && (BROKEN || !SPARC64)
diff --git a/drivers/video/Makefile b/drivers/video/Makefile
index 92265b741dc3..bd8dc0ffe723 100644
--- a/drivers/video/Makefile
+++ b/drivers/video/Makefile
@@ -90,6 +90,7 @@ obj-$(CONFIG_FB_PMAGB_B)	  += pmagb-b-fb.o
 obj-$(CONFIG_FB_MAXINE)           += maxinefb.o
 obj-$(CONFIG_FB_TX3912)           += tx3912fb.o
 obj-$(CONFIG_FB_S1D13XXX)         += s1d13xxxfb.o
+obj-$(CONFIG_FB_IMX)              += imxfb.o
 # Platform or fallback drivers go here
 obj-$(CONFIG_FB_VESA)             += vesafb.o
diff --git a/drivers/video/amba-clcd.c b/drivers/video/amba-clcd.c
index acdba0c67fb8..321dbe91dc14 100644
--- a/drivers/video/amba-clcd.c
+++ b/drivers/video/amba-clcd.c
@@ -125,28 +125,28 @@ clcdfb_set_bitfields(struct clcd_fb *fb, struct fb_var_screeninfo *var)
        case 2:
        case 4:
        case 8:
-                var->red.length         = 8;
+                var->red.length         = var->bits_per_pixel;
                var->red.offset         = 0;
-                var->green.length       = 8;
+                var->green.length       = var->bits_per_pixel;
                var->green.offset       = 0;
-                var->blue.length        = 8;
+                var->blue.length        = var->bits_per_pixel;
                var->blue.offset        = 0;
                break;
        case 16:
                var->red.length         = 5;
-                var->green.length       = 5;
+                var->green.length       = 6;
                var->blue.length        = 5;
                if (fb->panel->cntl & CNTL_BGR) {
-                        var->red.offset         = 10;
+                        var->red.offset         = 11;
                        var->green.offset       = 5;
                        var->blue.offset        = 0;
                } else {
                        var->red.offset         = 0;
                        var->green.offset       = 5;
-                        var->blue.offset        = 10;
+                        var->blue.offset        = 11;
                }
                break;
-        case 24:
+        case 32:
                if (fb->panel->cntl & CNTL_LCDTFT) {
                        var->red.length         = 8;
                        var->green.length       = 8;
@@ -178,6 +178,12 @@ static int clcdfb_check_var(struct fb_var_screeninfo *var, struct fb_info *info)
        if (fb->board->check)
                ret = fb->board->check(fb, var);
+        if (ret == 0 &&
+            var->xres_virtual * var->bits_per_pixel / 8 *
+            var->yres_virtual > fb->fb.fix.smem_len)
+                ret = -EINVAL;
        if (ret == 0)
                ret = clcdfb_set_bitfields(fb, var);
@@ -250,7 +256,7 @@ clcdfb_setcolreg(unsigned int regno, unsigned int red, unsigned int green,
                                  convert_bitfield(green, &fb->fb.var.green) |
                                  convert_bitfield(red, &fb->fb.var.red);
-        if (fb->fb.var.bits_per_pixel == 8 && regno < 256) {
+        if (fb->fb.fix.visual == FB_VISUAL_PSEUDOCOLOR && regno < 256) {
                int hw_reg = CLCD_PALETTE + ((regno * 2) & ~3);
                u32 val, mask, newval;
diff --git a/drivers/video/aty/radeon_base.c b/drivers/video/aty/radeon_base.c
index e8eb124754b1..ee25b9e8db60 100644
--- a/drivers/video/aty/radeon_base.c
+++ b/drivers/video/aty/radeon_base.c
@@ -1057,13 +1057,14 @@ static int radeonfb_blank (int blank, struct fb_info *info)
        return radeon_screen_blank(rinfo, blank, 0);
 }
-static int radeonfb_setcolreg (unsigned regno, unsigned red, unsigned green,
+static int radeon_setcolreg (unsigned regno, unsigned red, unsigned green,
-                             unsigned blue, unsigned transp, struct fb_info *info)
+                             unsigned blue, unsigned transp,
+                             struct radeonfb_info *rinfo)
 {
-        struct radeonfb_info *rinfo = info->par;
        u32 pindex;
        unsigned int i;
-        
        if (regno > 255)
                return 1;
@@ -1078,20 +1079,7 @@ static int radeonfb_setcolreg (unsigned regno, unsigned red, unsigned green,
        pindex = regno;
        if (!rinfo->asleep) {
-                u32 dac_cntl2, vclk_cntl = 0;
-                
                radeon_fifo_wait(9);
-                if (rinfo->is_mobility) {
-                        vclk_cntl = INPLL(VCLK_ECP_CNTL);
-                        OUTPLL(VCLK_ECP_CNTL, vclk_cntl & ~PIXCLK_DAC_ALWAYS_ONb);
-                }
-                /* Make sure we are on first palette */
-                if (rinfo->has_CRTC2) {
-                        dac_cntl2 = INREG(DAC_CNTL2);
-                        dac_cntl2 &= ~DAC2_PALETTE_ACCESS_CNTL;
-                        OUTREG(DAC_CNTL2, dac_cntl2);
-                }
                if (rinfo->bpp == 16) {
                        pindex = regno * 8;
@@ -1101,24 +1089,27 @@ static int radeonfb_setcolreg (unsigned regno, unsigned red, unsigned green,
                        if (rinfo->depth == 15 && regno > 31)
                                return 1;
-                        /* For 565, the green component is mixed one order below */
+                        /* For 565, the green component is mixed one order
+                         * below
+                         */
                        if (rinfo->depth == 16) {
                                OUTREG(PALETTE_INDEX, pindex>>1);
-                                OUTREG(PALETTE_DATA, (rinfo->palette[regno>>1].red << 16) |
+                                OUTREG(PALETTE_DATA,
-                                        (green << 8) | (rinfo->palette[regno>>1].blue));
+                                       (rinfo->palette[regno>>1].red << 16) |
+                                        (green << 8) |
+                                       (rinfo->palette[regno>>1].blue));
                                green = rinfo->palette[regno<<1].green;
                        }
                }
                if (rinfo->depth != 16 || regno < 32) {
                        OUTREG(PALETTE_INDEX, pindex);
-                        OUTREG(PALETTE_DATA, (red << 16) | (green << 8) | blue);
+                        OUTREG(PALETTE_DATA, (red << 16) |
+                               (green << 8) | blue);
                }
-                if (rinfo->is_mobility)
-                        OUTPLL(VCLK_ECP_CNTL, vclk_cntl);
        }
        if (regno < 16) {
-                u32 *pal = info->pseudo_palette;
+                u32 *pal = rinfo->info->pseudo_palette;
                switch (rinfo->depth) {
                case 15:
                        pal[regno] = (regno << 10) | (regno << 5) | regno;
@@ -1138,6 +1129,84 @@ static int radeonfb_setcolreg (unsigned regno, unsigned red, unsigned green,
        return 0;
 }
+static int radeonfb_setcolreg (unsigned regno, unsigned red, unsigned green,
+                               unsigned blue, unsigned transp,
+                               struct fb_info *info)
+{
+        struct radeonfb_info *rinfo = info->par;
+        u32 dac_cntl2, vclk_cntl = 0;
+        int rc;
+        if (!rinfo->asleep) {
+                if (rinfo->is_mobility) {
+                        vclk_cntl = INPLL(VCLK_ECP_CNTL);
+                        OUTPLL(VCLK_ECP_CNTL,
+                               vclk_cntl & ~PIXCLK_DAC_ALWAYS_ONb);
+                }
+                /* Make sure we are on first palette */
+                if (rinfo->has_CRTC2) {
+                        dac_cntl2 = INREG(DAC_CNTL2);
+                        dac_cntl2 &= ~DAC2_PALETTE_ACCESS_CNTL;
+                        OUTREG(DAC_CNTL2, dac_cntl2);
+                }
+        }
+        rc = radeon_setcolreg (regno, red, green, blue, transp, rinfo);
+        if (!rinfo->asleep && rinfo->is_mobility)
+                OUTPLL(VCLK_ECP_CNTL, vclk_cntl);
+        return rc;
+}
+static int radeonfb_setcmap(struct fb_cmap *cmap, struct fb_info *info)
+{
+        struct radeonfb_info *rinfo = info->par;
+        u16 *red, *green, *blue, *transp;
+        u32 dac_cntl2, vclk_cntl = 0;
+        int i, start, rc = 0;
+        if (!rinfo->asleep) {
+                if (rinfo->is_mobility) {
+                        vclk_cntl = INPLL(VCLK_ECP_CNTL);
+                        OUTPLL(VCLK_ECP_CNTL,
+                               vclk_cntl & ~PIXCLK_DAC_ALWAYS_ONb);
+                }
+                /* Make sure we are on first palette */
+                if (rinfo->has_CRTC2) {
+                        dac_cntl2 = INREG(DAC_CNTL2);
+                        dac_cntl2 &= ~DAC2_PALETTE_ACCESS_CNTL;
+                        OUTREG(DAC_CNTL2, dac_cntl2);
+                }
+        }
+        red = cmap->red;
+        green = cmap->green;
+        blue = cmap->blue;
+        transp = cmap->transp;
+        start = cmap->start;
+        for (i = 0; i < cmap->len; i++) {
+                u_int hred, hgreen, hblue, htransp = 0xffff;
+                hred = *red++;
+                hgreen = *green++;
+                hblue = *blue++;
+                if (transp)
+                        htransp = *transp++;
+                rc = radeon_setcolreg (start++, hred, hgreen, hblue, htransp,
+                                       rinfo);
+                if (rc)
+                        break;
+        }
+        if (!rinfo->asleep && rinfo->is_mobility)
+                OUTPLL(VCLK_ECP_CNTL, vclk_cntl);
+        return rc;
+}
 static void radeon_save_state (struct radeonfb_info *rinfo,
                               struct radeon_regs *save)
@@ -1796,6 +1865,7 @@ static struct fb_ops radeonfb_ops = {
        .fb_check_var           = radeonfb_check_var,
        .fb_set_par             = radeonfb_set_par,
        .fb_setcolreg           = radeonfb_setcolreg,
+        .fb_setcmap             = radeonfb_setcmap,
        .fb_pan_display         = radeonfb_pan_display,
        .fb_blank               = radeonfb_blank,
        .fb_ioctl               = radeonfb_ioctl,
diff --git a/drivers/video/console/fbcon.c b/drivers/video/console/fbcon.c
index 59e3b4b4e7e3..b209adbd508a 100644
--- a/drivers/video/console/fbcon.c
+++ b/drivers/video/console/fbcon.c
@@ -906,10 +906,13 @@ static void fbcon_init(struct vc_data *vc, int init)
        struct vc_data *svc = *default_mode;
        struct display *t, *p = &fb_display[vc->vc_num];
        int logo = 1, new_rows, new_cols, rows, cols, charcnt = 256;
-        int cap = info->flags;
+        int cap;
        if (info_idx == -1 || info == NULL)
            return;
+        cap = info->flags;
        if (vc != svc || logo_shown == FBCON_LOGO_DONTSHOW ||
            (info->fix.type == FB_TYPE_TEXT))
                logo = 0;
diff --git a/drivers/video/console/vgacon.c b/drivers/video/console/vgacon.c
index 7d1ae06667c6..bcf59b28a14f 100644
--- a/drivers/video/console/vgacon.c
+++ b/drivers/video/console/vgacon.c
@@ -337,6 +337,8 @@ static void vgacon_init(struct vc_data *c, int init)
        c->vc_scan_lines = vga_scan_lines;
        c->vc_font.height = vga_video_font_height;
        c->vc_complement_mask = 0x7700;
+        if (vga_512_chars)
+                c->vc_hi_font_mask = 0x0800;
        p = *c->vc_uni_pagedir_loc;
        if (c->vc_uni_pagedir_loc == &c->vc_uni_pagedir ||
            !--c->vc_uni_pagedir_loc[1])
diff --git a/drivers/video/cyber2000fb.c b/drivers/video/cyber2000fb.c
index 8b1b7c687a99..3894b2a501d6 100644
--- a/drivers/video/cyber2000fb.c
+++ b/drivers/video/cyber2000fb.c
@@ -90,6 +90,8 @@ struct cfb_info {
         */
        u_char                  ramdac_ctrl;
        u_char                  ramdac_powerdown;
+        u32                     pseudo_palette[16];
 };
 static char *default_font = "Acorn8x8";
@@ -1223,9 +1225,7 @@ cyberpro_alloc_fb_info(unsigned int id, char *name)
 {
        struct cfb_info *cfb;
-        cfb = kmalloc(sizeof(struct cfb_info) +
+        cfb = kmalloc(sizeof(struct cfb_info), GFP_KERNEL);
-                       sizeof(u32) * 16, GFP_KERNEL);
        if (!cfb)
                return NULL;
@@ -1281,7 +1281,7 @@ cyberpro_alloc_fb_info(unsigned int id, char *name)
        cfb->fb.fbops           = &cyber2000fb_ops;
        cfb->fb.flags           = FBINFO_DEFAULT | FBINFO_HWACCEL_YPAN;
-        cfb->fb.pseudo_palette  = (void *)(cfb + 1);
+        cfb->fb.pseudo_palette  = cfb->pseudo_palette;
        fb_alloc_cmap(&cfb->fb.cmap, NR_PALETTE, 0);
diff --git a/drivers/video/fbcmap.c b/drivers/video/fbcmap.c
index c51f8fb5c1de..4e5ce8f7d65e 100644
--- a/drivers/video/fbcmap.c
+++ b/drivers/video/fbcmap.c
@@ -222,8 +222,11 @@ int fb_set_cmap(struct fb_cmap *cmap, struct fb_info *info)
        transp = cmap->transp;
        start = cmap->start;
-        if (start < 0 || !info->fbops->fb_setcolreg)
+        if (start < 0 || (!info->fbops->fb_setcolreg &&
+                          !info->fbops->fb_setcmap))
                return -EINVAL;
+        if (info->fbops->fb_setcmap)
+                return info->fbops->fb_setcmap(cmap, info);
        for (i = 0; i < cmap->len; i++) {
                hred = *red++;
                hgreen = *green++;
@@ -250,8 +253,33 @@ int fb_set_user_cmap(struct fb_cmap_user *cmap, struct fb_info *info)
        transp = cmap->transp;
        start = cmap->start;
-        if (start < 0 || !info->fbops->fb_setcolreg)
+        if (start < 0 || (!info->fbops->fb_setcolreg &&
+                          !info->fbops->fb_setcmap))
                return -EINVAL;
+        /* If we can batch, do it */
+        if (info->fbops->fb_setcmap && cmap->len > 1) {
+                struct fb_cmap umap;
+                int size = cmap->len * sizeof(u16);
+                int rc;
+                memset(&umap, 0, sizeof(struct fb_cmap));
+                rc = fb_alloc_cmap(&umap, cmap->len, transp != NULL);
+                if (rc)
+                        return rc;
+                if (copy_from_user(umap.red, red, size) ||
+                    copy_from_user(umap.green, green, size) ||
+                    copy_from_user(umap.blue, blue, size) ||
+                    (transp && copy_from_user(umap.transp, transp, size))) {
+                        rc = -EFAULT;
+                }
+                umap.start = start;
+                if (rc == 0)
+                        rc = info->fbops->fb_setcmap(&umap, info);
+                fb_dealloc_cmap(&umap);
+                return rc;
+        }
        for (i = 0; i < cmap->len; i++, red++, blue++, green++) {
                if (get_user(hred, red) ||
                    get_user(hgreen, green) ||
diff --git a/drivers/video/fbmem.c b/drivers/video/fbmem.c
index 25f460ca0daf..208a68ceb63b 100644
--- a/drivers/video/fbmem.c
+++ b/drivers/video/fbmem.c
@@ -1257,6 +1257,8 @@ int fb_new_modelist(struct fb_info *info)
 static char *video_options[FB_MAX];
 static int ofonly;
+extern const char *global_mode_option;
 /**
 * fb_get_options - get kernel boot parameters
 * @name:   framebuffer name as it would appear in
@@ -1297,9 +1299,6 @@ int fb_get_options(char *name, char **option)
        return retval;
 }
-extern const char *global_mode_option;
 /**
 *      video_setup - process command line options
 *      @options: string of options
diff --git a/drivers/video/fbmon.c b/drivers/video/fbmon.c
index 978def013587..6cd1976548d4 100644
--- a/drivers/video/fbmon.c
+++ b/drivers/video/fbmon.c
@@ -34,7 +34,6 @@
 #include <asm/prom.h>
 #include <asm/pci-bridge.h>
 #endif
-#include <video/edid.h>
 #include "edid.h"
 /* 
diff --git a/drivers/video/i810/i810_main.c b/drivers/video/i810/i810_main.c
index 9ec8781794c0..e04d3e8b2549 100644
--- a/drivers/video/i810/i810_main.c
+++ b/drivers/video/i810/i810_main.c
@@ -999,8 +999,14 @@ static int i810_check_params(struct fb_var_screeninfo *var,
        info->monspecs.dclkmin = 15000000;
        if (fb_validate_mode(var, info)) {
-                if (fb_get_mode(FB_MAXTIMINGS, 0, var, info))
+                if (fb_get_mode(FB_MAXTIMINGS, 0, var, info)) {
+                        int default_sync = (hsync1-HFMIN)|(hsync2-HFMAX)
+                                            |(vsync1-VFMIN)|(vsync2-VFMAX);
+                        printk("i810fb: invalid video mode%s\n",
+                            default_sync ? "" :
+                            ". Specifying vsyncN/hsyncN parameters may help");
                        return -EINVAL;
+                }
        }
        
        var->xres = xres;
@@ -2023,10 +2029,10 @@ MODULE_PARM_DESC(vyres, "Virtual vertical resolution in scanlines"
                 " (default = 480)");
 module_param(hsync1, int, 0);
 MODULE_PARM_DESC(hsync1, "Minimum horizontal frequency of monitor in KHz"
-                 " (default = 31)");
+                 " (default = 29)");
 module_param(hsync2, int, 0);
 MODULE_PARM_DESC(hsync2, "Maximum horizontal frequency of monitor in KHz"
-                 " (default = 31)");
+                 " (default = 30)");
 module_param(vsync1, int, 0);
 MODULE_PARM_DESC(vsync1, "Minimum vertical frequency of monitor in Hz"
                 " (default = 50)");
diff --git a/drivers/video/imxfb.c b/drivers/video/imxfb.c
new file mode 100644
index 000000000000..8fe1c12a17bd
--- /dev/null
+++ b/drivers/video/imxfb.c
@@ -0,0 +1,695 @@
+/*
+ *  linux/drivers/video/imxfb.c
+ *
+ *  Freescale i.MX Frame Buffer device driver
+ *
+ *  Copyright (C) 2004 Sascha Hauer, Pengutronix
+ *   Based on acornfb.c Copyright (C) Russell King.
+ *
+ * This file is subject to the terms and conditions of the GNU General Public
+ * License.  See the file COPYING in the main directory of this archive for
+ * more details.
+ *
+ * Please direct your questions and comments on this driver to the following
+ * email address:
+ *
+ *      linux-arm-kernel@lists.arm.linux.org.uk
+ */
+//#define DEBUG 1
+#include <linux/config.h>
+#include <linux/module.h>
+#include <linux/kernel.h>
+#include <linux/sched.h>
+#include <linux/errno.h>
+#include <linux/string.h>
+#include <linux/interrupt.h>
+#include <linux/slab.h>
+#include <linux/fb.h>
+#include <linux/delay.h>
+#include <linux/init.h>
+#include <linux/ioport.h>
+#include <linux/cpufreq.h>
+#include <linux/device.h>
+#include <linux/dma-mapping.h>
+#include <asm/hardware.h>
+#include <asm/io.h>
+#include <asm/mach-types.h>
+#include <asm/uaccess.h>
+#include <asm/arch/imxfb.h>
+/*
+ * Complain if VAR is out of range.
+ */
+#define DEBUG_VAR 1
+#include "imxfb.h"
+static struct imxfb_rgb def_rgb_16 = {
+        .red    = { .offset = 8,  .length = 4, },
+        .green  = { .offset = 4,  .length = 4, },
+        .blue   = { .offset = 0,  .length = 4, },
+        .transp = { .offset = 0,  .length = 0, },
+};
+static struct imxfb_rgb def_rgb_8 = {
+        .red    = { .offset = 0,  .length = 8, },
+        .green  = { .offset = 0,  .length = 8, },
+        .blue   = { .offset = 0,  .length = 8, },
+        .transp = { .offset = 0,  .length = 0, },
+};
+static int imxfb_activate_var(struct fb_var_screeninfo *var, struct fb_info *info);
+static inline u_int chan_to_field(u_int chan, struct fb_bitfield *bf)
+{
+        chan &= 0xffff;
+        chan >>= 16 - bf->length;
+        return chan << bf->offset;
+}
+#define LCDC_PALETTE(x) __REG2(IMX_LCDC_BASE+0x800, (x)<<2)
+static int
+imxfb_setpalettereg(u_int regno, u_int red, u_int green, u_int blue,
+                       u_int trans, struct fb_info *info)
+{
+        struct imxfb_info *fbi = info->par;
+        u_int val, ret = 1;
+#define CNVT_TOHW(val,width) ((((val)<<(width))+0x7FFF-(val))>>16)
+        if (regno < fbi->palette_size) {
+                val = (CNVT_TOHW(red, 4) << 8) |
+                      (CNVT_TOHW(green,4) << 4) |
+                      CNVT_TOHW(blue,  4);
+                LCDC_PALETTE(regno) = val;
+                ret = 0;
+        }
+        return ret;
+}
+static int
+imxfb_setcolreg(u_int regno, u_int red, u_int green, u_int blue,
+                   u_int trans, struct fb_info *info)
+{
+        struct imxfb_info *fbi = info->par;
+        unsigned int val;
+        int ret = 1;
+        /*
+         * If inverse mode was selected, invert all the colours
+         * rather than the register number.  The register number
+         * is what you poke into the framebuffer to produce the
+         * colour you requested.
+         */
+        if (fbi->cmap_inverse) {
+                red   = 0xffff - red;
+                green = 0xffff - green;
+                blue  = 0xffff - blue;
+        }
+        /*
+         * If greyscale is true, then we convert the RGB value
+         * to greyscale no mater what visual we are using.
+         */
+        if (info->var.grayscale)
+                red = green = blue = (19595 * red + 38470 * green +
+                                        7471 * blue) >> 16;
+        switch (info->fix.visual) {
+        case FB_VISUAL_TRUECOLOR:
+                /*
+                 * 12 or 16-bit True Colour.  We encode the RGB value
+                 * according to the RGB bitfield information.
+                 */
+                if (regno < 16) {
+                        u32 *pal = info->pseudo_palette;
+                        val  = chan_to_field(red, &info->var.red);
+                        val |= chan_to_field(green, &info->var.green);
+                        val |= chan_to_field(blue, &info->var.blue);
+                        pal[regno] = val;
+                        ret = 0;
+                }
+                break;
+        case FB_VISUAL_STATIC_PSEUDOCOLOR:
+        case FB_VISUAL_PSEUDOCOLOR:
+                ret = imxfb_setpalettereg(regno, red, green, blue, trans, info);
+                break;
+        }
+        return ret;
+}
+/*
+ *  imxfb_check_var():
+ *    Round up in the following order: bits_per_pixel, xres,
+ *    yres, xres_virtual, yres_virtual, xoffset, yoffset, grayscale,
+ *    bitfields, horizontal timing, vertical timing.
+ */
+static int
+imxfb_check_var(struct fb_var_screeninfo *var, struct fb_info *info)
+{
+        struct imxfb_info *fbi = info->par;
+        int rgbidx;
+        if (var->xres < MIN_XRES)
+                var->xres = MIN_XRES;
+        if (var->yres < MIN_YRES)
+                var->yres = MIN_YRES;
+        if (var->xres > fbi->max_xres)
+                var->xres = fbi->max_xres;
+        if (var->yres > fbi->max_yres)
+                var->yres = fbi->max_yres;
+        var->xres_virtual = max(var->xres_virtual, var->xres);
+        var->yres_virtual = max(var->yres_virtual, var->yres);
+        pr_debug("var->bits_per_pixel=%d\n", var->bits_per_pixel);
+        switch (var->bits_per_pixel) {
+        case 16:
+                rgbidx = RGB_16;
+                break;
+        case 8:
+                rgbidx = RGB_8;
+                break;
+        default:
+                rgbidx = RGB_16;
+        }
+        /*
+         * Copy the RGB parameters for this display
+         * from the machine specific parameters.
+         */
+        var->red    = fbi->rgb[rgbidx]->red;
+        var->green  = fbi->rgb[rgbidx]->green;
+        var->blue   = fbi->rgb[rgbidx]->blue;
+        var->transp = fbi->rgb[rgbidx]->transp;
+        pr_debug("RGBT length = %d:%d:%d:%d\n",
+                var->red.length, var->green.length, var->blue.length,
+                var->transp.length);
+        pr_debug("RGBT offset = %d:%d:%d:%d\n",
+                var->red.offset, var->green.offset, var->blue.offset,
+                var->transp.offset);
+        return 0;
+}
+/*
+ * imxfb_set_par():
+ *      Set the user defined part of the display for the specified console
+ */
+static int imxfb_set_par(struct fb_info *info)
+{
+        struct imxfb_info *fbi = info->par;
+        struct fb_var_screeninfo *var = &info->var;
+        pr_debug("set_par\n");
+        if (var->bits_per_pixel == 16)
+                info->fix.visual = FB_VISUAL_TRUECOLOR;
+        else if (!fbi->cmap_static)
+                info->fix.visual = FB_VISUAL_PSEUDOCOLOR;
+        else {
+                /*
+                 * Some people have weird ideas about wanting static
+                 * pseudocolor maps.  I suspect their user space
+                 * applications are broken.
+                 */
+                info->fix.visual = FB_VISUAL_STATIC_PSEUDOCOLOR;
+        }
+        info->fix.line_length = var->xres_virtual *
+                                  var->bits_per_pixel / 8;
+        fbi->palette_size = var->bits_per_pixel == 8 ? 256 : 16;
+        imxfb_activate_var(var, info);
+        return 0;
+}
+static void imxfb_enable_controller(struct imxfb_info *fbi)
+{
+        pr_debug("Enabling LCD controller\n");
+        /* initialize LCDC */
+        LCDC_RMCR &= ~RMCR_LCDC_EN;             /* just to be safe... */
+        LCDC_SSA        = fbi->screen_dma;
+        /* physical screen start address            */
+        LCDC_VPW        = VPW_VPW(fbi->max_xres * fbi->max_bpp / 8 / 4);
+        LCDC_POS        = 0x00000000;   /* panning offset 0 (0 pixel offset)        */
+        /* disable hardware cursor */
+        LCDC_CPOS       &= ~(CPOS_CC0 | CPOS_CC1);
+        /* fixed burst length (see erratum 11) */
+        LCDC_DMACR = DMACR_BURST | DMACR_HM(8) | DMACR_TM(2);
+        LCDC_RMCR = RMCR_LCDC_EN;
+        if(fbi->backlight_power)
+                fbi->backlight_power(1);
+        if(fbi->lcd_power)
+                fbi->lcd_power(1);
+}
+static void imxfb_disable_controller(struct imxfb_info *fbi)
+{
+        pr_debug("Disabling LCD controller\n");
+        if(fbi->backlight_power)
+                fbi->backlight_power(0);
+        if(fbi->lcd_power)
+                fbi->lcd_power(0);
+        LCDC_RMCR = 0;
+}
+static int imxfb_blank(int blank, struct fb_info *info)
+{
+        struct imxfb_info *fbi = info->par;
+        pr_debug("imxfb_blank: blank=%d\n", blank);
+        switch (blank) {
+        case FB_BLANK_POWERDOWN:
+        case FB_BLANK_VSYNC_SUSPEND:
+        case FB_BLANK_HSYNC_SUSPEND:
+        case FB_BLANK_NORMAL:
+                imxfb_disable_controller(fbi);
+                break;
+        case FB_BLANK_UNBLANK:
+                imxfb_enable_controller(fbi);
+                break;
+        }
+        return 0;
+}
+static struct fb_ops imxfb_ops = {
+        .owner          = THIS_MODULE,
+        .fb_check_var   = imxfb_check_var,
+        .fb_set_par     = imxfb_set_par,
+        .fb_setcolreg   = imxfb_setcolreg,
+        .fb_fillrect    = cfb_fillrect,
+        .fb_copyarea    = cfb_copyarea,
+        .fb_imageblit   = cfb_imageblit,
+        .fb_blank       = imxfb_blank,
+        .fb_cursor      = soft_cursor, /* FIXME: i.MX can do hardware cursor */
+};
+/*
+ * imxfb_activate_var():
+ *      Configures LCD Controller based on entries in var parameter.  Settings are
+ *      only written to the controller if changes were made.
+ */
+static int imxfb_activate_var(struct fb_var_screeninfo *var, struct fb_info *info)
+{
+        struct imxfb_info *fbi = info->par;
+        pr_debug("var: xres=%d hslen=%d lm=%d rm=%d\n",
+                var->xres, var->hsync_len,
+                var->left_margin, var->right_margin);
+        pr_debug("var: yres=%d vslen=%d um=%d bm=%d\n",
+                var->yres, var->vsync_len,
+                var->upper_margin, var->lower_margin);
+#if DEBUG_VAR
+        if (var->xres < 16        || var->xres > 1024)
+                printk(KERN_ERR "%s: invalid xres %d\n",
+                        info->fix.id, var->xres);
+        if (var->hsync_len < 1    || var->hsync_len > 64)
+                printk(KERN_ERR "%s: invalid hsync_len %d\n",
+                        info->fix.id, var->hsync_len);
+        if (var->left_margin > 255)
+                printk(KERN_ERR "%s: invalid left_margin %d\n",
+                        info->fix.id, var->left_margin);
+        if (var->right_margin > 255)
+                printk(KERN_ERR "%s: invalid right_margin %d\n",
+                        info->fix.id, var->right_margin);
+        if (var->yres < 1 || var->yres > 511)
+                printk(KERN_ERR "%s: invalid yres %d\n",
+                        info->fix.id, var->yres);
+        if (var->vsync_len > 100)
+                printk(KERN_ERR "%s: invalid vsync_len %d\n",
+                        info->fix.id, var->vsync_len);
+        if (var->upper_margin > 63)
+                printk(KERN_ERR "%s: invalid upper_margin %d\n",
+                        info->fix.id, var->upper_margin);
+        if (var->lower_margin > 255)
+                printk(KERN_ERR "%s: invalid lower_margin %d\n",
+                        info->fix.id, var->lower_margin);
+#endif
+        LCDC_HCR        = HCR_H_WIDTH(var->hsync_len) |
+                          HCR_H_WAIT_1(var->left_margin) |
+                          HCR_H_WAIT_2(var->right_margin);
+        LCDC_VCR        = VCR_V_WIDTH(var->vsync_len) |
+                          VCR_V_WAIT_1(var->upper_margin) |
+                          VCR_V_WAIT_2(var->lower_margin);
+        LCDC_SIZE       = SIZE_XMAX(var->xres) | SIZE_YMAX(var->yres);
+        LCDC_PCR        = fbi->pcr;
+        LCDC_PWMR       = fbi->pwmr;
+        LCDC_LSCR1      = fbi->lscr1;
+        return 0;
+}
+static void imxfb_setup_gpio(struct imxfb_info *fbi)
+{
+        int width;
+        LCDC_RMCR       &= ~(RMCR_LCDC_EN | RMCR_SELF_REF);
+        if( fbi->pcr & PCR_TFT )
+                width = 16;
+        else
+                width = 1 << ((fbi->pcr >> 28) & 0x3);
+        switch(width) {
+        case 16:
+                imx_gpio_mode(PD30_PF_LD15);
+                imx_gpio_mode(PD29_PF_LD14);
+                imx_gpio_mode(PD28_PF_LD13);
+                imx_gpio_mode(PD27_PF_LD12);
+                imx_gpio_mode(PD26_PF_LD11);
+                imx_gpio_mode(PD25_PF_LD10);
+                imx_gpio_mode(PD24_PF_LD9);
+                imx_gpio_mode(PD23_PF_LD8);
+        case 8:
+                imx_gpio_mode(PD22_PF_LD7);
+                imx_gpio_mode(PD21_PF_LD6);
+                imx_gpio_mode(PD20_PF_LD5);
+                imx_gpio_mode(PD19_PF_LD4);
+        case 4:
+                imx_gpio_mode(PD18_PF_LD3);
+                imx_gpio_mode(PD17_PF_LD2);
+        case 2:
+                imx_gpio_mode(PD16_PF_LD1);
+        case 1:
+                imx_gpio_mode(PD15_PF_LD0);
+        }
+        /* initialize GPIOs */
+        imx_gpio_mode(PD6_PF_LSCLK);
+        imx_gpio_mode(PD10_PF_SPL_SPR);
+        imx_gpio_mode(PD11_PF_CONTRAST);
+        imx_gpio_mode(PD14_PF_FLM_VSYNC);
+        imx_gpio_mode(PD13_PF_LP_HSYNC);
+        imx_gpio_mode(PD7_PF_REV);
+        imx_gpio_mode(PD8_PF_CLS);
+#ifndef CONFIG_MACH_PIMX1
+        /* on PiMX1 used as buffers enable signal
+         */
+        imx_gpio_mode(PD9_PF_PS);
+#endif
+#ifndef CONFIG_MACH_MX1FS2
+        /* on mx1fs2 this pin is used to (de)activate the display, so we need
+         * it as a normal gpio
+         */
+        imx_gpio_mode(PD12_PF_ACD_OE);
+#endif
+}
+#ifdef CONFIG_PM
+/*
+ * Power management hooks.  Note that we won't be called from IRQ context,
+ * unlike the blank functions above, so we may sleep.
+ */
+static int imxfb_suspend(struct device *dev, u32 state, u32 level)
+{
+        struct imxfb_info *fbi = dev_get_drvdata(dev);
+        pr_debug("%s\n",__FUNCTION__);
+        if (level == SUSPEND_DISABLE || level == SUSPEND_POWER_DOWN)
+                imxfb_disable_controller(fbi);
+        return 0;
+}
+static int imxfb_resume(struct device *dev, u32 level)
+{
+        struct imxfb_info *fbi = dev_get_drvdata(dev);
+        pr_debug("%s\n",__FUNCTION__);
+        if (level == RESUME_ENABLE)
+                imxfb_enable_controller(fbi);
+        return 0;
+}
+#else
+#define imxfb_suspend   NULL
+#define imxfb_resume    NULL
+#endif
+static int __init imxfb_init_fbinfo(struct device *dev)
+{
+        struct imxfb_mach_info *inf = dev->platform_data;
+        struct fb_info *info = dev_get_drvdata(dev);
+        struct imxfb_info *fbi = info->par;
+        pr_debug("%s\n",__FUNCTION__);
+        info->pseudo_palette = kmalloc( sizeof(u32) * 16, GFP_KERNEL);
+        if (!info->pseudo_palette)
+                return -ENOMEM;
+        memset(fbi, 0, sizeof(struct imxfb_info));
+        fbi->dev = dev;
+        strlcpy(info->fix.id, IMX_NAME, sizeof(info->fix.id));
+        info->fix.type  = FB_TYPE_PACKED_PIXELS;
+        info->fix.type_aux              = 0;
+        info->fix.xpanstep              = 0;
+        info->fix.ypanstep              = 0;
+        info->fix.ywrapstep             = 0;
+        info->fix.accel = FB_ACCEL_NONE;
+        info->var.nonstd                = 0;
+        info->var.activate              = FB_ACTIVATE_NOW;
+        info->var.height                = -1;
+        info->var.width = -1;
+        info->var.accel_flags           = 0;
+        info->var.vmode = FB_VMODE_NONINTERLACED;
+        info->fbops                     = &imxfb_ops;
+        info->flags                     = FBINFO_FLAG_DEFAULT;
+        info->pseudo_palette            = (fbi + 1);
+        fbi->rgb[RGB_16]                = &def_rgb_16;
+        fbi->rgb[RGB_8]                 = &def_rgb_8;
+        fbi->max_xres                   = inf->xres;
+        info->var.xres                  = inf->xres;
+        info->var.xres_virtual          = inf->xres;
+        fbi->max_yres                   = inf->yres;
+        info->var.yres                  = inf->yres;
+        info->var.yres_virtual          = inf->yres;
+        fbi->max_bpp                    = inf->bpp;
+        info->var.bits_per_pixel        = inf->bpp;
+        info->var.pixclock              = inf->pixclock;
+        info->var.hsync_len             = inf->hsync_len;
+        info->var.left_margin           = inf->left_margin;
+        info->var.right_margin          = inf->right_margin;
+        info->var.vsync_len             = inf->vsync_len;
+        info->var.upper_margin          = inf->upper_margin;
+        info->var.lower_margin          = inf->lower_margin;
+        info->var.sync                  = inf->sync;
+        info->var.grayscale             = inf->cmap_greyscale;
+        fbi->cmap_inverse               = inf->cmap_inverse;
+        fbi->pcr                        = inf->pcr;
+        fbi->lscr1                      = inf->lscr1;
+        fbi->pwmr                       = inf->pwmr;
+        fbi->lcd_power                  = inf->lcd_power;
+        fbi->backlight_power            = inf->backlight_power;
+        info->fix.smem_len              = fbi->max_xres * fbi->max_yres *
+                                          fbi->max_bpp / 8;
+        return 0;
+}
+/*
+ *      Allocates the DRAM memory for the frame buffer.  This buffer is
+ *      remapped into a non-cached, non-buffered, memory region to
+ *      allow pixel writes to occur without flushing the cache.
+ *      Once this area is remapped, all virtual memory access to the
+ *      video memory should occur at the new region.
+ */
+static int __init imxfb_map_video_memory(struct fb_info *info)
+{
+        struct imxfb_info *fbi = info->par;
+        fbi->map_size = PAGE_ALIGN(info->fix.smem_len);
+        fbi->map_cpu = dma_alloc_writecombine(fbi->dev, fbi->map_size,
+                                        &fbi->map_dma,GFP_KERNEL);
+        if (fbi->map_cpu) {
+                info->screen_base = fbi->map_cpu;
+                fbi->screen_cpu = fbi->map_cpu;
+                fbi->screen_dma = fbi->map_dma;
+                info->fix.smem_start = fbi->screen_dma;
+        }
+        return fbi->map_cpu ? 0 : -ENOMEM;
+}
+static int __init imxfb_probe(struct device *dev)
+{
+        struct platform_device *pdev = to_platform_device(dev);
+        struct imxfb_info *fbi;
+        struct fb_info *info;
+        struct imxfb_mach_info *inf;
+        struct resource *res;
+        int ret;
+        printk("i.MX Framebuffer driver\n");
+        res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+        if(!res)
+                return -ENODEV;
+        inf = dev->platform_data;
+        if(!inf) {
+                dev_err(dev,"No platform_data available\n");
+                return -ENOMEM;
+        }
+        info = framebuffer_alloc(sizeof(struct imxfb_info), dev);
+        if(!info)
+                return -ENOMEM;
+        fbi = info->par;
+        dev_set_drvdata(dev, info);
+        ret = imxfb_init_fbinfo(dev);
+        if( ret < 0 )
+                goto failed_init;
+        res = request_mem_region(res->start, res->end - res->start + 1, "IMXFB");
+        if (!res) {
+                ret = -EBUSY;
+                goto failed_regs;
+        }
+        if (!inf->fixed_screen_cpu) {
+                ret = imxfb_map_video_memory(info);
+                if (ret) {
+                        dev_err(dev, "Failed to allocate video RAM: %d\n", ret);
+                        ret = -ENOMEM;
+                        goto failed_map;
+                }
+        } else {
+                /* Fixed framebuffer mapping enables location of the screen in eSRAM */
+                fbi->map_cpu = inf->fixed_screen_cpu;
+                fbi->map_dma = inf->fixed_screen_dma;
+                info->screen_base = fbi->map_cpu;
+                fbi->screen_cpu = fbi->map_cpu;
+                fbi->screen_dma = fbi->map_dma;
+                info->fix.smem_start = fbi->screen_dma;
+        }
+        /*
+         * This makes sure that our colour bitfield
+         * descriptors are correctly initialised.
+         */
+        imxfb_check_var(&info->var, info);
+        ret = fb_alloc_cmap(&info->cmap, 1<<info->var.bits_per_pixel, 0);
+        if (ret < 0)
+                goto failed_cmap;
+        imxfb_setup_gpio(fbi);
+        imxfb_set_par(info);
+        ret = register_framebuffer(info);
+        if (ret < 0) {
+                dev_err(dev, "failed to register framebuffer\n");
+                goto failed_register;
+        }
+        imxfb_enable_controller(fbi);
+        return 0;
+failed_register:
+        fb_dealloc_cmap(&info->cmap);
+failed_cmap:
+        if (!inf->fixed_screen_cpu)
+                dma_free_writecombine(dev,fbi->map_size,fbi->map_cpu,
+                           fbi->map_dma);
+failed_map:
+        kfree(info->pseudo_palette);
+failed_regs:
+        release_mem_region(res->start, res->end - res->start);
+failed_init:
+        dev_set_drvdata(dev, NULL);
+        framebuffer_release(info);
+        return ret;
+}
+static int imxfb_remove(struct device *dev)
+{
+        struct platform_device *pdev = to_platform_device(dev);
+        struct fb_info *info = dev_get_drvdata(dev);
+        struct resource *res;
+        res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+        /* disable LCD controller */
+        LCDC_RMCR &= ~RMCR_LCDC_EN;
+        unregister_framebuffer(info);
+        fb_dealloc_cmap(&info->cmap);
+        kfree(info->pseudo_palette);
+        framebuffer_release(info);
+        release_mem_region(res->start, res->end - res->start + 1);
+        dev_set_drvdata(dev, NULL);
+        return 0;
+}
+void  imxfb_shutdown(struct device * dev)
+{
+        /* disable LCD Controller */
+        LCDC_RMCR &= ~RMCR_LCDC_EN;
+}
+static struct device_driver imxfb_driver = {
+        .name           = "imx-fb",
+        .bus            = &platform_bus_type,
+        .probe          = imxfb_probe,
+        .suspend        = imxfb_suspend,
+        .resume         = imxfb_resume,
+        .remove         = imxfb_remove,
+        .shutdown       = imxfb_shutdown,
+};
+int __init imxfb_init(void)
+{
+        return driver_register(&imxfb_driver);
+}
+static void __exit imxfb_cleanup(void)
+{
+        driver_unregister(&imxfb_driver);
+}
+module_init(imxfb_init);
+module_exit(imxfb_cleanup);
+MODULE_DESCRIPTION("Motorola i.MX framebuffer driver");
+MODULE_AUTHOR("Sascha Hauer, Pengutronix");
+MODULE_LICENSE("GPL");
diff --git a/drivers/video/imxfb.h b/drivers/video/imxfb.h
new file mode 100644
index 000000000000..128c3ee515c7
--- /dev/null
+++ b/drivers/video/imxfb.h
@@ -0,0 +1,72 @@
+/*
+ * linux/drivers/video/imxfb.h
+ *
+ *  Freescale i.MX Frame Buffer device driver
+ *
+ *  Copyright (C) 2004 S.Hauer, Pengutronix
+ *
+ *  Copyright (C) 1999 Eric A. Thomas
+ *   Based on acornfb.c Copyright (C) Russell King.
+ *
+ * This file is subject to the terms and conditions of the GNU General Public
+ * License.  See the file COPYING in the main directory of this archive
+ * for more details.
+ */
+/*
+ * These are the bitfields for each
+ * display depth that we support.
+ */
+struct imxfb_rgb {
+        struct fb_bitfield      red;
+        struct fb_bitfield      green;
+        struct fb_bitfield      blue;
+        struct fb_bitfield      transp;
+};
+#define RGB_16  (0)
+#define RGB_8   (1)
+#define NR_RGB  2
+struct imxfb_info {
+        struct device           *dev;
+        struct imxfb_rgb        *rgb[NR_RGB];
+        u_int                   max_bpp;
+        u_int                   max_xres;
+        u_int                   max_yres;
+        /*
+         * These are the addresses we mapped
+         * the framebuffer memory region to.
+         */
+        dma_addr_t              map_dma;
+        u_char *                map_cpu;
+        u_int                   map_size;
+        u_char *                screen_cpu;
+        dma_addr_t              screen_dma;
+        u_int                   palette_size;
+        dma_addr_t              dbar1;
+        dma_addr_t              dbar2;
+        u_int                   pcr;
+        u_int                   pwmr;
+        u_int                   lscr1;
+        u_int                   cmap_inverse:1,
+                                cmap_static:1,
+                                unused:30;
+        void (*lcd_power)(int);
+        void (*backlight_power)(int);
+};
+#define IMX_NAME        "IMX"
+/*
+ * Minimum X and Y resolutions
+ */
+#define MIN_XRES        64
+#define MIN_YRES        64
diff --git a/drivers/video/intelfb/intelfbdrv.c b/drivers/video/intelfb/intelfbdrv.c
index 6a05b7000830..549e22939260 100644
--- a/drivers/video/intelfb/intelfbdrv.c
+++ b/drivers/video/intelfb/intelfbdrv.c
@@ -135,9 +135,45 @@
 #endif
 #include "intelfb.h"
-#include "intelfbdrv.h"
 #include "intelfbhw.h"
+static void __devinit get_initial_mode(struct intelfb_info *dinfo);
+static void update_dinfo(struct intelfb_info *dinfo,
+                         struct fb_var_screeninfo *var);
+static int intelfb_get_fix(struct fb_fix_screeninfo *fix,
+                           struct fb_info *info);
+static int intelfb_check_var(struct fb_var_screeninfo *var,
+                             struct fb_info *info);
+static int intelfb_set_par(struct fb_info *info);
+static int intelfb_setcolreg(unsigned regno, unsigned red, unsigned green,
+                             unsigned blue, unsigned transp,
+                             struct fb_info *info);
+static int intelfb_blank(int blank, struct fb_info *info);
+static int intelfb_pan_display(struct fb_var_screeninfo *var,
+                               struct fb_info *info);
+static void intelfb_fillrect(struct fb_info *info,
+                             const struct fb_fillrect *rect);
+static void intelfb_copyarea(struct fb_info *info,
+                             const struct fb_copyarea *region);
+static void intelfb_imageblit(struct fb_info *info,
+                              const struct fb_image *image);
+static int intelfb_cursor(struct fb_info *info,
+                           struct fb_cursor *cursor);
+static int intelfb_sync(struct fb_info *info);
+static int intelfb_ioctl(struct inode *inode, struct file *file,
+                         unsigned int cmd, unsigned long arg,
+                         struct fb_info *info);
+static int __devinit intelfb_pci_register(struct pci_dev *pdev,
+                                          const struct pci_device_id *ent);
+static void __devexit intelfb_pci_unregister(struct pci_dev *pdev);
+static int __devinit intelfb_set_fbinfo(struct intelfb_info *dinfo);
 /*
 * Limiting the class to PCI_CLASS_DISPLAY_VGA prevents function 1 of the
 * mobile chipsets from being registered.
diff --git a/drivers/video/intelfb/intelfbdrv.h b/drivers/video/intelfb/intelfbdrv.h
deleted file mode 100644
index cc3058128884..000000000000
--- a/drivers/video/intelfb/intelfbdrv.h
+++ /dev/null
@@ -1,68 +0,0 @@
-#ifndef _INTELFBDRV_H
-#define _INTELFBDRV_H
-/*
- ******************************************************************************
- * intelfb
- *
- * Linux framebuffer driver for Intel(R) 830M/845G/852GM/855GM/865G/915G
- * integrated graphics chips.
- *
- * Copyright � 2004 Sylvain Meyer
- *
- * Author: Sylvain Meyer
- *
- ******************************************************************************
- *    This program is free software; you can redistribute it and/or modify
- *    it under the terms of the GNU General Public License as published by
- *    the Free Software Foundation; either version 2 of the License, or
- *    (at your option) any later version.
- *
- *    This program is distributed in the hope that it will be useful,
- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *    GNU General Public License for more details.
- *
- *    You should have received a copy of the GNU General Public License
- *    along with this program; if not, write to the Free Software
- *    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-static void __devinit get_initial_mode(struct intelfb_info *dinfo);
-static void update_dinfo(struct intelfb_info *dinfo,
-                         struct fb_var_screeninfo *var);
-static int intelfb_get_fix(struct fb_fix_screeninfo *fix,
-                           struct fb_info *info);
-static int intelfb_check_var(struct fb_var_screeninfo *var,
-                             struct fb_info *info);
-static int intelfb_set_par(struct fb_info *info);
-static int intelfb_setcolreg(unsigned regno, unsigned red, unsigned green,
-                             unsigned blue, unsigned transp,
-                             struct fb_info *info);
-static int intelfb_blank(int blank, struct fb_info *info);
-static int intelfb_pan_display(struct fb_var_screeninfo *var,
-                               struct fb_info *info);
-static void intelfb_fillrect(struct fb_info *info,
-                             const struct fb_fillrect *rect);
-static void intelfb_copyarea(struct fb_info *info,
-                             const struct fb_copyarea *region);
-static void intelfb_imageblit(struct fb_info *info,
-                              const struct fb_image *image);
-static int intelfb_cursor(struct fb_info *info,
-                           struct fb_cursor *cursor);
-static int intelfb_sync(struct fb_info *info);
-static int intelfb_ioctl(struct inode *inode, struct file *file,
-                         unsigned int cmd, unsigned long arg,
-                         struct fb_info *info);
-static int __devinit intelfb_pci_register(struct pci_dev *pdev,
-                                          const struct pci_device_id *ent);
-static void __devexit intelfb_pci_unregister(struct pci_dev *pdev);
-static int __devinit intelfb_set_fbinfo(struct intelfb_info *dinfo);
-#endif
diff --git a/drivers/video/nvidia/nvidia.c b/drivers/video/nvidia/nvidia.c
index 3a6555a8aaa2..47733f58153b 100644
--- a/drivers/video/nvidia/nvidia.c
+++ b/drivers/video/nvidia/nvidia.c
@@ -408,6 +408,7 @@ static int hwcur __devinitdata = 0;
 static int noaccel __devinitdata = 0;
 static int noscale __devinitdata = 0;
 static int paneltweak __devinitdata = 0;
+static int vram __devinitdata = 0;
 #ifdef CONFIG_MTRR
 static int nomtrr __devinitdata = 0;
 #endif
@@ -1180,7 +1181,7 @@ static int nvidiafb_check_var(struct fb_var_screeninfo *var,
        var->xres_virtual = (var->xres_virtual + 63) & ~63;
-        vramlen = info->fix.smem_len;
+        vramlen = info->screen_size;
        pitch = ((var->xres_virtual * var->bits_per_pixel) + 7) / 8;
        memlen = pitch * var->yres_virtual;
@@ -1343,7 +1344,7 @@ static int __devinit nvidia_set_fbinfo(struct fb_info *info)
        /* maximize virtual vertical length */
        lpitch = info->var.xres_virtual *
                ((info->var.bits_per_pixel + 7) >> 3);
-        info->var.yres_virtual = info->fix.smem_len / lpitch;
+        info->var.yres_virtual = info->screen_size / lpitch;
        info->pixmap.scan_align = 4;
        info->pixmap.buf_align = 4;
@@ -1507,12 +1508,20 @@ static int __devinit nvidiafb_probe(struct pci_dev *pd,
        par->FbAddress = nvidiafb_fix.smem_start;
        par->FbMapSize = par->RamAmountKBytes * 1024;
+        if (vram && vram * 1024 * 1024 < par->FbMapSize)
+                par->FbMapSize = vram * 1024 * 1024;
+        /* Limit amount of vram to 64 MB */
+        if (par->FbMapSize > 64 * 1024 * 1024)
+                par->FbMapSize = 64 * 1024 * 1024;
        par->FbUsableSize = par->FbMapSize - (128 * 1024);
        par->ScratchBufferSize = (par->Architecture < NV_ARCH_10) ? 8 * 1024 :
            16 * 1024;
        par->ScratchBufferStart = par->FbUsableSize - par->ScratchBufferSize;
        info->screen_base = ioremap(nvidiafb_fix.smem_start, par->FbMapSize);
-        nvidiafb_fix.smem_len = par->FbUsableSize;
+        info->screen_size = par->FbUsableSize;
+        nvidiafb_fix.smem_len = par->RamAmountKBytes * 1024;
        if (!info->screen_base) {
                printk(KERN_ERR PFX "cannot ioremap FB base\n");
@@ -1524,7 +1533,8 @@ static int __devinit nvidiafb_probe(struct pci_dev *pd,
 #ifdef CONFIG_MTRR
        if (!nomtrr) {
                par->mtrr.vram = mtrr_add(nvidiafb_fix.smem_start,
-                                          par->FbMapSize, MTRR_TYPE_WRCOMB, 1);
+                                          par->RamAmountKBytes * 1024,
+                                          MTRR_TYPE_WRCOMB, 1);
                if (par->mtrr.vram < 0) {
                        printk(KERN_ERR PFX "unable to setup MTRR\n");
                } else {
@@ -1566,9 +1576,9 @@ static int __devinit nvidiafb_probe(struct pci_dev *pd,
      err_out_iounmap_fb:
        iounmap(info->screen_base);
+      err_out_free_base1:
        fb_destroy_modedb(info->monspecs.modedb);
        nvidia_delete_i2c_busses(par);
-      err_out_free_base1:
        iounmap(par->REGS);
      err_out_free_base0:
        pci_release_regions(pd);
@@ -1645,6 +1655,8 @@ static int __devinit nvidiafb_setup(char *options)
                        noscale = 1;
                } else if (!strncmp(this_opt, "paneltweak:", 11)) {
                        paneltweak = simple_strtoul(this_opt+11, NULL, 0);
+                } else if (!strncmp(this_opt, "vram:", 5)) {
+                        vram = simple_strtoul(this_opt+5, NULL, 0);
 #ifdef CONFIG_MTRR
                } else if (!strncmp(this_opt, "nomtrr", 6)) {
                        nomtrr = 1;
@@ -1716,6 +1728,10 @@ module_param(forceCRTC, int, 0);
 MODULE_PARM_DESC(forceCRTC,
                 "Forces usage of a particular CRTC in case autodetection "
                 "fails. (0 or 1) (default=autodetect)");
+module_param(vram, int, 0);
+MODULE_PARM_DESC(vram,
+                 "amount of framebuffer memory to remap in MiB"
+                 "(default=0 - remap entire memory)");
 #ifdef CONFIG_MTRR
 module_param(nomtrr, bool, 0);
 MODULE_PARM_DESC(nomtrr, "Disables MTRR support (0 or 1=disabled) "
diff --git a/drivers/video/radeonfb.c b/drivers/video/radeonfb.c
index d9a084e77a63..c46387024b1d 100644
--- a/drivers/video/radeonfb.c
+++ b/drivers/video/radeonfb.c
@@ -2107,7 +2107,7 @@ static void radeon_write_mode (struct radeonfb_info *rinfo,
        if (rinfo->arch == RADEON_M6) {
-                for (i=0; i<8; i++)
+                for (i=0; i<7; i++)
                        OUTREG(common_regs_m6[i].reg, common_regs_m6[i].val);
        } else {
                for (i=0; i<9; i++)
diff --git a/drivers/video/tdfxfb.c b/drivers/video/tdfxfb.c
index c34ba39b6f7e..7044226c5d4c 100644
--- a/drivers/video/tdfxfb.c
+++ b/drivers/video/tdfxfb.c
@@ -317,30 +317,49 @@ static inline void do_setpalentry(struct tdfx_par *par, unsigned regno, u32 c)
 static u32 do_calc_pll(int freq, int* freq_out) 
 {
-        int m, n, k, best_m, best_n, best_k, f_cur, best_error;
+        int m, n, k, best_m, best_n, best_k, best_error;
        int fref = 14318;
  
-        /* this really could be done with more intelligence --
-           255*63*4 = 64260 iterations is silly */
        best_error = freq;
        best_n = best_m = best_k = 0;
-        for (n = 1; n < 256; n++) {
-                for (m = 1; m < 64; m++) {
+        for (k = 3; k >= 0; k--) {
-                        for (k = 0; k < 4; k++) {
+                for (m = 63; m >= 0; m--) {
-                                f_cur = fref*(n + 2)/(m + 2)/(1 << k);
+                        /*
-                                if (abs(f_cur - freq) < best_error) {
+                         * Estimate value of n that produces target frequency
-                                        best_error = abs(f_cur-freq);
+                         * with current m and k
-                                        best_n = n;
+                         */
-                                        best_m = m;
+                        int n_estimated = (freq * (m + 2) * (1 << k) / fref) - 2;
-                                        best_k = k;
+                        /* Search neighborhood of estimated n */
+                        for (n = max(0, n_estimated - 1);
+                                        n <= min(255, n_estimated + 1); n++) {
+                                /*
+                                 * Calculate PLL freqency with current m, k and
+                                 * estimated n
+                                 */
+                                int f = fref * (n + 2) / (m + 2) / (1 << k);
+                                int error = abs (f - freq);
+                                /*
+                                 *  If this is the closest we've come to the
+                                 * target frequency then remember n, m and k
+                                 */
+                                if (error  < best_error) {
+                                        best_error = error;
+                                        best_n     = n;
+                                        best_m     = m;
+                                        best_k     = k;
                                }
                        }
                }
        }
        n = best_n;
        m = best_m;
        k = best_k;
        *freq_out = fref*(n + 2)/(m + 2)/(1 << k);
        return (n << 8) | (m << 2) | k;
 }
@@ -411,36 +430,35 @@ static void do_write_regs(struct fb_info *info, struct banshee_reg* reg)
 static unsigned long do_lfb_size(struct tdfx_par *par, unsigned short dev_id) 
 {
-        u32 draminit0 = 0;
+        u32 draminit0;
-        u32 draminit1 = 0;
+        u32 draminit1;
-        u32 miscinit1 = 0;
+        u32 miscinit1;
-        u32 lfbsize   = 0;
-        int sgram_p   = 0;
+        int num_chips;
+        int chip_size; /* in MB */
+        u32 lfbsize;
+        int has_sgram;
        draminit0 = tdfx_inl(par, DRAMINIT0);  
        draminit1 = tdfx_inl(par, DRAMINIT1);
+        num_chips = (draminit0 & DRAMINIT0_SGRAM_NUM) ? 8 : 4;
 
-        if ((dev_id == PCI_DEVICE_ID_3DFX_BANSHEE) ||
+        if (dev_id < PCI_DEVICE_ID_3DFX_VOODOO5) {
-            (dev_id == PCI_DEVICE_ID_3DFX_VOODOO3)) {                    
+                /* Banshee/Voodoo3 */
-                sgram_p = (draminit1 & DRAMINIT1_MEM_SDRAM) ? 0 : 1;
+                has_sgram = draminit1 & DRAMINIT1_MEM_SDRAM;
-  
+                chip_size = has_sgram ? ((draminit0 & DRAMINIT0_SGRAM_TYPE) ? 2 : 1)
-        lfbsize = sgram_p ?
+                                      : 2;
-                (((draminit0 & DRAMINIT0_SGRAM_NUM)  ? 2 : 1) * 
-                ((draminit0 & DRAMINIT0_SGRAM_TYPE) ? 8 : 4) * 1024 * 1024) :
-                16 * 1024 * 1024;
        } else {
                /* Voodoo4/5 */
-                u32 chips, psize, banks;
+                has_sgram = 0;
+                chip_size = 1 << ((draminit0 & DRAMINIT0_SGRAM_TYPE_MASK) >> DRAMINIT0_SGRAM_TYPE_SHIFT);
-                chips = ((draminit0 & (1 << 26)) == 0) ? 4 : 8;
+        }
-                psize = 1 << ((draminit0 & 0x38000000) >> 28);
+        lfbsize = num_chips * chip_size * 1024 * 1024;
-                banks = ((draminit0 & (1 << 30)) == 0) ? 2 : 4;
-                lfbsize = chips * psize * banks;
+        /* disable block writes for SDRAM */
-                lfbsize <<= 20;
-        }                 
-        /* disable block writes for SDRAM (why?) */
        miscinit1 = tdfx_inl(par, MISCINIT1);
-        miscinit1 |= sgram_p ? 0 : MISCINIT1_2DBLOCK_DIS;
+        miscinit1 |= has_sgram ? 0 : MISCINIT1_2DBLOCK_DIS;
        miscinit1 |= MISCINIT1_CLUT_INV;
        banshee_make_room(par, 1); 
diff --git a/drivers/video/vesafb.c b/drivers/video/vesafb.c
index 8fc1278d7fbd..3027841f9c24 100644
--- a/drivers/video/vesafb.c
+++ b/drivers/video/vesafb.c
@@ -19,9 +19,6 @@
 #include <linux/fb.h>
 #include <linux/ioport.h>
 #include <linux/init.h>
-#ifdef __i386__
-#include <video/edid.h>
-#endif
 #include <asm/io.h>
 #include <asm/mtrr.h>