542 files changed, 25611 insertions, 20030 deletions

diff --git a/drivers/Makefile b/drivers/Makefile
index 65670be6ff1a..fac1e1603097 100644
--- a/drivers/Makefile
+++ b/drivers/Makefile
@@ -7,6 +7,7 @@
 
 obj-$(CONFIG_PCI)               += pci/ usb/
 obj-$(CONFIG_PARISC)            += parisc/
+obj-$(CONFIG_RAPIDIO)           += rapidio/
 obj-y                           += video/
 obj-$(CONFIG_ACPI)              += acpi/
 # PnP must come after ACPI since it will eventually need to check if acpi
@@ -67,3 +68,4 @@ obj-$(CONFIG_INFINIBAND)	+= infiniband/
 obj-$(CONFIG_SGI_IOC4)          += sn/
 obj-y                           += firmware/
 obj-$(CONFIG_CRYPTO)            += crypto/
+obj-$(CONFIG_SUPERH)            += sh/
diff --git a/drivers/acpi/container.c b/drivers/acpi/container.c
index 10dd695a1dd9..27ec12c1fab0 100644
--- a/drivers/acpi/container.c
+++ b/drivers/acpi/container.c
@@ -118,11 +118,9 @@ static int acpi_container_remove(struct acpi_device *device, int type)
 {
         acpi_status status = AE_OK;
         struct acpi_container *pc = NULL;
-        pc = (struct acpi_container *)acpi_driver_data(device);
-
-        if (pc)
-                kfree(pc);
 
+        pc = (struct acpi_container *)acpi_driver_data(device);
+        kfree(pc);
         return status;
 }
 
diff --git a/drivers/acpi/osl.c b/drivers/acpi/osl.c
index d528c750a380..e3cd0b16031a 100644
--- a/drivers/acpi/osl.c
+++ b/drivers/acpi/osl.c
@@ -313,8 +313,7 @@ acpi_status acpi_os_remove_interrupt_handler(u32 irq, acpi_osd_handler handler)
 
 void acpi_os_sleep(acpi_integer ms)
 {
-        current->state = TASK_INTERRUPTIBLE;
-        schedule_timeout(((signed long)ms * HZ) / 1000);
+        schedule_timeout_interruptible(msecs_to_jiffies(ms));
 }
 
 EXPORT_SYMBOL(acpi_os_sleep);
@@ -838,8 +837,7 @@ acpi_status acpi_os_wait_semaphore(acpi_handle handle, u32 units, u16 timeout)
 
                         ret = down_trylock(sem);
                         for (i = timeout; (i > 0 && ret < 0); i -= quantum_ms) {
-                                current->state = TASK_INTERRUPTIBLE;
-                                schedule_timeout(1);
+                                schedule_timeout_interruptible(1);
                                 ret = down_trylock(sem);
                         }
 
diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c
index c6db591479de..23e2c6968a11 100644
--- a/drivers/acpi/scan.c
+++ b/drivers/acpi/scan.c
@@ -28,8 +28,7 @@ static int acpi_bus_trim(struct acpi_device *start, int rmdevice);
 static void acpi_device_release(struct kobject *kobj)
 {
         struct acpi_device *dev = container_of(kobj, struct acpi_device, kobj);
-        if (dev->pnp.cid_list)
-                kfree(dev->pnp.cid_list);
+        kfree(dev->pnp.cid_list);
         kfree(dev);
 }
 
@@ -1117,8 +1116,7 @@ acpi_add_single_object(struct acpi_device **child,
         if (!result)
                 *child = device;
         else {
-                if (device->pnp.cid_list)
-                        kfree(device->pnp.cid_list);
+                kfree(device->pnp.cid_list);
                 kfree(device);
         }
 
diff --git a/drivers/acpi/video.c b/drivers/acpi/video.c
index e383d6109ae1..f051b151580d 100644
--- a/drivers/acpi/video.c
+++ b/drivers/acpi/video.c
@@ -334,8 +334,7 @@ acpi_video_device_lcd_query_levels(struct acpi_video_device *device,
         return_VALUE(0);
 
       err:
-        if (buffer.pointer)
-                kfree(buffer.pointer);
+        kfree(buffer.pointer);
 
         return_VALUE(status);
 }
@@ -1488,8 +1487,7 @@ static int acpi_video_device_enumerate(struct acpi_video_bus *video)
         }
         active_device_list[count].value.int_val = ACPI_VIDEO_HEAD_END;
 
-        if (video->attached_array)
-                kfree(video->attached_array);
+        kfree(video->attached_array);
 
         video->attached_array = active_device_list;
         video->attached_count = count;
@@ -1645,8 +1643,7 @@ static int acpi_video_bus_put_devices(struct acpi_video_bus *video)
                         printk(KERN_WARNING PREFIX
                                "hhuuhhuu bug in acpi video driver.\n");
 
-                if (data->brightness)
-                        kfree(data->brightness);
+                kfree(data->brightness);
 
                 kfree(data);
         }
@@ -1831,8 +1828,7 @@ static int acpi_video_bus_remove(struct acpi_device *device, int type)
         acpi_video_bus_put_devices(video);
         acpi_video_bus_remove_fs(device);
 
-        if (video->attached_array)
-                kfree(video->attached_array);
+        kfree(video->attached_array);
         kfree(video);
 
         return_VALUE(0);
diff --git a/drivers/base/platform.c b/drivers/base/platform.c
index d597c922af11..6d4736e89f1a 100644
--- a/drivers/base/platform.c
+++ b/drivers/base/platform.c
@@ -116,12 +116,115 @@ int platform_add_devices(struct platform_device **devs, int num)
         return ret;
 }
 
+struct platform_object {
+        struct platform_device pdev;
+        char name[1];
+};
+
 /**
- *      platform_device_register - add a platform-level device
+ *      platform_device_put
+ *      @pdev:  platform device to free
+ *
+ *      Free all memory associated with a platform device.  This function
+ *      must _only_ be externally called in error cases.  All other usage
+ *      is a bug.
+ */
+void platform_device_put(struct platform_device *pdev)
+{
+        if (pdev)
+                put_device(&pdev->dev);
+}
+EXPORT_SYMBOL_GPL(platform_device_put);
+
+static void platform_device_release(struct device *dev)
+{
+        struct platform_object *pa = container_of(dev, struct platform_object, pdev.dev);
+
+        kfree(pa->pdev.dev.platform_data);
+        kfree(pa->pdev.resource);
+        kfree(pa);
+}
+
+/**
+ *      platform_device_alloc
+ *      @name:  base name of the device we're adding
+ *      @id:    instance id
+ *
+ *      Create a platform device object which can have other objects attached
+ *      to it, and which will have attached objects freed when it is released.
+ */
+struct platform_device *platform_device_alloc(const char *name, unsigned int id)
+{
+        struct platform_object *pa;
+
+        pa = kzalloc(sizeof(struct platform_object) + strlen(name), GFP_KERNEL);
+        if (pa) {
+                strcpy(pa->name, name);
+                pa->pdev.name = pa->name;
+                pa->pdev.id = id;
+                device_initialize(&pa->pdev.dev);
+                pa->pdev.dev.release = platform_device_release;
+        }
+
+        return pa ? &pa->pdev : NULL;   
+}
+EXPORT_SYMBOL_GPL(platform_device_alloc);
+
+/**
+ *      platform_device_add_resources
+ *      @pdev:  platform device allocated by platform_device_alloc to add resources to
+ *      @res:   set of resources that needs to be allocated for the device
+ *      @num:   number of resources
+ *
+ *      Add a copy of the resources to the platform device.  The memory
+ *      associated with the resources will be freed when the platform
+ *      device is released.
+ */
+int platform_device_add_resources(struct platform_device *pdev, struct resource *res, unsigned int num)
+{
+        struct resource *r;
+
+        r = kmalloc(sizeof(struct resource) * num, GFP_KERNEL);
+        if (r) {
+                memcpy(r, res, sizeof(struct resource) * num);
+                pdev->resource = r;
+                pdev->num_resources = num;
+        }
+        return r ? 0 : -ENOMEM;
+}
+EXPORT_SYMBOL_GPL(platform_device_add_resources);
+
+/**
+ *      platform_device_add_data
+ *      @pdev:  platform device allocated by platform_device_alloc to add resources to
+ *      @data:  platform specific data for this platform device
+ *      @size:  size of platform specific data
+ *
+ *      Add a copy of platform specific data to the platform device's platform_data
+ *      pointer.  The memory associated with the platform data will be freed
+ *      when the platform device is released.
+ */
+int platform_device_add_data(struct platform_device *pdev, void *data, size_t size)
+{
+        void *d;
+
+        d = kmalloc(size, GFP_KERNEL);
+        if (d) {
+                memcpy(d, data, size);
+                pdev->dev.platform_data = d;
+        }
+        return d ? 0 : -ENOMEM;
+}
+EXPORT_SYMBOL_GPL(platform_device_add_data);
+
+/**
+ *      platform_device_add - add a platform device to device hierarchy
  *      @pdev:  platform device we're adding
  *
+ *      This is part 2 of platform_device_register(), though may be called
+ *      separately _iff_ pdev was allocated by platform_device_alloc().
  */
-int platform_device_register(struct platform_device * pdev)
+int platform_device_add(struct platform_device *pdev)
 {
         int i, ret = 0;
 
@@ -174,6 +277,18 @@ int platform_device_register(struct platform_device * pdev)
                         release_resource(&pdev->resource[i]);
         return ret;
 }
+EXPORT_SYMBOL_GPL(platform_device_add);
+
+/**
+ *      platform_device_register - add a platform-level device
+ *      @pdev:  platform device we're adding
+ *
+ */
+int platform_device_register(struct platform_device * pdev)
+{
+        device_initialize(&pdev->dev);
+        return platform_device_add(pdev);
+}
 
 /**
  *      platform_device_unregister - remove a platform-level device
@@ -197,18 +312,6 @@ void platform_device_unregister(struct platform_device * pdev)
         }
 }
 
-struct platform_object {
-        struct platform_device pdev;
-        struct resource resources[0];
-};
-
-static void platform_device_release_simple(struct device *dev)
-{
-        struct platform_device *pdev = to_platform_device(dev);
-
-        kfree(container_of(pdev, struct platform_object, pdev));
-}
-
 /**
  *      platform_device_register_simple
  *      @name:  base name of the device we're adding
@@ -225,33 +328,29 @@ static void platform_device_release_simple(struct device *dev)
 struct platform_device *platform_device_register_simple(char *name, unsigned int id,
                                                         struct resource *res, unsigned int num)
 {
-        struct platform_object *pobj;
+        struct platform_device *pdev;
         int retval;
 
-        pobj = kzalloc(sizeof(*pobj) + sizeof(struct resource) * num, GFP_KERNEL);
-        if (!pobj) {
+        pdev = platform_device_alloc(name, id);
+        if (!pdev) {
                 retval = -ENOMEM;
                 goto error;
         }
 
-        pobj->pdev.name = name;
-        pobj->pdev.id = id;
-        pobj->pdev.dev.release = platform_device_release_simple;
-
         if (num) {
-                memcpy(pobj->resources, res, sizeof(struct resource) * num);
-                pobj->pdev.resource = pobj->resources;
-                pobj->pdev.num_resources = num;
+                retval = platform_device_add_resources(pdev, res, num);
+                if (retval)
+                        goto error;
         }
 
-        retval = platform_device_register(&pobj->pdev);
+        retval = platform_device_add(pdev);
         if (retval)
                 goto error;
 
-        return &pobj->pdev;
+        return pdev;
 
 error:
-        kfree(pobj);
+        platform_device_put(pdev);
         return ERR_PTR(retval);
 }
 
diff --git a/drivers/base/power/sysfs.c b/drivers/base/power/sysfs.c
index 89c57875f3e5..f3a0c562bcb5 100644
--- a/drivers/base/power/sysfs.c
+++ b/drivers/base/power/sysfs.c
@@ -3,6 +3,7 @@
  */
 
 #include <linux/device.h>
+#include <linux/string.h>
 #include "power.h"
 
 
diff --git a/drivers/block/DAC960.c b/drivers/block/DAC960.c
index 3760edfdc65c..70eaa5c7ac08 100644
--- a/drivers/block/DAC960.c
+++ b/drivers/block/DAC960.c
@@ -417,14 +417,12 @@ static void DAC960_DestroyAuxiliaryStructures(DAC960_Controller_T *Controller)
             * Remember the beginning of the group, but don't free it
             * until we've reached the beginning of the next group.
             */
-           if (CommandGroup != NULL)
-                kfree(CommandGroup);
-            CommandGroup = Command;
+           kfree(CommandGroup);
+           CommandGroup = Command;
       }
       Controller->Commands[i] = NULL;
     }
-  if (CommandGroup != NULL)
-      kfree(CommandGroup);
+  kfree(CommandGroup);
 
   if (Controller->CombinedStatusBuffer != NULL)
     {
@@ -435,30 +433,23 @@ static void DAC960_DestroyAuxiliaryStructures(DAC960_Controller_T *Controller)
 
   if (ScatterGatherPool != NULL)
         pci_pool_destroy(ScatterGatherPool);
-  if (Controller->FirmwareType == DAC960_V1_Controller) return;
+  if (Controller->FirmwareType == DAC960_V1_Controller)
+        return;
 
   if (RequestSensePool != NULL)
         pci_pool_destroy(RequestSensePool);
 
-  for (i = 0; i < DAC960_MaxLogicalDrives; i++)
-    if (Controller->V2.LogicalDeviceInformation[i] != NULL)
-      {
+  for (i = 0; i < DAC960_MaxLogicalDrives; i++) {
         kfree(Controller->V2.LogicalDeviceInformation[i]);
         Controller->V2.LogicalDeviceInformation[i] = NULL;
-      }
+  }
 
   for (i = 0; i < DAC960_V2_MaxPhysicalDevices; i++)
     {
-      if (Controller->V2.PhysicalDeviceInformation[i] != NULL)
-        {
-          kfree(Controller->V2.PhysicalDeviceInformation[i]);
-          Controller->V2.PhysicalDeviceInformation[i] = NULL;
-        }
-      if (Controller->V2.InquiryUnitSerialNumber[i] != NULL)
-        {
-          kfree(Controller->V2.InquiryUnitSerialNumber[i]);
-          Controller->V2.InquiryUnitSerialNumber[i] = NULL;
-        }
+      kfree(Controller->V2.PhysicalDeviceInformation[i]);
+      Controller->V2.PhysicalDeviceInformation[i] = NULL;
+      kfree(Controller->V2.InquiryUnitSerialNumber[i]);
+      Controller->V2.InquiryUnitSerialNumber[i] = NULL;
     }
 }
 
diff --git a/drivers/block/Kconfig b/drivers/block/Kconfig
index 51b0af1cebee..7b1cd93892be 100644
--- a/drivers/block/Kconfig
+++ b/drivers/block/Kconfig
@@ -409,16 +409,6 @@ config BLK_DEV_INITRD
           for details.
 
 
-#XXX - it makes sense to enable this only for 32-bit subarch's, not for x86_64
-#for instance.
-config LBD
-        bool "Support for Large Block Devices"
-        depends on X86 || (MIPS && 32BIT) || PPC32 || ARCH_S390_31 || SUPERH || UML
-        help
-          Say Y here if you want to attach large (bigger than 2TB) discs to
-          your machine, or if you want to have a raid or loopback device
-          bigger than 2TB.  Otherwise say N.
-
 config CDROM_PKTCDVD
         tristate "Packet writing on CD/DVD media"
         depends on !UML
@@ -455,8 +445,6 @@ config CDROM_PKTCDVD_WCACHE
 
 source "drivers/s390/block/Kconfig"
 
-source "drivers/block/Kconfig.iosched"
-
 config ATA_OVER_ETH
         tristate "ATA over Ethernet support"
         depends on NET
diff --git a/drivers/block/Kconfig.iosched b/drivers/block/Kconfig.iosched
deleted file mode 100644
index 5b90d2fa63b8..000000000000
--- a/drivers/block/Kconfig.iosched
+++ /dev/null
@@ -1,69 +0,0 @@
-
-menu "IO Schedulers"
-
-config IOSCHED_NOOP
-        bool
-        default y
-        ---help---
-          The no-op I/O scheduler is a minimal scheduler that does basic merging
-          and sorting. Its main uses include non-disk based block devices like
-          memory devices, and specialised software or hardware environments
-          that do their own scheduling and require only minimal assistance from
-          the kernel.
-
-config IOSCHED_AS
-        tristate "Anticipatory I/O scheduler"
-        default y
-        ---help---
-          The anticipatory I/O scheduler is the default disk scheduler. It is
-          generally a good choice for most environments, but is quite large and
-          complex when compared to the deadline I/O scheduler, it can also be
-          slower in some cases especially some database loads.
-
-config IOSCHED_DEADLINE
-        tristate "Deadline I/O scheduler"
-        default y
-        ---help---
-          The deadline I/O scheduler is simple and compact, and is often as
-          good as the anticipatory I/O scheduler, and in some database
-          workloads, better. In the case of a single process performing I/O to
-          a disk at any one time, its behaviour is almost identical to the
-          anticipatory I/O scheduler and so is a good choice.
-
-config IOSCHED_CFQ
-        tristate "CFQ I/O scheduler"
-        default y
-        ---help---
-          The CFQ I/O scheduler tries to distribute bandwidth equally
-          among all processes in the system. It should provide a fair
-          working environment, suitable for desktop systems.
-
-choice
-        prompt "Default I/O scheduler"
-        default DEFAULT_AS
-        help
-          Select the I/O scheduler which will be used by default for all
-          block devices.
-
-        config DEFAULT_AS
-                bool "Anticipatory" if IOSCHED_AS
-
-        config DEFAULT_DEADLINE
-                bool "Deadline" if IOSCHED_DEADLINE
-
-        config DEFAULT_CFQ
-                bool "CFQ" if IOSCHED_CFQ
-
-        config DEFAULT_NOOP
-                bool "No-op"
-
-endchoice
-
-config DEFAULT_IOSCHED
-        string
-        default "anticipatory" if DEFAULT_AS
-        default "deadline" if DEFAULT_DEADLINE
-        default "cfq" if DEFAULT_CFQ
-        default "noop" if DEFAULT_NOOP
-
-endmenu
diff --git a/drivers/block/Makefile b/drivers/block/Makefile
index 1cf09a1c065b..3ec1f8df87b1 100644
--- a/drivers/block/Makefile
+++ b/drivers/block/Makefile
@@ -4,21 +4,7 @@
 # 12 June 2000, Christoph Hellwig <hch@infradead.org>
 # Rewritten to use lists instead of if-statements.
 # 
-# Note : at this point, these files are compiled on all systems.
-# In the future, some of these should be built conditionally.
-#
-
-#
-# NOTE that ll_rw_blk.c must come early in linkage order - it starts the
-# kblockd threads
-#
-
-obj-y   := elevator.o ll_rw_blk.o ioctl.o genhd.o scsi_ioctl.o
 
-obj-$(CONFIG_IOSCHED_NOOP)      += noop-iosched.o
-obj-$(CONFIG_IOSCHED_AS)        += as-iosched.o
-obj-$(CONFIG_IOSCHED_DEADLINE)  += deadline-iosched.o
-obj-$(CONFIG_IOSCHED_CFQ)       += cfq-iosched.o
 obj-$(CONFIG_MAC_FLOPPY)        += swim3.o
 obj-$(CONFIG_BLK_DEV_FD)        += floppy.o
 obj-$(CONFIG_BLK_DEV_FD98)      += floppy98.o
diff --git a/drivers/block/as-iosched.c b/drivers/block/as-iosched.c
deleted file mode 100644
index c6744ff38294..000000000000
--- a/drivers/block/as-iosched.c
+++ /dev/null
@@ -1,1985 +0,0 @@
-/*
- *  linux/drivers/block/as-iosched.c
- *
- *  Anticipatory & deadline i/o scheduler.
- *
- *  Copyright (C) 2002 Jens Axboe <axboe@suse.de>
- *                     Nick Piggin <piggin@cyberone.com.au>
- *
- */
-#include <linux/kernel.h>
-#include <linux/fs.h>
-#include <linux/blkdev.h>
-#include <linux/elevator.h>
-#include <linux/bio.h>
-#include <linux/config.h>
-#include <linux/module.h>
-#include <linux/slab.h>
-#include <linux/init.h>
-#include <linux/compiler.h>
-#include <linux/hash.h>
-#include <linux/rbtree.h>
-#include <linux/interrupt.h>
-
-#define REQ_SYNC        1
-#define REQ_ASYNC       0
-
-/*
- * See Documentation/block/as-iosched.txt
- */
-
-/*
- * max time before a read is submitted.
- */
-#define default_read_expire (HZ / 8)
-
-/*
- * ditto for writes, these limits are not hard, even
- * if the disk is capable of satisfying them.
- */
-#define default_write_expire (HZ / 4)
-
-/*
- * read_batch_expire describes how long we will allow a stream of reads to
- * persist before looking to see whether it is time to switch over to writes.
- */
-#define default_read_batch_expire (HZ / 2)
-
-/*
- * write_batch_expire describes how long we want a stream of writes to run for.
- * This is not a hard limit, but a target we set for the auto-tuning thingy.
- * See, the problem is: we can send a lot of writes to disk cache / TCQ in
- * a short amount of time...
- */
-#define default_write_batch_expire (HZ / 8)
-
-/*
- * max time we may wait to anticipate a read (default around 6ms)
- */
-#define default_antic_expire ((HZ / 150) ? HZ / 150 : 1)
-
-/*
- * Keep track of up to 20ms thinktimes. We can go as big as we like here,
- * however huge values tend to interfere and not decay fast enough. A program
- * might be in a non-io phase of operation. Waiting on user input for example,
- * or doing a lengthy computation. A small penalty can be justified there, and
- * will still catch out those processes that constantly have large thinktimes.
- */
-#define MAX_THINKTIME (HZ/50UL)
-
-/* Bits in as_io_context.state */
-enum as_io_states {
-        AS_TASK_RUNNING=0,      /* Process has not exitted */
-        AS_TASK_IOSTARTED,      /* Process has started some IO */
-        AS_TASK_IORUNNING,      /* Process has completed some IO */
-};
-
-enum anticipation_status {
-        ANTIC_OFF=0,            /* Not anticipating (normal operation)  */
-        ANTIC_WAIT_REQ,         /* The last read has not yet completed  */
-        ANTIC_WAIT_NEXT,        /* Currently anticipating a request vs
-                                   last read (which has completed) */
-        ANTIC_FINISHED,         /* Anticipating but have found a candidate
-                                 * or timed out */
-};
-
-struct as_data {
-        /*
-         * run time data
-         */
-
-        struct request_queue *q;        /* the "owner" queue */
-
-        /*
-         * requests (as_rq s) are present on both sort_list and fifo_list
-         */
-        struct rb_root sort_list[2];
-        struct list_head fifo_list[2];
-
-        struct as_rq *next_arq[2];      /* next in sort order */
-        sector_t last_sector[2];        /* last REQ_SYNC & REQ_ASYNC sectors */
-        struct list_head *hash;         /* request hash */
-
-        unsigned long exit_prob;        /* probability a task will exit while
-                                           being waited on */
-        unsigned long new_ttime_total;  /* mean thinktime on new proc */
-        unsigned long new_ttime_mean;
-        u64 new_seek_total;             /* mean seek on new proc */
-        sector_t new_seek_mean;
-
-        unsigned long current_batch_expires;
-        unsigned long last_check_fifo[2];
-        int changed_batch;              /* 1: waiting for old batch to end */
-        int new_batch;                  /* 1: waiting on first read complete */
-        int batch_data_dir;             /* current batch REQ_SYNC / REQ_ASYNC */
-        int write_batch_count;          /* max # of reqs in a write batch */
-        int current_write_count;        /* how many requests left this batch */
-        int write_batch_idled;          /* has the write batch gone idle? */
-        mempool_t *arq_pool;
-
-        enum anticipation_status antic_status;
-        unsigned long antic_start;      /* jiffies: when it started */
-        struct timer_list antic_timer;  /* anticipatory scheduling timer */
-        struct work_struct antic_work;  /* Deferred unplugging */
-        struct io_context *io_context;  /* Identify the expected process */
-        int ioc_finished; /* IO associated with io_context is finished */
-        int nr_dispatched;
-
-        /*
-         * settings that change how the i/o scheduler behaves
-         */
-        unsigned long fifo_expire[2];
-        unsigned long batch_expire[2];
-        unsigned long antic_expire;
-};
-
-#define list_entry_fifo(ptr)    list_entry((ptr), struct as_rq, fifo)
-
-/*
- * per-request data.
- */
-enum arq_state {
-        AS_RQ_NEW=0,            /* New - not referenced and not on any lists */
-        AS_RQ_QUEUED,           /* In the request queue. It belongs to the
-                                   scheduler */
-        AS_RQ_DISPATCHED,       /* On the dispatch list. It belongs to the
-                                   driver now */
-        AS_RQ_PRESCHED,         /* Debug poisoning for requests being used */
-        AS_RQ_REMOVED,
-        AS_RQ_MERGED,
-        AS_RQ_POSTSCHED,        /* when they shouldn't be */
-};
-
-struct as_rq {
-        /*
-         * rbtree index, key is the starting offset
-         */
-        struct rb_node rb_node;
-        sector_t rb_key;
-
-        struct request *request;
-
-        struct io_context *io_context;  /* The submitting task */
-
-        /*
-         * request hash, key is the ending offset (for back merge lookup)
-         */
-        struct list_head hash;
-        unsigned int on_hash;
-
-        /*
-         * expire fifo
-         */
-        struct list_head fifo;
-        unsigned long expires;
-
-        unsigned int is_sync;
-        enum arq_state state;
-};
-
-#define RQ_DATA(rq)     ((struct as_rq *) (rq)->elevator_private)
-
-static kmem_cache_t *arq_pool;
-
-/*
- * IO Context helper functions
- */
-
-/* Called to deallocate the as_io_context */
-static void free_as_io_context(struct as_io_context *aic)
-{
-        kfree(aic);
-}
-
-/* Called when the task exits */
-static void exit_as_io_context(struct as_io_context *aic)
-{
-        WARN_ON(!test_bit(AS_TASK_RUNNING, &aic->state));
-        clear_bit(AS_TASK_RUNNING, &aic->state);
-}
-
-static struct as_io_context *alloc_as_io_context(void)
-{
-        struct as_io_context *ret;
-
-        ret = kmalloc(sizeof(*ret), GFP_ATOMIC);
-        if (ret) {
-                ret->dtor = free_as_io_context;
-                ret->exit = exit_as_io_context;
-                ret->state = 1 << AS_TASK_RUNNING;
-                atomic_set(&ret->nr_queued, 0);
-                atomic_set(&ret->nr_dispatched, 0);
-                spin_lock_init(&ret->lock);
-                ret->ttime_total = 0;
-                ret->ttime_samples = 0;
-                ret->ttime_mean = 0;
-                ret->seek_total = 0;
-                ret->seek_samples = 0;
-                ret->seek_mean = 0;
-        }
-
-        return ret;
-}
-
-/*
- * If the current task has no AS IO context then create one and initialise it.
- * Then take a ref on the task's io context and return it.
- */
-static struct io_context *as_get_io_context(void)
-{
-        struct io_context *ioc = get_io_context(GFP_ATOMIC);
-        if (ioc && !ioc->aic) {
-                ioc->aic = alloc_as_io_context();
-                if (!ioc->aic) {
-                        put_io_context(ioc);
-                        ioc = NULL;
-                }
-        }
-        return ioc;
-}
-
-static void as_put_io_context(struct as_rq *arq)
-{
-        struct as_io_context *aic;
-
-        if (unlikely(!arq->io_context))
-                return;
-
-        aic = arq->io_context->aic;
-
-        if (arq->is_sync == REQ_SYNC && aic) {
-                spin_lock(&aic->lock);
-                set_bit(AS_TASK_IORUNNING, &aic->state);
-                aic->last_end_request = jiffies;
-                spin_unlock(&aic->lock);
-        }
-
-        put_io_context(arq->io_context);
-}
-
-/*
- * the back merge hash support functions
- */
-static const int as_hash_shift = 6;
-#define AS_HASH_BLOCK(sec)      ((sec) >> 3)
-#define AS_HASH_FN(sec)         (hash_long(AS_HASH_BLOCK((sec)), as_hash_shift))
-#define AS_HASH_ENTRIES         (1 << as_hash_shift)
-#define rq_hash_key(rq)         ((rq)->sector + (rq)->nr_sectors)
-#define list_entry_hash(ptr)    list_entry((ptr), struct as_rq, hash)
-
-static inline void __as_del_arq_hash(struct as_rq *arq)
-{
-        arq->on_hash = 0;
-        list_del_init(&arq->hash);
-}
-
-static inline void as_del_arq_hash(struct as_rq *arq)
-{
-        if (arq->on_hash)
-                __as_del_arq_hash(arq);
-}
-
-static void as_add_arq_hash(struct as_data *ad, struct as_rq *arq)
-{
-        struct request *rq = arq->request;
-
-        BUG_ON(arq->on_hash);
-
-        arq->on_hash = 1;
-        list_add(&arq->hash, &ad->hash[AS_HASH_FN(rq_hash_key(rq))]);
-}
-
-/*
- * move hot entry to front of chain
- */
-static inline void as_hot_arq_hash(struct as_data *ad, struct as_rq *arq)
-{
-        struct request *rq = arq->request;
-        struct list_head *head = &ad->hash[AS_HASH_FN(rq_hash_key(rq))];
-
-        if (!arq->on_hash) {
-                WARN_ON(1);
-                return;
-        }
-
-        if (arq->hash.prev != head) {
-                list_del(&arq->hash);
-                list_add(&arq->hash, head);
-        }
-}
-
-static struct request *as_find_arq_hash(struct as_data *ad, sector_t offset)
-{
-        struct list_head *hash_list = &ad->hash[AS_HASH_FN(offset)];
-        struct list_head *entry, *next = hash_list->next;
-
-        while ((entry = next) != hash_list) {
-                struct as_rq *arq = list_entry_hash(entry);
-                struct request *__rq = arq->request;
-
-                next = entry->next;
-
-                BUG_ON(!arq->on_hash);
-
-                if (!rq_mergeable(__rq)) {
-                        as_del_arq_hash(arq);
-                        continue;
-                }
-
-                if (rq_hash_key(__rq) == offset)
-                        return __rq;
-        }
-
-        return NULL;
-}
-
-/*
- * rb tree support functions
- */
-#define RB_NONE         (2)
-#define RB_EMPTY(root)  ((root)->rb_node == NULL)
-#define ON_RB(node)     ((node)->rb_color != RB_NONE)
-#define RB_CLEAR(node)  ((node)->rb_color = RB_NONE)
-#define rb_entry_arq(node)      rb_entry((node), struct as_rq, rb_node)
-#define ARQ_RB_ROOT(ad, arq)    (&(ad)->sort_list[(arq)->is_sync])
-#define rq_rb_key(rq)           (rq)->sector
-
-/*
- * as_find_first_arq finds the first (lowest sector numbered) request
- * for the specified data_dir. Used to sweep back to the start of the disk
- * (1-way elevator) after we process the last (highest sector) request.
- */
-static struct as_rq *as_find_first_arq(struct as_data *ad, int data_dir)
-{
-        struct rb_node *n = ad->sort_list[data_dir].rb_node;
-
-        if (n == NULL)
-                return NULL;
-
-        for (;;) {
-                if (n->rb_left == NULL)
-                        return rb_entry_arq(n);
-
-                n = n->rb_left;
-        }
-}
-
-/*
- * Add the request to the rb tree if it is unique.  If there is an alias (an
- * existing request against the same sector), which can happen when using
- * direct IO, then return the alias.
- */
-static struct as_rq *as_add_arq_rb(struct as_data *ad, struct as_rq *arq)
-{
-        struct rb_node **p = &ARQ_RB_ROOT(ad, arq)->rb_node;
-        struct rb_node *parent = NULL;
-        struct as_rq *__arq;
-        struct request *rq = arq->request;
-
-        arq->rb_key = rq_rb_key(rq);
-
-        while (*p) {
-                parent = *p;
-                __arq = rb_entry_arq(parent);
-
-                if (arq->rb_key < __arq->rb_key)
-                        p = &(*p)->rb_left;
-                else if (arq->rb_key > __arq->rb_key)
-                        p = &(*p)->rb_right;
-                else
-                        return __arq;
-        }
-
-        rb_link_node(&arq->rb_node, parent, p);
-        rb_insert_color(&arq->rb_node, ARQ_RB_ROOT(ad, arq));
-
-        return NULL;
-}
-
-static inline void as_del_arq_rb(struct as_data *ad, struct as_rq *arq)
-{
-        if (!ON_RB(&arq->rb_node)) {
-                WARN_ON(1);
-                return;
-        }
-
-        rb_erase(&arq->rb_node, ARQ_RB_ROOT(ad, arq));
-        RB_CLEAR(&arq->rb_node);
-}
-
-static struct request *
-as_find_arq_rb(struct as_data *ad, sector_t sector, int data_dir)
-{
-        struct rb_node *n = ad->sort_list[data_dir].rb_node;
-        struct as_rq *arq;
-
-        while (n) {
-                arq = rb_entry_arq(n);
-
-                if (sector < arq->rb_key)
-                        n = n->rb_left;
-                else if (sector > arq->rb_key)
-                        n = n->rb_right;
-                else
-                        return arq->request;
-        }
-
-        return NULL;
-}
-
-/*
- * IO Scheduler proper
- */
-
-#define MAXBACK (1024 * 1024)   /*
-                                 * Maximum distance the disk will go backward
-                                 * for a request.
-                                 */
-
-#define BACK_PENALTY    2
-
-/*
- * as_choose_req selects the preferred one of two requests of the same data_dir
- * ignoring time - eg. timeouts, which is the job of as_dispatch_request
- */
-static struct as_rq *
-as_choose_req(struct as_data *ad, struct as_rq *arq1, struct as_rq *arq2)
-{
-        int data_dir;
-        sector_t last, s1, s2, d1, d2;
-        int r1_wrap=0, r2_wrap=0;       /* requests are behind the disk head */
-        const sector_t maxback = MAXBACK;
-
-        if (arq1 == NULL || arq1 == arq2)
-                return arq2;
-        if (arq2 == NULL)
-                return arq1;
-
-        data_dir = arq1->is_sync;
-
-        last = ad->last_sector[data_dir];
-        s1 = arq1->request->sector;
-        s2 = arq2->request->sector;
-
-        BUG_ON(data_dir != arq2->is_sync);
-
-        /*
-         * Strict one way elevator _except_ in the case where we allow
-         * short backward seeks which are biased as twice the cost of a
-         * similar forward seek.
-         */
-        if (s1 >= last)
-                d1 = s1 - last;
-        else if (s1+maxback >= last)
-                d1 = (last - s1)*BACK_PENALTY;
-        else {
-                r1_wrap = 1;
-                d1 = 0; /* shut up, gcc */
-        }
-
-        if (s2 >= last)
-                d2 = s2 - last;
-        else if (s2+maxback >= last)
-                d2 = (last - s2)*BACK_PENALTY;
-        else {
-                r2_wrap = 1;
-                d2 = 0;
-        }
-
-        /* Found required data */
-        if (!r1_wrap && r2_wrap)
-                return arq1;
-        else if (!r2_wrap && r1_wrap)
-                return arq2;
-        else if (r1_wrap && r2_wrap) {
-                /* both behind the head */
-                if (s1 <= s2)
-                        return arq1;
-                else
-                        return arq2;
-        }
-
-        /* Both requests in front of the head */
-        if (d1 < d2)
-                return arq1;
-        else if (d2 < d1)
-                return arq2;
-        else {
-                if (s1 >= s2)
-                        return arq1;
-                else
-                        return arq2;
-        }
-}
-
-/*
- * as_find_next_arq finds the next request after @prev in elevator order.
- * this with as_choose_req form the basis for how the scheduler chooses
- * what request to process next. Anticipation works on top of this.
- */
-static struct as_rq *as_find_next_arq(struct as_data *ad, struct as_rq *last)
-{
-        const int data_dir = last->is_sync;
-        struct as_rq *ret;
-        struct rb_node *rbnext = rb_next(&last->rb_node);
-        struct rb_node *rbprev = rb_prev(&last->rb_node);
-        struct as_rq *arq_next, *arq_prev;
-
-        BUG_ON(!ON_RB(&last->rb_node));
-
-        if (rbprev)
-                arq_prev = rb_entry_arq(rbprev);
-        else
-                arq_prev = NULL;
-
-        if (rbnext)
-                arq_next = rb_entry_arq(rbnext);
-        else {
-                arq_next = as_find_first_arq(ad, data_dir);
-                if (arq_next == last)
-                        arq_next = NULL;
-        }
-
-        ret = as_choose_req(ad, arq_next, arq_prev);
-
-        return ret;
-}
-
-/*
- * anticipatory scheduling functions follow
- */
-
-/*
- * as_antic_expired tells us when we have anticipated too long.
- * The funny "absolute difference" math on the elapsed time is to handle
- * jiffy wraps, and disks which have been idle for 0x80000000 jiffies.
- */
-static int as_antic_expired(struct as_data *ad)
-{
-        long delta_jif;
-
-        delta_jif = jiffies - ad->antic_start;
-        if (unlikely(delta_jif < 0))
-                delta_jif = -delta_jif;
-        if (delta_jif < ad->antic_expire)
-                return 0;
-
-        return 1;
-}
-
-/*
- * as_antic_waitnext starts anticipating that a nice request will soon be
- * submitted. See also as_antic_waitreq
- */
-static void as_antic_waitnext(struct as_data *ad)
-{
-        unsigned long timeout;
-
-        BUG_ON(ad->antic_status != ANTIC_OFF
-                        && ad->antic_status != ANTIC_WAIT_REQ);
-
-        timeout = ad->antic_start + ad->antic_expire;
-
-        mod_timer(&ad->antic_timer, timeout);
-
-        ad->antic_status = ANTIC_WAIT_NEXT;
-}
-
-/*
- * as_antic_waitreq starts anticipating. We don't start timing the anticipation
- * until the request that we're anticipating on has finished. This means we
- * are timing from when the candidate process wakes up hopefully.
- */
-static void as_antic_waitreq(struct as_data *ad)
-{
-        BUG_ON(ad->antic_status == ANTIC_FINISHED);
-        if (ad->antic_status == ANTIC_OFF) {
-                if (!ad->io_context || ad->ioc_finished)
-                        as_antic_waitnext(ad);
-                else
-                        ad->antic_status = ANTIC_WAIT_REQ;
-        }
-}
-
-/*
- * This is called directly by the functions in this file to stop anticipation.
- * We kill the timer and schedule a call to the request_fn asap.
- */
-static void as_antic_stop(struct as_data *ad)
-{
-        int status = ad->antic_status;
-
-        if (status == ANTIC_WAIT_REQ || status == ANTIC_WAIT_NEXT) {
-                if (status == ANTIC_WAIT_NEXT)
-                        del_timer(&ad->antic_timer);
-                ad->antic_status = ANTIC_FINISHED;
-                /* see as_work_handler */
-                kblockd_schedule_work(&ad->antic_work);
-        }
-}
-
-/*
- * as_antic_timeout is the timer function set by as_antic_waitnext.
- */
-static void as_antic_timeout(unsigned long data)
-{
-        struct request_queue *q = (struct request_queue *)data;
-        struct as_data *ad = q->elevator->elevator_data;
-        unsigned long flags;
-
-        spin_lock_irqsave(q->queue_lock, flags);
-        if (ad->antic_status == ANTIC_WAIT_REQ
-                        || ad->antic_status == ANTIC_WAIT_NEXT) {
-                struct as_io_context *aic = ad->io_context->aic;
-
-                ad->antic_status = ANTIC_FINISHED;
-                kblockd_schedule_work(&ad->antic_work);
-
-                if (aic->ttime_samples == 0) {
-                        /* process anticipated on has exitted or timed out*/
-                        ad->exit_prob = (7*ad->exit_prob + 256)/8;
-                }
-        }
-        spin_unlock_irqrestore(q->queue_lock, flags);
-}
-
-/*
- * as_close_req decides if one request is considered "close" to the
- * previous one issued.
- */
-static int as_close_req(struct as_data *ad, struct as_rq *arq)
-{
-        unsigned long delay;    /* milliseconds */
-        sector_t last = ad->last_sector[ad->batch_data_dir];
-        sector_t next = arq->request->sector;
-        sector_t delta; /* acceptable close offset (in sectors) */
-
-        if (ad->antic_status == ANTIC_OFF || !ad->ioc_finished)
-                delay = 0;
-        else
-                delay = ((jiffies - ad->antic_start) * 1000) / HZ;
-
-        if (delay <= 1)
-                delta = 64;
-        else if (delay <= 20 && delay <= ad->antic_expire)
-                delta = 64 << (delay-1);
-        else
-                return 1;
-
-        return (last - (delta>>1) <= next) && (next <= last + delta);
-}
-
-/*
- * as_can_break_anticipation returns true if we have been anticipating this
- * request.
- *
- * It also returns true if the process against which we are anticipating
- * submits a write - that's presumably an fsync, O_SYNC write, etc. We want to
- * dispatch it ASAP, because we know that application will not be submitting
- * any new reads.
- *
- * If the task which has submitted the request has exitted, break anticipation.
- *
- * If this task has queued some other IO, do not enter enticipation.
- */
-static int as_can_break_anticipation(struct as_data *ad, struct as_rq *arq)
-{
-        struct io_context *ioc;
-        struct as_io_context *aic;
-        sector_t s;
-
-        ioc = ad->io_context;
-        BUG_ON(!ioc);
-
-        if (arq && ioc == arq->io_context) {
-                /* request from same process */
-                return 1;
-        }
-
-        if (ad->ioc_finished && as_antic_expired(ad)) {
-                /*
-                 * In this situation status should really be FINISHED,
-                 * however the timer hasn't had the chance to run yet.
-                 */
-                return 1;
-        }
-
-        aic = ioc->aic;
-        if (!aic)
-                return 0;
-
-        if (!test_bit(AS_TASK_RUNNING, &aic->state)) {
-                /* process anticipated on has exitted */
-                if (aic->ttime_samples == 0)
-                        ad->exit_prob = (7*ad->exit_prob + 256)/8;
-                return 1;
-        }
-
-        if (atomic_read(&aic->nr_queued) > 0) {
-                /* process has more requests queued */
-                return 1;
-        }
-
-        if (atomic_read(&aic->nr_dispatched) > 0) {
-                /* process has more requests dispatched */
-                return 1;
-        }
-
-        if (arq && arq->is_sync == REQ_SYNC && as_close_req(ad, arq)) {
-                /*
-                 * Found a close request that is not one of ours.
-                 *
-                 * This makes close requests from another process reset
-                 * our thinktime delay. Is generally useful when there are
-                 * two or more cooperating processes working in the same
-                 * area.
-                 */
-                spin_lock(&aic->lock);
-                aic->last_end_request = jiffies;
-                spin_unlock(&aic->lock);
-                return 1;
-        }
-
-
-        if (aic->ttime_samples == 0) {
-                if (ad->new_ttime_mean > ad->antic_expire)
-                        return 1;
-                if (ad->exit_prob > 128)
-                        return 1;
-        } else if (aic->ttime_mean > ad->antic_expire) {
-                /* the process thinks too much between requests */
-                return 1;
-        }
-
-        if (!arq)
-                return 0;
-
-        if (ad->last_sector[REQ_SYNC] < arq->request->sector)
-                s = arq->request->sector - ad->last_sector[REQ_SYNC];
-        else
-                s = ad->last_sector[REQ_SYNC] - arq->request->sector;
-
-        if (aic->seek_samples == 0) {
-                /*
-                 * Process has just started IO. Use past statistics to
-                 * guage success possibility
-                 */
-                if (ad->new_seek_mean > s) {
-                        /* this request is better than what we're expecting */
-                        return 1;
-                }
-
-        } else {
-                if (aic->seek_mean > s) {
-                        /* this request is better than what we're expecting */
-                        return 1;
-                }
-        }
-
-        return 0;
-}
-
-/*
- * as_can_anticipate indicates weather we should either run arq
- * or keep anticipating a better request.
- */
-static int as_can_anticipate(struct as_data *ad, struct as_rq *arq)
-{
-        if (!ad->io_context)
-                /*
-                 * Last request submitted was a write
-                 */
-                return 0;
-
-        if (ad->antic_status == ANTIC_FINISHED)
-                /*
-                 * Don't restart if we have just finished. Run the next request
-                 */
-                return 0;
-
-        if (as_can_break_anticipation(ad, arq))
-                /*
-                 * This request is a good candidate. Don't keep anticipating,
-                 * run it.
-                 */
-                return 0;
-
-        /*
-         * OK from here, we haven't finished, and don't have a decent request!
-         * Status is either ANTIC_OFF so start waiting,
-         * ANTIC_WAIT_REQ so continue waiting for request to finish
-         * or ANTIC_WAIT_NEXT so continue waiting for an acceptable request.
-         *
-         */
-
-        return 1;
-}
-
-static void as_update_thinktime(struct as_data *ad, struct as_io_context *aic, unsigned long ttime)
-{
-        /* fixed point: 1.0 == 1<<8 */
-        if (aic->ttime_samples == 0) {
-                ad->new_ttime_total = (7*ad->new_ttime_total + 256*ttime) / 8;
-                ad->new_ttime_mean = ad->new_ttime_total / 256;
-
-                ad->exit_prob = (7*ad->exit_prob)/8;
-        }
-        aic->ttime_samples = (7*aic->ttime_samples + 256) / 8;
-        aic->ttime_total = (7*aic->ttime_total + 256*ttime) / 8;
-        aic->ttime_mean = (aic->ttime_total + 128) / aic->ttime_samples;
-}
-
-static void as_update_seekdist(struct as_data *ad, struct as_io_context *aic, sector_t sdist)
-{
-        u64 total;
-
-        if (aic->seek_samples == 0) {
-                ad->new_seek_total = (7*ad->new_seek_total + 256*(u64)sdist)/8;
-                ad->new_seek_mean = ad->new_seek_total / 256;
-        }
-
-        /*
-         * Don't allow the seek distance to get too large from the
-         * odd fragment, pagein, etc
-         */
-        if (aic->seek_samples <= 60) /* second&third seek */
-                sdist = min(sdist, (aic->seek_mean * 4) + 2*1024*1024);
-        else
-                sdist = min(sdist, (aic->seek_mean * 4) + 2*1024*64);
-
-        aic->seek_samples = (7*aic->seek_samples + 256) / 8;
-        aic->seek_total = (7*aic->seek_total + (u64)256*sdist) / 8;
-        total = aic->seek_total + (aic->seek_samples/2);
-        do_div(total, aic->seek_samples);
-        aic->seek_mean = (sector_t)total;
-}
-
-/*
- * as_update_iohist keeps a decaying histogram of IO thinktimes, and
- * updates @aic->ttime_mean based on that. It is called when a new
- * request is queued.
- */
-static void as_update_iohist(struct as_data *ad, struct as_io_context *aic, struct request *rq)
-{
-        struct as_rq *arq = RQ_DATA(rq);
-        int data_dir = arq->is_sync;
-        unsigned long thinktime;
-        sector_t seek_dist;
-
-        if (aic == NULL)
-                return;
-
-        if (data_dir == REQ_SYNC) {
-                unsigned long in_flight = atomic_read(&aic->nr_queued)
-                                        + atomic_read(&aic->nr_dispatched);
-                spin_lock(&aic->lock);
-                if (test_bit(AS_TASK_IORUNNING, &aic->state) ||
-                        test_bit(AS_TASK_IOSTARTED, &aic->state)) {
-                        /* Calculate read -> read thinktime */
-                        if (test_bit(AS_TASK_IORUNNING, &aic->state)
-                                                        && in_flight == 0) {
-                                thinktime = jiffies - aic->last_end_request;
-                                thinktime = min(thinktime, MAX_THINKTIME-1);
-                        } else
-                                thinktime = 0;
-                        as_update_thinktime(ad, aic, thinktime);
-
-                        /* Calculate read -> read seek distance */
-                        if (aic->last_request_pos < rq->sector)
-                                seek_dist = rq->sector - aic->last_request_pos;
-                        else
-                                seek_dist = aic->last_request_pos - rq->sector;
-                        as_update_seekdist(ad, aic, seek_dist);
-                }
-                aic->last_request_pos = rq->sector + rq->nr_sectors;
-                set_bit(AS_TASK_IOSTARTED, &aic->state);
-                spin_unlock(&aic->lock);
-        }
-}
-
-/*
- * as_update_arq must be called whenever a request (arq) is added to
- * the sort_list. This function keeps caches up to date, and checks if the
- * request might be one we are "anticipating"
- */
-static void as_update_arq(struct as_data *ad, struct as_rq *arq)
-{
-        const int data_dir = arq->is_sync;
-
-        /* keep the next_arq cache up to date */
-        ad->next_arq[data_dir] = as_choose_req(ad, arq, ad->next_arq[data_dir]);
-
-        /*
-         * have we been anticipating this request?
-         * or does it come from the same process as the one we are anticipating
-         * for?
-         */
-        if (ad->antic_status == ANTIC_WAIT_REQ
-                        || ad->antic_status == ANTIC_WAIT_NEXT) {
-                if (as_can_break_anticipation(ad, arq))
-                        as_antic_stop(ad);
-        }
-}
-
-/*
- * Gathers timings and resizes the write batch automatically
- */
-static void update_write_batch(struct as_data *ad)
-{
-        unsigned long batch = ad->batch_expire[REQ_ASYNC];
-        long write_time;
-
-        write_time = (jiffies - ad->current_batch_expires) + batch;
-        if (write_time < 0)
-                write_time = 0;
-
-        if (write_time > batch && !ad->write_batch_idled) {
-                if (write_time > batch * 3)
-                        ad->write_batch_count /= 2;
-                else
-                        ad->write_batch_count--;
-        } else if (write_time < batch && ad->current_write_count == 0) {
-                if (batch > write_time * 3)
-                        ad->write_batch_count *= 2;
-                else
-                        ad->write_batch_count++;
-        }
-
-        if (ad->write_batch_count < 1)
-                ad->write_batch_count = 1;
-}
-
-/*
- * as_completed_request is to be called when a request has completed and
- * returned something to the requesting process, be it an error or data.
- */
-static void as_completed_request(request_queue_t *q, struct request *rq)
-{
-        struct as_data *ad = q->elevator->elevator_data;
-        struct as_rq *arq = RQ_DATA(rq);
-
-        WARN_ON(!list_empty(&rq->queuelist));
-
-        if (arq->state != AS_RQ_REMOVED) {
-                printk("arq->state %d\n", arq->state);
-                WARN_ON(1);
-                goto out;
-        }
-
-        if (ad->changed_batch && ad->nr_dispatched == 1) {
-                kblockd_schedule_work(&ad->antic_work);
-                ad->changed_batch = 0;
-
-                if (ad->batch_data_dir == REQ_SYNC)
-                        ad->new_batch = 1;
-        }
-        WARN_ON(ad->nr_dispatched == 0);
-        ad->nr_dispatched--;
-
-        /*
-         * Start counting the batch from when a request of that direction is
-         * actually serviced. This should help devices with big TCQ windows
-         * and writeback caches
-         */
-        if (ad->new_batch && ad->batch_data_dir == arq->is_sync) {
-                update_write_batch(ad);
-                ad->current_batch_expires = jiffies +
-                                ad->batch_expire[REQ_SYNC];
-                ad->new_batch = 0;
-        }
-
-        if (ad->io_context == arq->io_context && ad->io_context) {
-                ad->antic_start = jiffies;
-                ad->ioc_finished = 1;
-                if (ad->antic_status == ANTIC_WAIT_REQ) {
-                        /*
-                         * We were waiting on this request, now anticipate
-                         * the next one
-                         */
-                        as_antic_waitnext(ad);
-                }
-        }
-
-        as_put_io_context(arq);
-out:
-        arq->state = AS_RQ_POSTSCHED;
-}
-
-/*
- * as_remove_queued_request removes a request from the pre dispatch queue
- * without updating refcounts. It is expected the caller will drop the
- * reference unless it replaces the request at somepart of the elevator
- * (ie. the dispatch queue)
- */
-static void as_remove_queued_request(request_queue_t *q, struct request *rq)
-{
-        struct as_rq *arq = RQ_DATA(rq);
-        const int data_dir = arq->is_sync;
-        struct as_data *ad = q->elevator->elevator_data;
-
-        WARN_ON(arq->state != AS_RQ_QUEUED);
-
-        if (arq->io_context && arq->io_context->aic) {
-                BUG_ON(!atomic_read(&arq->io_context->aic->nr_queued));
-                atomic_dec(&arq->io_context->aic->nr_queued);
-        }
-
-        /*
-         * Update the "next_arq" cache if we are about to remove its
-         * entry
-         */
-        if (ad->next_arq[data_dir] == arq)
-                ad->next_arq[data_dir] = as_find_next_arq(ad, arq);
-
-        list_del_init(&arq->fifo);
-        as_del_arq_hash(arq);
-        as_del_arq_rb(ad, arq);
-}
-
-/*
- * as_fifo_expired returns 0 if there are no expired reads on the fifo,
- * 1 otherwise.  It is ratelimited so that we only perform the check once per
- * `fifo_expire' interval.  Otherwise a large number of expired requests
- * would create a hopeless seekstorm.
- *
- * See as_antic_expired comment.
- */
-static int as_fifo_expired(struct as_data *ad, int adir)
-{
-        struct as_rq *arq;
-        long delta_jif;
-
-        delta_jif = jiffies - ad->last_check_fifo[adir];
-        if (unlikely(delta_jif < 0))
-                delta_jif = -delta_jif;
-        if (delta_jif < ad->fifo_expire[adir])
-                return 0;
-
-        ad->last_check_fifo[adir] = jiffies;
-
-        if (list_empty(&ad->fifo_list[adir]))
-                return 0;
-
-        arq = list_entry_fifo(ad->fifo_list[adir].next);
-
-        return time_after(jiffies, arq->expires);
-}
-
-/*
- * as_batch_expired returns true if the current batch has expired. A batch
- * is a set of reads or a set of writes.
- */
-static inline int as_batch_expired(struct as_data *ad)
-{
-        if (ad->changed_batch || ad->new_batch)
-                return 0;
-
-        if (ad->batch_data_dir == REQ_SYNC)
-                /* TODO! add a check so a complete fifo gets written? */
-                return time_after(jiffies, ad->current_batch_expires);
-
-        return time_after(jiffies, ad->current_batch_expires)
-                || ad->current_write_count == 0;
-}
-
-/*
- * move an entry to dispatch queue
- */
-static void as_move_to_dispatch(struct as_data *ad, struct as_rq *arq)
-{
-        struct request *rq = arq->request;
-        const int data_dir = arq->is_sync;
-
-        BUG_ON(!ON_RB(&arq->rb_node));
-
-        as_antic_stop(ad);
-        ad->antic_status = ANTIC_OFF;
-
-        /*
-         * This has to be set in order to be correctly updated by
-         * as_find_next_arq
-         */
-        ad->last_sector[data_dir] = rq->sector + rq->nr_sectors;
-
-        if (data_dir == REQ_SYNC) {
-                /* In case we have to anticipate after this */
-                copy_io_context(&ad->io_context, &arq->io_context);
-        } else {
-                if (ad->io_context) {
-                        put_io_context(ad->io_context);
-                        ad->io_context = NULL;
-                }
-
-                if (ad->current_write_count != 0)
-                        ad->current_write_count--;
-        }
-        ad->ioc_finished = 0;
-
-        ad->next_arq[data_dir] = as_find_next_arq(ad, arq);
-
-        /*
-         * take it off the sort and fifo list, add to dispatch queue
-         */
-        while (!list_empty(&rq->queuelist)) {
-                struct request *__rq = list_entry_rq(rq->queuelist.next);
-                struct as_rq *__arq = RQ_DATA(__rq);
-
-                list_del(&__rq->queuelist);
-
-                elv_dispatch_add_tail(ad->q, __rq);
-
-                if (__arq->io_context && __arq->io_context->aic)
-                        atomic_inc(&__arq->io_context->aic->nr_dispatched);
-
-                WARN_ON(__arq->state != AS_RQ_QUEUED);
-                __arq->state = AS_RQ_DISPATCHED;
-
-                ad->nr_dispatched++;
-        }
-
-        as_remove_queued_request(ad->q, rq);
-        WARN_ON(arq->state != AS_RQ_QUEUED);
-
-        elv_dispatch_sort(ad->q, rq);
-
-        arq->state = AS_RQ_DISPATCHED;
-        if (arq->io_context && arq->io_context->aic)
-                atomic_inc(&arq->io_context->aic->nr_dispatched);
-        ad->nr_dispatched++;
-}
-
-/*
- * as_dispatch_request selects the best request according to
- * read/write expire, batch expire, etc, and moves it to the dispatch
- * queue. Returns 1 if a request was found, 0 otherwise.
- */
-static int as_dispatch_request(request_queue_t *q, int force)
-{
-        struct as_data *ad = q->elevator->elevator_data;
-        struct as_rq *arq;
-        const int reads = !list_empty(&ad->fifo_list[REQ_SYNC]);
-        const int writes = !list_empty(&ad->fifo_list[REQ_ASYNC]);
-
-        if (unlikely(force)) {
-                /*
-                 * Forced dispatch, accounting is useless.  Reset
-                 * accounting states and dump fifo_lists.  Note that
-                 * batch_data_dir is reset to REQ_SYNC to avoid
-                 * screwing write batch accounting as write batch
-                 * accounting occurs on W->R transition.
-                 */
-                int dispatched = 0;
-
-                ad->batch_data_dir = REQ_SYNC;
-                ad->changed_batch = 0;
-                ad->new_batch = 0;
-
-                while (ad->next_arq[REQ_SYNC]) {
-                        as_move_to_dispatch(ad, ad->next_arq[REQ_SYNC]);
-                        dispatched++;
-                }
-                ad->last_check_fifo[REQ_SYNC] = jiffies;
-
-                while (ad->next_arq[REQ_ASYNC]) {
-                        as_move_to_dispatch(ad, ad->next_arq[REQ_ASYNC]);
-                        dispatched++;
-                }
-                ad->last_check_fifo[REQ_ASYNC] = jiffies;
-
-                return dispatched;
-        }
-
-        /* Signal that the write batch was uncontended, so we can't time it */
-        if (ad->batch_data_dir == REQ_ASYNC && !reads) {
-                if (ad->current_write_count == 0 || !writes)
-                        ad->write_batch_idled = 1;
-        }
-
-        if (!(reads || writes)
-                || ad->antic_status == ANTIC_WAIT_REQ
-                || ad->antic_status == ANTIC_WAIT_NEXT
-                || ad->changed_batch)
-                return 0;
-
-        if (!(reads && writes && as_batch_expired(ad)) ) {
-                /*
-                 * batch is still running or no reads or no writes
-                 */
-                arq = ad->next_arq[ad->batch_data_dir];
-
-                if (ad->batch_data_dir == REQ_SYNC && ad->antic_expire) {
-                        if (as_fifo_expired(ad, REQ_SYNC))
-                                goto fifo_expired;
-
-                        if (as_can_anticipate(ad, arq)) {
-                                as_antic_waitreq(ad);
-                                return 0;
-                        }
-                }
-
-                if (arq) {
-                        /* we have a "next request" */
-                        if (reads && !writes)
-                                ad->current_batch_expires =
-                                        jiffies + ad->batch_expire[REQ_SYNC];
-                        goto dispatch_request;
-                }
-        }
-
-        /*
-         * at this point we are not running a batch. select the appropriate
-         * data direction (read / write)
-         */
-
-        if (reads) {
-                BUG_ON(RB_EMPTY(&ad->sort_list[REQ_SYNC]));
-
-                if (writes && ad->batch_data_dir == REQ_SYNC)
-                        /*
-                         * Last batch was a read, switch to writes
-                         */
-                        goto dispatch_writes;
-
-                if (ad->batch_data_dir == REQ_ASYNC) {
-                        WARN_ON(ad->new_batch);
-                        ad->changed_batch = 1;
-                }
-                ad->batch_data_dir = REQ_SYNC;
-                arq = list_entry_fifo(ad->fifo_list[ad->batch_data_dir].next);
-                ad->last_check_fifo[ad->batch_data_dir] = jiffies;
-                goto dispatch_request;
-        }
-
-        /*
-         * the last batch was a read
-         */
-
-        if (writes) {
-dispatch_writes:
-                BUG_ON(RB_EMPTY(&ad->sort_list[REQ_ASYNC]));
-
-                if (ad->batch_data_dir == REQ_SYNC) {
-                        ad->changed_batch = 1;
-
-                        /*
-                         * new_batch might be 1 when the queue runs out of
-                         * reads. A subsequent submission of a write might
-                         * cause a change of batch before the read is finished.
-                         */
-                        ad->new_batch = 0;
-                }
-                ad->batch_data_dir = REQ_ASYNC;
-                ad->current_write_count = ad->write_batch_count;
-                ad->write_batch_idled = 0;
-                arq = ad->next_arq[ad->batch_data_dir];
-                goto dispatch_request;
-        }
-
-        BUG();
-        return 0;
-
-dispatch_request:
-        /*
-         * If a request has expired, service it.
-         */
-
-        if (as_fifo_expired(ad, ad->batch_data_dir)) {
-fifo_expired:
-                arq = list_entry_fifo(ad->fifo_list[ad->batch_data_dir].next);
-                BUG_ON(arq == NULL);
-        }
-
-        if (ad->changed_batch) {
-                WARN_ON(ad->new_batch);
-
-                if (ad->nr_dispatched)
-                        return 0;
-
-                if (ad->batch_data_dir == REQ_ASYNC)
-                        ad->current_batch_expires = jiffies +
-                                        ad->batch_expire[REQ_ASYNC];
-                else
-                        ad->new_batch = 1;
-
-                ad->changed_batch = 0;
-        }
-
-        /*
-         * arq is the selected appropriate request.
-         */
-        as_move_to_dispatch(ad, arq);
-
-        return 1;
-}
-
-/*
- * Add arq to a list behind alias
- */
-static inline void
-as_add_aliased_request(struct as_data *ad, struct as_rq *arq, struct as_rq *alias)
-{
-        struct request  *req = arq->request;
-        struct list_head *insert = alias->request->queuelist.prev;
-
-        /*
-         * Transfer list of aliases
-         */
-        while (!list_empty(&req->queuelist)) {
-                struct request *__rq = list_entry_rq(req->queuelist.next);
-                struct as_rq *__arq = RQ_DATA(__rq);
-
-                list_move_tail(&__rq->queuelist, &alias->request->queuelist);
-
-                WARN_ON(__arq->state != AS_RQ_QUEUED);
-        }
-
-        /*
-         * Another request with the same start sector on the rbtree.
-         * Link this request to that sector. They are untangled in
-         * as_move_to_dispatch
-         */
-        list_add(&arq->request->queuelist, insert);
-
-        /*
-         * Don't want to have to handle merges.
-         */
-        as_del_arq_hash(arq);
-        arq->request->flags |= REQ_NOMERGE;
-}
-
-/*
- * add arq to rbtree and fifo
- */
-static void as_add_request(request_queue_t *q, struct request *rq)
-{
-        struct as_data *ad = q->elevator->elevator_data;
-        struct as_rq *arq = RQ_DATA(rq);
-        struct as_rq *alias;
-        int data_dir;
-
-        if (arq->state != AS_RQ_PRESCHED) {
-                printk("arq->state: %d\n", arq->state);
-                WARN_ON(1);
-        }
-        arq->state = AS_RQ_NEW;
-
-        if (rq_data_dir(arq->request) == READ
-                        || current->flags&PF_SYNCWRITE)
-                arq->is_sync = 1;
-        else
-                arq->is_sync = 0;
-        data_dir = arq->is_sync;
-
-        arq->io_context = as_get_io_context();
-
-        if (arq->io_context) {
-                as_update_iohist(ad, arq->io_context->aic, arq->request);
-                atomic_inc(&arq->io_context->aic->nr_queued);
-        }
-
-        alias = as_add_arq_rb(ad, arq);
-        if (!alias) {
-                /*
-                 * set expire time (only used for reads) and add to fifo list
-                 */
-                arq->expires = jiffies + ad->fifo_expire[data_dir];
-                list_add_tail(&arq->fifo, &ad->fifo_list[data_dir]);
-
-                if (rq_mergeable(arq->request))
-                        as_add_arq_hash(ad, arq);
-                as_update_arq(ad, arq); /* keep state machine up to date */
-
-        } else {
-                as_add_aliased_request(ad, arq, alias);
-
-                /*
-                 * have we been anticipating this request?
-                 * or does it come from the same process as the one we are
-                 * anticipating for?
-                 */
-                if (ad->antic_status == ANTIC_WAIT_REQ
-                                || ad->antic_status == ANTIC_WAIT_NEXT) {
-                        if (as_can_break_anticipation(ad, arq))
-                                as_antic_stop(ad);
-                }
-        }
-
-        arq->state = AS_RQ_QUEUED;
-}
-
-static void as_activate_request(request_queue_t *q, struct request *rq)
-{
-        struct as_rq *arq = RQ_DATA(rq);
-
-        WARN_ON(arq->state != AS_RQ_DISPATCHED);
-        arq->state = AS_RQ_REMOVED;
-        if (arq->io_context && arq->io_context->aic)
-                atomic_dec(&arq->io_context->aic->nr_dispatched);
-}
-
-static void as_deactivate_request(request_queue_t *q, struct request *rq)
-{
-        struct as_rq *arq = RQ_DATA(rq);
-
-        WARN_ON(arq->state != AS_RQ_REMOVED);
-        arq->state = AS_RQ_DISPATCHED;
-        if (arq->io_context && arq->io_context->aic)
-                atomic_inc(&arq->io_context->aic->nr_dispatched);
-}
-
-/*
- * as_queue_empty tells us if there are requests left in the device. It may
- * not be the case that a driver can get the next request even if the queue
- * is not empty - it is used in the block layer to check for plugging and
- * merging opportunities
- */
-static int as_queue_empty(request_queue_t *q)
-{
-        struct as_data *ad = q->elevator->elevator_data;
-
-        return list_empty(&ad->fifo_list[REQ_ASYNC])
-                && list_empty(&ad->fifo_list[REQ_SYNC]);
-}
-
-static struct request *
-as_former_request(request_queue_t *q, struct request *rq)
-{
-        struct as_rq *arq = RQ_DATA(rq);
-        struct rb_node *rbprev = rb_prev(&arq->rb_node);
-        struct request *ret = NULL;
-
-        if (rbprev)
-                ret = rb_entry_arq(rbprev)->request;
-
-        return ret;
-}
-
-static struct request *
-as_latter_request(request_queue_t *q, struct request *rq)
-{
-        struct as_rq *arq = RQ_DATA(rq);
-        struct rb_node *rbnext = rb_next(&arq->rb_node);
-        struct request *ret = NULL;
-
-        if (rbnext)
-                ret = rb_entry_arq(rbnext)->request;
-
-        return ret;
-}
-
-static int
-as_merge(request_queue_t *q, struct request **req, struct bio *bio)
-{
-        struct as_data *ad = q->elevator->elevator_data;
-        sector_t rb_key = bio->bi_sector + bio_sectors(bio);
-        struct request *__rq;
-        int ret;
-
-        /*
-         * see if the merge hash can satisfy a back merge
-         */
-        __rq = as_find_arq_hash(ad, bio->bi_sector);
-        if (__rq) {
-                BUG_ON(__rq->sector + __rq->nr_sectors != bio->bi_sector);
-
-                if (elv_rq_merge_ok(__rq, bio)) {
-                        ret = ELEVATOR_BACK_MERGE;
-                        goto out;
-                }
-        }
-
-        /*
-         * check for front merge
-         */
-        __rq = as_find_arq_rb(ad, rb_key, bio_data_dir(bio));
-        if (__rq) {
-                BUG_ON(rb_key != rq_rb_key(__rq));
-
-                if (elv_rq_merge_ok(__rq, bio)) {
-                        ret = ELEVATOR_FRONT_MERGE;
-                        goto out;
-                }
-        }
-
-        return ELEVATOR_NO_MERGE;
-out:
-        if (ret) {
-                if (rq_mergeable(__rq))
-                        as_hot_arq_hash(ad, RQ_DATA(__rq));
-        }
-        *req = __rq;
-        return ret;
-}
-
-static void as_merged_request(request_queue_t *q, struct request *req)
-{
-        struct as_data *ad = q->elevator->elevator_data;
-        struct as_rq *arq = RQ_DATA(req);
-
-        /*
-         * hash always needs to be repositioned, key is end sector
-         */
-        as_del_arq_hash(arq);
-        as_add_arq_hash(ad, arq);
-
-        /*
-         * if the merge was a front merge, we need to reposition request
-         */
-        if (rq_rb_key(req) != arq->rb_key) {
-                struct as_rq *alias, *next_arq = NULL;
-
-                if (ad->next_arq[arq->is_sync] == arq)
-                        next_arq = as_find_next_arq(ad, arq);
-
-                /*
-                 * Note! We should really be moving any old aliased requests
-                 * off this request and try to insert them into the rbtree. We
-                 * currently don't bother. Ditto the next function.
-                 */
-                as_del_arq_rb(ad, arq);
-                if ((alias = as_add_arq_rb(ad, arq)) ) {
-                        list_del_init(&arq->fifo);
-                        as_add_aliased_request(ad, arq, alias);
-                        if (next_arq)
-                                ad->next_arq[arq->is_sync] = next_arq;
-                }
-                /*
-                 * Note! At this stage of this and the next function, our next
-                 * request may not be optimal - eg the request may have "grown"
-                 * behind the disk head. We currently don't bother adjusting.
-                 */
-        }
-}
-
-static void
-as_merged_requests(request_queue_t *q, struct request *req,
-                         struct request *next)
-{
-        struct as_data *ad = q->elevator->elevator_data;
-        struct as_rq *arq = RQ_DATA(req);
-        struct as_rq *anext = RQ_DATA(next);
-
-        BUG_ON(!arq);
-        BUG_ON(!anext);
-
-        /*
-         * reposition arq (this is the merged request) in hash, and in rbtree
-         * in case of a front merge
-         */
-        as_del_arq_hash(arq);
-        as_add_arq_hash(ad, arq);
-
-        if (rq_rb_key(req) != arq->rb_key) {
-                struct as_rq *alias, *next_arq = NULL;
-
-                if (ad->next_arq[arq->is_sync] == arq)
-                        next_arq = as_find_next_arq(ad, arq);
-
-                as_del_arq_rb(ad, arq);
-                if ((alias = as_add_arq_rb(ad, arq)) ) {
-                        list_del_init(&arq->fifo);
-                        as_add_aliased_request(ad, arq, alias);
-                        if (next_arq)
-                                ad->next_arq[arq->is_sync] = next_arq;
-                }
-        }
-
-        /*
-         * if anext expires before arq, assign its expire time to arq
-         * and move into anext position (anext will be deleted) in fifo
-         */
-        if (!list_empty(&arq->fifo) && !list_empty(&anext->fifo)) {
-                if (time_before(anext->expires, arq->expires)) {
-                        list_move(&arq->fifo, &anext->fifo);
-                        arq->expires = anext->expires;
-                        /*
-                         * Don't copy here but swap, because when anext is
-                         * removed below, it must contain the unused context
-                         */
-                        swap_io_context(&arq->io_context, &anext->io_context);
-                }
-        }
-
-        /*
-         * Transfer list of aliases
-         */
-        while (!list_empty(&next->queuelist)) {
-                struct request *__rq = list_entry_rq(next->queuelist.next);
-                struct as_rq *__arq = RQ_DATA(__rq);
-
-                list_move_tail(&__rq->queuelist, &req->queuelist);
-
-                WARN_ON(__arq->state != AS_RQ_QUEUED);
-        }
-
-        /*
-         * kill knowledge of next, this one is a goner
-         */
-        as_remove_queued_request(q, next);
-        as_put_io_context(anext);
-
-        anext->state = AS_RQ_MERGED;
-}
-
-/*
- * This is executed in a "deferred" process context, by kblockd. It calls the
- * driver's request_fn so the driver can submit that request.
- *
- * IMPORTANT! This guy will reenter the elevator, so set up all queue global
- * state before calling, and don't rely on any state over calls.
- *
- * FIXME! dispatch queue is not a queue at all!
- */
-static void as_work_handler(void *data)
-{
-        struct request_queue *q = data;
-        unsigned long flags;
-
-        spin_lock_irqsave(q->queue_lock, flags);
-        if (!as_queue_empty(q))
-                q->request_fn(q);
-        spin_unlock_irqrestore(q->queue_lock, flags);
-}
-
-static void as_put_request(request_queue_t *q, struct request *rq)
-{
-        struct as_data *ad = q->elevator->elevator_data;
-        struct as_rq *arq = RQ_DATA(rq);
-
-        if (!arq) {
-                WARN_ON(1);
-                return;
-        }
-
-        if (unlikely(arq->state != AS_RQ_POSTSCHED &&
-                     arq->state != AS_RQ_PRESCHED &&
-                     arq->state != AS_RQ_MERGED)) {
-                printk("arq->state %d\n", arq->state);
-                WARN_ON(1);
-        }
-
-        mempool_free(arq, ad->arq_pool);
-        rq->elevator_private = NULL;
-}
-
-static int as_set_request(request_queue_t *q, struct request *rq,
-                          struct bio *bio, gfp_t gfp_mask)
-{
-        struct as_data *ad = q->elevator->elevator_data;
-        struct as_rq *arq = mempool_alloc(ad->arq_pool, gfp_mask);
-
-        if (arq) {
-                memset(arq, 0, sizeof(*arq));
-                RB_CLEAR(&arq->rb_node);
-                arq->request = rq;
-                arq->state = AS_RQ_PRESCHED;
-                arq->io_context = NULL;
-                INIT_LIST_HEAD(&arq->hash);
-                arq->on_hash = 0;
-                INIT_LIST_HEAD(&arq->fifo);
-                rq->elevator_private = arq;
-                return 0;
-        }
-
-        return 1;
-}
-
-static int as_may_queue(request_queue_t *q, int rw, struct bio *bio)
-{
-        int ret = ELV_MQUEUE_MAY;
-        struct as_data *ad = q->elevator->elevator_data;
-        struct io_context *ioc;
-        if (ad->antic_status == ANTIC_WAIT_REQ ||
-                        ad->antic_status == ANTIC_WAIT_NEXT) {
-                ioc = as_get_io_context();
-                if (ad->io_context == ioc)
-                        ret = ELV_MQUEUE_MUST;
-                put_io_context(ioc);
-        }
-
-        return ret;
-}
-
-static void as_exit_queue(elevator_t *e)
-{
-        struct as_data *ad = e->elevator_data;
-
-        del_timer_sync(&ad->antic_timer);
-        kblockd_flush();
-
-        BUG_ON(!list_empty(&ad->fifo_list[REQ_SYNC]));
-        BUG_ON(!list_empty(&ad->fifo_list[REQ_ASYNC]));
-
-        mempool_destroy(ad->arq_pool);
-        put_io_context(ad->io_context);
-        kfree(ad->hash);
-        kfree(ad);
-}
-
-/*
- * initialize elevator private data (as_data), and alloc a arq for
- * each request on the free lists
- */
-static int as_init_queue(request_queue_t *q, elevator_t *e)
-{
-        struct as_data *ad;
-        int i;
-
-        if (!arq_pool)
-                return -ENOMEM;
-
-        ad = kmalloc_node(sizeof(*ad), GFP_KERNEL, q->node);
-        if (!ad)
-                return -ENOMEM;
-        memset(ad, 0, sizeof(*ad));
-
-        ad->q = q; /* Identify what queue the data belongs to */
-
-        ad->hash = kmalloc_node(sizeof(struct list_head)*AS_HASH_ENTRIES,
-                                GFP_KERNEL, q->node);
-        if (!ad->hash) {
-                kfree(ad);
-                return -ENOMEM;
-        }
-
-        ad->arq_pool = mempool_create_node(BLKDEV_MIN_RQ, mempool_alloc_slab,
-                                mempool_free_slab, arq_pool, q->node);
-        if (!ad->arq_pool) {
-                kfree(ad->hash);
-                kfree(ad);
-                return -ENOMEM;
-        }
-
-        /* anticipatory scheduling helpers */
-        ad->antic_timer.function = as_antic_timeout;
-        ad->antic_timer.data = (unsigned long)q;
-        init_timer(&ad->antic_timer);
-        INIT_WORK(&ad->antic_work, as_work_handler, q);
-
-        for (i = 0; i < AS_HASH_ENTRIES; i++)
-                INIT_LIST_HEAD(&ad->hash[i]);
-
-        INIT_LIST_HEAD(&ad->fifo_list[REQ_SYNC]);
-        INIT_LIST_HEAD(&ad->fifo_list[REQ_ASYNC]);
-        ad->sort_list[REQ_SYNC] = RB_ROOT;
-        ad->sort_list[REQ_ASYNC] = RB_ROOT;
-        ad->fifo_expire[REQ_SYNC] = default_read_expire;
-        ad->fifo_expire[REQ_ASYNC] = default_write_expire;
-        ad->antic_expire = default_antic_expire;
-        ad->batch_expire[REQ_SYNC] = default_read_batch_expire;
-        ad->batch_expire[REQ_ASYNC] = default_write_batch_expire;
-        e->elevator_data = ad;
-
-        ad->current_batch_expires = jiffies + ad->batch_expire[REQ_SYNC];
-        ad->write_batch_count = ad->batch_expire[REQ_ASYNC] / 10;
-        if (ad->write_batch_count < 2)
-                ad->write_batch_count = 2;
-
-        return 0;
-}
-
-/*
- * sysfs parts below
- */
-struct as_fs_entry {
-        struct attribute attr;
-        ssize_t (*show)(struct as_data *, char *);
-        ssize_t (*store)(struct as_data *, const char *, size_t);
-};
-
-static ssize_t
-as_var_show(unsigned int var, char *page)
-{
-        return sprintf(page, "%d\n", var);
-}
-
-static ssize_t
-as_var_store(unsigned long *var, const char *page, size_t count)
-{
-        char *p = (char *) page;
-
-        *var = simple_strtoul(p, &p, 10);
-        return count;
-}
-
-static ssize_t as_est_show(struct as_data *ad, char *page)
-{
-        int pos = 0;
-
-        pos += sprintf(page+pos, "%lu %% exit probability\n", 100*ad->exit_prob/256);
-        pos += sprintf(page+pos, "%lu ms new thinktime\n", ad->new_ttime_mean);
-        pos += sprintf(page+pos, "%llu sectors new seek distance\n", (unsigned long long)ad->new_seek_mean);
-
-        return pos;
-}
-
-#define SHOW_FUNCTION(__FUNC, __VAR)                            \
-static ssize_t __FUNC(struct as_data *ad, char *page)           \
-{                                                               \
-        return as_var_show(jiffies_to_msecs((__VAR)), (page));  \
-}
-SHOW_FUNCTION(as_readexpire_show, ad->fifo_expire[REQ_SYNC]);
-SHOW_FUNCTION(as_writeexpire_show, ad->fifo_expire[REQ_ASYNC]);
-SHOW_FUNCTION(as_anticexpire_show, ad->antic_expire);
-SHOW_FUNCTION(as_read_batchexpire_show, ad->batch_expire[REQ_SYNC]);
-SHOW_FUNCTION(as_write_batchexpire_show, ad->batch_expire[REQ_ASYNC]);
-#undef SHOW_FUNCTION
-
-#define STORE_FUNCTION(__FUNC, __PTR, MIN, MAX)                         \
-static ssize_t __FUNC(struct as_data *ad, const char *page, size_t count)       \
-{                                                                       \
-        int ret = as_var_store(__PTR, (page), count);           \
-        if (*(__PTR) < (MIN))                                           \
-                *(__PTR) = (MIN);                                       \
-        else if (*(__PTR) > (MAX))                                      \
-                *(__PTR) = (MAX);                                       \
-        *(__PTR) = msecs_to_jiffies(*(__PTR));                          \
-        return ret;                                                     \
-}
-STORE_FUNCTION(as_readexpire_store, &ad->fifo_expire[REQ_SYNC], 0, INT_MAX);
-STORE_FUNCTION(as_writeexpire_store, &ad->fifo_expire[REQ_ASYNC], 0, INT_MAX);
-STORE_FUNCTION(as_anticexpire_store, &ad->antic_expire, 0, INT_MAX);
-STORE_FUNCTION(as_read_batchexpire_store,
-                        &ad->batch_expire[REQ_SYNC], 0, INT_MAX);
-STORE_FUNCTION(as_write_batchexpire_store,
-                        &ad->batch_expire[REQ_ASYNC], 0, INT_MAX);
-#undef STORE_FUNCTION
-
-static struct as_fs_entry as_est_entry = {
-        .attr = {.name = "est_time", .mode = S_IRUGO },
-        .show = as_est_show,
-};
-static struct as_fs_entry as_readexpire_entry = {
-        .attr = {.name = "read_expire", .mode = S_IRUGO | S_IWUSR },
-        .show = as_readexpire_show,
-        .store = as_readexpire_store,
-};
-static struct as_fs_entry as_writeexpire_entry = {
-        .attr = {.name = "write_expire", .mode = S_IRUGO | S_IWUSR },
-        .show = as_writeexpire_show,
-        .store = as_writeexpire_store,
-};
-static struct as_fs_entry as_anticexpire_entry = {
-        .attr = {.name = "antic_expire", .mode = S_IRUGO | S_IWUSR },
-        .show = as_anticexpire_show,
-        .store = as_anticexpire_store,
-};
-static struct as_fs_entry as_read_batchexpire_entry = {
-        .attr = {.name = "read_batch_expire", .mode = S_IRUGO | S_IWUSR },
-        .show = as_read_batchexpire_show,
-        .store = as_read_batchexpire_store,
-};
-static struct as_fs_entry as_write_batchexpire_entry = {
-        .attr = {.name = "write_batch_expire", .mode = S_IRUGO | S_IWUSR },
-        .show = as_write_batchexpire_show,
-        .store = as_write_batchexpire_store,
-};
-
-static struct attribute *default_attrs[] = {
-        &as_est_entry.attr,
-        &as_readexpire_entry.attr,
-        &as_writeexpire_entry.attr,
-        &as_anticexpire_entry.attr,
-        &as_read_batchexpire_entry.attr,
-        &as_write_batchexpire_entry.attr,
-        NULL,
-};
-
-#define to_as(atr) container_of((atr), struct as_fs_entry, attr)
-
-static ssize_t
-as_attr_show(struct kobject *kobj, struct attribute *attr, char *page)
-{
-        elevator_t *e = container_of(kobj, elevator_t, kobj);
-        struct as_fs_entry *entry = to_as(attr);
-
-        if (!entry->show)
-                return -EIO;
-
-        return entry->show(e->elevator_data, page);
-}
-
-static ssize_t
-as_attr_store(struct kobject *kobj, struct attribute *attr,
-                    const char *page, size_t length)
-{
-        elevator_t *e = container_of(kobj, elevator_t, kobj);
-        struct as_fs_entry *entry = to_as(attr);
-
-        if (!entry->store)
-                return -EIO;
-
-        return entry->store(e->elevator_data, page, length);
-}
-
-static struct sysfs_ops as_sysfs_ops = {
-        .show   = as_attr_show,
-        .store  = as_attr_store,
-};
-
-static struct kobj_type as_ktype = {
-        .sysfs_ops      = &as_sysfs_ops,
-        .default_attrs  = default_attrs,
-};
-
-static struct elevator_type iosched_as = {
-        .ops = {
-                .elevator_merge_fn =            as_merge,
-                .elevator_merged_fn =           as_merged_request,
-                .elevator_merge_req_fn =        as_merged_requests,
-                .elevator_dispatch_fn =         as_dispatch_request,
-                .elevator_add_req_fn =          as_add_request,
-                .elevator_activate_req_fn =     as_activate_request,
-                .elevator_deactivate_req_fn =   as_deactivate_request,
-                .elevator_queue_empty_fn =      as_queue_empty,
-                .elevator_completed_req_fn =    as_completed_request,
-                .elevator_former_req_fn =       as_former_request,
-                .elevator_latter_req_fn =       as_latter_request,
-                .elevator_set_req_fn =          as_set_request,
-                .elevator_put_req_fn =          as_put_request,
-                .elevator_may_queue_fn =        as_may_queue,
-                .elevator_init_fn =             as_init_queue,
-                .elevator_exit_fn =             as_exit_queue,
-        },
-
-        .elevator_ktype = &as_ktype,
-        .elevator_name = "anticipatory",
-        .elevator_owner = THIS_MODULE,
-};
-
-static int __init as_init(void)
-{
-        int ret;
-
-        arq_pool = kmem_cache_create("as_arq", sizeof(struct as_rq),
-                                     0, 0, NULL, NULL);
-        if (!arq_pool)
-                return -ENOMEM;
-
-        ret = elv_register(&iosched_as);
-        if (!ret) {
-                /*
-                 * don't allow AS to get unregistered, since we would have
-                 * to browse all tasks in the system and release their
-                 * as_io_context first
-                 */
-                __module_get(THIS_MODULE);
-                return 0;
-        }
-
-        kmem_cache_destroy(arq_pool);
-        return ret;
-}
-
-static void __exit as_exit(void)
-{
-        elv_unregister(&iosched_as);
-        kmem_cache_destroy(arq_pool);
-}
-
-module_init(as_init);
-module_exit(as_exit);
-
-MODULE_AUTHOR("Nick Piggin");
-MODULE_LICENSE("GPL");
-MODULE_DESCRIPTION("anticipatory IO scheduler");
diff --git a/drivers/block/cciss.c b/drivers/block/cciss.c
index 482786068ff9..e239a6c29230 100644
--- a/drivers/block/cciss.c
+++ b/drivers/block/cciss.c
@@ -1097,14 +1097,11 @@ static int cciss_ioctl(struct inode *inode, struct file *filep,
 cleanup1:
                 if (buff) {
                         for(i=0; i<sg_used; i++)
-                                if(buff[i] != NULL)
-                                        kfree(buff[i]);
+                                kfree(buff[i]);
                         kfree(buff);
                 }
-                if (buff_size)
-                        kfree(buff_size);
-                if (ioc)
-                        kfree(ioc);
+                kfree(buff_size);
+                kfree(ioc);
                 return(status);
         }
         default:
@@ -3167,8 +3164,7 @@ clean4:
         if(hba[i]->scsi_rejects.complete)
                 kfree(hba[i]->scsi_rejects.complete);
 #endif
-        if(hba[i]->cmd_pool_bits)
-                kfree(hba[i]->cmd_pool_bits);
+        kfree(hba[i]->cmd_pool_bits);
         if(hba[i]->cmd_pool)
                 pci_free_consistent(hba[i]->pdev,
                         NR_CMDS * sizeof(CommandList_struct),
diff --git a/drivers/block/cfq-iosched.c b/drivers/block/cfq-iosched.c
deleted file mode 100644
index ecacca9c877e..000000000000
--- a/drivers/block/cfq-iosched.c
+++ /dev/null
@@ -1,2428 +0,0 @@
-/*
- *  linux/drivers/block/cfq-iosched.c
- *
- *  CFQ, or complete fairness queueing, disk scheduler.
- *
- *  Based on ideas from a previously unfinished io
- *  scheduler (round robin per-process disk scheduling) and Andrea Arcangeli.
- *
- *  Copyright (C) 2003 Jens Axboe <axboe@suse.de>
- */
-#include <linux/kernel.h>
-#include <linux/fs.h>
-#include <linux/blkdev.h>
-#include <linux/elevator.h>
-#include <linux/bio.h>
-#include <linux/config.h>
-#include <linux/module.h>
-#include <linux/slab.h>
-#include <linux/init.h>
-#include <linux/compiler.h>
-#include <linux/hash.h>
-#include <linux/rbtree.h>
-#include <linux/mempool.h>
-#include <linux/ioprio.h>
-#include <linux/writeback.h>
-
-/*
- * tunables
- */
-static int cfq_quantum = 4;             /* max queue in one round of service */
-static int cfq_queued = 8;              /* minimum rq allocate limit per-queue*/
-static int cfq_fifo_expire[2] = { HZ / 4, HZ / 8 };
-static int cfq_back_max = 16 * 1024;    /* maximum backwards seek, in KiB */
-static int cfq_back_penalty = 2;        /* penalty of a backwards seek */
-
-static int cfq_slice_sync = HZ / 10;
-static int cfq_slice_async = HZ / 25;
-static int cfq_slice_async_rq = 2;
-static int cfq_slice_idle = HZ / 100;
-
-#define CFQ_IDLE_GRACE          (HZ / 10)
-#define CFQ_SLICE_SCALE         (5)
-
-#define CFQ_KEY_ASYNC           (0)
-#define CFQ_KEY_ANY             (0xffff)
-
-/*
- * disable queueing at the driver/hardware level
- */
-static int cfq_max_depth = 2;
-
-/*
- * for the hash of cfqq inside the cfqd
- */
-#define CFQ_QHASH_SHIFT         6
-#define CFQ_QHASH_ENTRIES       (1 << CFQ_QHASH_SHIFT)
-#define list_entry_qhash(entry) hlist_entry((entry), struct cfq_queue, cfq_hash)
-
-/*
- * for the hash of crq inside the cfqq
- */
-#define CFQ_MHASH_SHIFT         6
-#define CFQ_MHASH_BLOCK(sec)    ((sec) >> 3)
-#define CFQ_MHASH_ENTRIES       (1 << CFQ_MHASH_SHIFT)
-#define CFQ_MHASH_FN(sec)       hash_long(CFQ_MHASH_BLOCK(sec), CFQ_MHASH_SHIFT)
-#define rq_hash_key(rq)         ((rq)->sector + (rq)->nr_sectors)
-#define list_entry_hash(ptr)    hlist_entry((ptr), struct cfq_rq, hash)
-
-#define list_entry_cfqq(ptr)    list_entry((ptr), struct cfq_queue, cfq_list)
-#define list_entry_fifo(ptr)    list_entry((ptr), struct request, queuelist)
-
-#define RQ_DATA(rq)             (rq)->elevator_private
-
-/*
- * rb-tree defines
- */
-#define RB_NONE                 (2)
-#define RB_EMPTY(node)          ((node)->rb_node == NULL)
-#define RB_CLEAR_COLOR(node)    (node)->rb_color = RB_NONE
-#define RB_CLEAR(node)          do {    \
-        (node)->rb_parent = NULL;       \
-        RB_CLEAR_COLOR((node));         \
-        (node)->rb_right = NULL;        \
-        (node)->rb_left = NULL;         \
-} while (0)
-#define RB_CLEAR_ROOT(root)     ((root)->rb_node = NULL)
-#define rb_entry_crq(node)      rb_entry((node), struct cfq_rq, rb_node)
-#define rq_rb_key(rq)           (rq)->sector
-
-static kmem_cache_t *crq_pool;
-static kmem_cache_t *cfq_pool;
-static kmem_cache_t *cfq_ioc_pool;
-
-#define CFQ_PRIO_LISTS          IOPRIO_BE_NR
-#define cfq_class_idle(cfqq)    ((cfqq)->ioprio_class == IOPRIO_CLASS_IDLE)
-#define cfq_class_be(cfqq)      ((cfqq)->ioprio_class == IOPRIO_CLASS_BE)
-#define cfq_class_rt(cfqq)      ((cfqq)->ioprio_class == IOPRIO_CLASS_RT)
-
-#define ASYNC                   (0)
-#define SYNC                    (1)
-
-#define cfq_cfqq_dispatched(cfqq)       \
-        ((cfqq)->on_dispatch[ASYNC] + (cfqq)->on_dispatch[SYNC])
-
-#define cfq_cfqq_class_sync(cfqq)       ((cfqq)->key != CFQ_KEY_ASYNC)
-
-#define cfq_cfqq_sync(cfqq)             \
-        (cfq_cfqq_class_sync(cfqq) || (cfqq)->on_dispatch[SYNC])
-
-/*
- * Per block device queue structure
- */
-struct cfq_data {
-        atomic_t ref;
-        request_queue_t *queue;
-
-        /*
-         * rr list of queues with requests and the count of them
-         */
-        struct list_head rr_list[CFQ_PRIO_LISTS];
-        struct list_head busy_rr;
-        struct list_head cur_rr;
-        struct list_head idle_rr;
-        unsigned int busy_queues;
-
-        /*
-         * non-ordered list of empty cfqq's
-         */
-        struct list_head empty_list;
-
-        /*
-         * cfqq lookup hash
-         */
-        struct hlist_head *cfq_hash;
-
-        /*
-         * global crq hash for all queues
-         */
-        struct hlist_head *crq_hash;
-
-        unsigned int max_queued;
-
-        mempool_t *crq_pool;
-
-        int rq_in_driver;
-
-        /*
-         * schedule slice state info
-         */
-        /*
-         * idle window management
-         */
-        struct timer_list idle_slice_timer;
-        struct work_struct unplug_work;
-
-        struct cfq_queue *active_queue;
-        struct cfq_io_context *active_cic;
-        int cur_prio, cur_end_prio;
-        unsigned int dispatch_slice;
-
-        struct timer_list idle_class_timer;
-
-        sector_t last_sector;
-        unsigned long last_end_request;
-
-        unsigned int rq_starved;
-
-        /*
-         * tunables, see top of file
-         */
-        unsigned int cfq_quantum;
-        unsigned int cfq_queued;
-        unsigned int cfq_fifo_expire[2];
-        unsigned int cfq_back_penalty;
-        unsigned int cfq_back_max;
-        unsigned int cfq_slice[2];
-        unsigned int cfq_slice_async_rq;
-        unsigned int cfq_slice_idle;
-        unsigned int cfq_max_depth;
-};
-
-/*
- * Per process-grouping structure
- */
-struct cfq_queue {
-        /* reference count */
-        atomic_t ref;
-        /* parent cfq_data */
-        struct cfq_data *cfqd;
-        /* cfqq lookup hash */
-        struct hlist_node cfq_hash;
-        /* hash key */
-        unsigned int key;
-        /* on either rr or empty list of cfqd */
-        struct list_head cfq_list;
-        /* sorted list of pending requests */
-        struct rb_root sort_list;
-        /* if fifo isn't expired, next request to serve */
-        struct cfq_rq *next_crq;
-        /* requests queued in sort_list */
-        int queued[2];
-        /* currently allocated requests */
-        int allocated[2];
-        /* fifo list of requests in sort_list */
-        struct list_head fifo;
-
-        unsigned long slice_start;
-        unsigned long slice_end;
-        unsigned long slice_left;
-        unsigned long service_last;
-
-        /* number of requests that are on the dispatch list */
-        int on_dispatch[2];
-
-        /* io prio of this group */
-        unsigned short ioprio, org_ioprio;
-        unsigned short ioprio_class, org_ioprio_class;
-
-        /* various state flags, see below */
-        unsigned int flags;
-};
-
-struct cfq_rq {
-        struct rb_node rb_node;
-        sector_t rb_key;
-        struct request *request;
-        struct hlist_node hash;
-
-        struct cfq_queue *cfq_queue;
-        struct cfq_io_context *io_context;
-
-        unsigned int crq_flags;
-};
-
-enum cfqq_state_flags {
-        CFQ_CFQQ_FLAG_on_rr = 0,
-        CFQ_CFQQ_FLAG_wait_request,
-        CFQ_CFQQ_FLAG_must_alloc,
-        CFQ_CFQQ_FLAG_must_alloc_slice,
-        CFQ_CFQQ_FLAG_must_dispatch,
-        CFQ_CFQQ_FLAG_fifo_expire,
-        CFQ_CFQQ_FLAG_idle_window,
-        CFQ_CFQQ_FLAG_prio_changed,
-        CFQ_CFQQ_FLAG_expired,
-};
-
-#define CFQ_CFQQ_FNS(name)                                              \
-static inline void cfq_mark_cfqq_##name(struct cfq_queue *cfqq)         \
-{                                                                       \
-        cfqq->flags |= (1 << CFQ_CFQQ_FLAG_##name);                     \
-}                                                                       \
-static inline void cfq_clear_cfqq_##name(struct cfq_queue *cfqq)        \
-{                                                                       \
-        cfqq->flags &= ~(1 << CFQ_CFQQ_FLAG_##name);                    \
-}                                                                       \
-static inline int cfq_cfqq_##name(const struct cfq_queue *cfqq)         \
-{                                                                       \
-        return (cfqq->flags & (1 << CFQ_CFQQ_FLAG_##name)) != 0;        \
-}
-
-CFQ_CFQQ_FNS(on_rr);
-CFQ_CFQQ_FNS(wait_request);
-CFQ_CFQQ_FNS(must_alloc);
-CFQ_CFQQ_FNS(must_alloc_slice);
-CFQ_CFQQ_FNS(must_dispatch);
-CFQ_CFQQ_FNS(fifo_expire);
-CFQ_CFQQ_FNS(idle_window);
-CFQ_CFQQ_FNS(prio_changed);
-CFQ_CFQQ_FNS(expired);
-#undef CFQ_CFQQ_FNS
-
-enum cfq_rq_state_flags {
-        CFQ_CRQ_FLAG_is_sync = 0,
-};
-
-#define CFQ_CRQ_FNS(name)                                               \
-static inline void cfq_mark_crq_##name(struct cfq_rq *crq)              \
-{                                                                       \
-        crq->crq_flags |= (1 << CFQ_CRQ_FLAG_##name);                   \
-}                                                                       \
-static inline void cfq_clear_crq_##name(struct cfq_rq *crq)             \
-{                                                                       \
-        crq->crq_flags &= ~(1 << CFQ_CRQ_FLAG_##name);                  \
-}                                                                       \
-static inline int cfq_crq_##name(const struct cfq_rq *crq)              \
-{                                                                       \
-        return (crq->crq_flags & (1 << CFQ_CRQ_FLAG_##name)) != 0;      \
-}
-
-CFQ_CRQ_FNS(is_sync);
-#undef CFQ_CRQ_FNS
-
-static struct cfq_queue *cfq_find_cfq_hash(struct cfq_data *, unsigned int, unsigned short);
-static void cfq_dispatch_insert(request_queue_t *, struct cfq_rq *);
-static void cfq_put_cfqd(struct cfq_data *cfqd);
-
-#define process_sync(tsk)       ((tsk)->flags & PF_SYNCWRITE)
-
-/*
- * lots of deadline iosched dupes, can be abstracted later...
- */
-static inline void cfq_del_crq_hash(struct cfq_rq *crq)
-{
-        hlist_del_init(&crq->hash);
-}
-
-static inline void cfq_add_crq_hash(struct cfq_data *cfqd, struct cfq_rq *crq)
-{
-        const int hash_idx = CFQ_MHASH_FN(rq_hash_key(crq->request));
-
-        hlist_add_head(&crq->hash, &cfqd->crq_hash[hash_idx]);
-}
-
-static struct request *cfq_find_rq_hash(struct cfq_data *cfqd, sector_t offset)
-{
-        struct hlist_head *hash_list = &cfqd->crq_hash[CFQ_MHASH_FN(offset)];
-        struct hlist_node *entry, *next;
-
-        hlist_for_each_safe(entry, next, hash_list) {
-                struct cfq_rq *crq = list_entry_hash(entry);
-                struct request *__rq = crq->request;
-
-                if (!rq_mergeable(__rq)) {
-                        cfq_del_crq_hash(crq);
-                        continue;
-                }
-
-                if (rq_hash_key(__rq) == offset)
-                        return __rq;
-        }
-
-        return NULL;
-}
-
-/*
- * scheduler run of queue, if there are requests pending and no one in the
- * driver that will restart queueing
- */
-static inline void cfq_schedule_dispatch(struct cfq_data *cfqd)
-{
-        if (!cfqd->rq_in_driver && cfqd->busy_queues)
-                kblockd_schedule_work(&cfqd->unplug_work);
-}
-
-static int cfq_queue_empty(request_queue_t *q)
-{
-        struct cfq_data *cfqd = q->elevator->elevator_data;
-
-        return !cfqd->busy_queues;
-}
-
-/*
- * Lifted from AS - choose which of crq1 and crq2 that is best served now.
- * We choose the request that is closest to the head right now. Distance
- * behind the head are penalized and only allowed to a certain extent.
- */
-static struct cfq_rq *
-cfq_choose_req(struct cfq_data *cfqd, struct cfq_rq *crq1, struct cfq_rq *crq2)
-{
-        sector_t last, s1, s2, d1 = 0, d2 = 0;
-        int r1_wrap = 0, r2_wrap = 0;   /* requests are behind the disk head */
-        unsigned long back_max;
-
-        if (crq1 == NULL || crq1 == crq2)
-                return crq2;
-        if (crq2 == NULL)
-                return crq1;
-
-        if (cfq_crq_is_sync(crq1) && !cfq_crq_is_sync(crq2))
-                return crq1;
-        else if (cfq_crq_is_sync(crq2) && !cfq_crq_is_sync(crq1))
-                return crq2;
-
-        s1 = crq1->request->sector;
-        s2 = crq2->request->sector;
-
-        last = cfqd->last_sector;
-
-        /*
-         * by definition, 1KiB is 2 sectors
-         */
-        back_max = cfqd->cfq_back_max * 2;
-
-        /*
-         * Strict one way elevator _except_ in the case where we allow
-         * short backward seeks which are biased as twice the cost of a
-         * similar forward seek.
-         */
-        if (s1 >= last)
-                d1 = s1 - last;
-        else if (s1 + back_max >= last)
-                d1 = (last - s1) * cfqd->cfq_back_penalty;
-        else
-                r1_wrap = 1;
-
-        if (s2 >= last)
-                d2 = s2 - last;
-        else if (s2 + back_max >= last)
-                d2 = (last - s2) * cfqd->cfq_back_penalty;
-        else
-                r2_wrap = 1;
-
-        /* Found required data */
-        if (!r1_wrap && r2_wrap)
-                return crq1;
-        else if (!r2_wrap && r1_wrap)
-                return crq2;
-        else if (r1_wrap && r2_wrap) {
-                /* both behind the head */
-                if (s1 <= s2)
-                        return crq1;
-                else
-                        return crq2;
-        }
-
-        /* Both requests in front of the head */
-        if (d1 < d2)
-                return crq1;
-        else if (d2 < d1)
-                return crq2;
-        else {
-                if (s1 >= s2)
-                        return crq1;
-                else
-                        return crq2;
-        }
-}
-
-/*
- * would be nice to take fifo expire time into account as well
- */
-static struct cfq_rq *
-cfq_find_next_crq(struct cfq_data *cfqd, struct cfq_queue *cfqq,
-                  struct cfq_rq *last)
-{
-        struct cfq_rq *crq_next = NULL, *crq_prev = NULL;
-        struct rb_node *rbnext, *rbprev;
-
-        if (!(rbnext = rb_next(&last->rb_node))) {
-                rbnext = rb_first(&cfqq->sort_list);
-                if (rbnext == &last->rb_node)
-                        rbnext = NULL;
-        }
-
-        rbprev = rb_prev(&last->rb_node);
-
-        if (rbprev)
-                crq_prev = rb_entry_crq(rbprev);
-        if (rbnext)
-                crq_next = rb_entry_crq(rbnext);
-
-        return cfq_choose_req(cfqd, crq_next, crq_prev);
-}
-
-static void cfq_update_next_crq(struct cfq_rq *crq)
-{
-        struct cfq_queue *cfqq = crq->cfq_queue;
-
-        if (cfqq->next_crq == crq)
-                cfqq->next_crq = cfq_find_next_crq(cfqq->cfqd, cfqq, crq);
-}
-
-static void cfq_resort_rr_list(struct cfq_queue *cfqq, int preempted)
-{
-        struct cfq_data *cfqd = cfqq->cfqd;
-        struct list_head *list, *entry;
-
-        BUG_ON(!cfq_cfqq_on_rr(cfqq));
-
-        list_del(&cfqq->cfq_list);
-
-        if (cfq_class_rt(cfqq))
-                list = &cfqd->cur_rr;
-        else if (cfq_class_idle(cfqq))
-                list = &cfqd->idle_rr;
-        else {
-                /*
-                 * if cfqq has requests in flight, don't allow it to be
-                 * found in cfq_set_active_queue before it has finished them.
-                 * this is done to increase fairness between a process that
-                 * has lots of io pending vs one that only generates one
-                 * sporadically or synchronously
-                 */
-                if (cfq_cfqq_dispatched(cfqq))
-                        list = &cfqd->busy_rr;
-                else
-                        list = &cfqd->rr_list[cfqq->ioprio];
-        }
-
-        /*
-         * if queue was preempted, just add to front to be fair. busy_rr
-         * isn't sorted.
-         */
-        if (preempted || list == &cfqd->busy_rr) {
-                list_add(&cfqq->cfq_list, list);
-                return;
-        }
-
-        /*
-         * sort by when queue was last serviced
-         */
-        entry = list;
-        while ((entry = entry->prev) != list) {
-                struct cfq_queue *__cfqq = list_entry_cfqq(entry);
-
-                if (!__cfqq->service_last)
-                        break;
-                if (time_before(__cfqq->service_last, cfqq->service_last))
-                        break;
-        }
-
-        list_add(&cfqq->cfq_list, entry);
-}
-
-/*
- * add to busy list of queues for service, trying to be fair in ordering
- * the pending list according to last request service
- */
-static inline void
-cfq_add_cfqq_rr(struct cfq_data *cfqd, struct cfq_queue *cfqq)
-{
-        BUG_ON(cfq_cfqq_on_rr(cfqq));
-        cfq_mark_cfqq_on_rr(cfqq);
-        cfqd->busy_queues++;
-
-        cfq_resort_rr_list(cfqq, 0);
-}
-
-static inline void
-cfq_del_cfqq_rr(struct cfq_data *cfqd, struct cfq_queue *cfqq)
-{
-        BUG_ON(!cfq_cfqq_on_rr(cfqq));
-        cfq_clear_cfqq_on_rr(cfqq);
-        list_move(&cfqq->cfq_list, &cfqd->empty_list);
-
-        BUG_ON(!cfqd->busy_queues);
-        cfqd->busy_queues--;
-}
-
-/*
- * rb tree support functions
- */
-static inline void cfq_del_crq_rb(struct cfq_rq *crq)
-{
-        struct cfq_queue *cfqq = crq->cfq_queue;
-        struct cfq_data *cfqd = cfqq->cfqd;
-        const int sync = cfq_crq_is_sync(crq);
-
-        BUG_ON(!cfqq->queued[sync]);
-        cfqq->queued[sync]--;
-
-        cfq_update_next_crq(crq);
-
-        rb_erase(&crq->rb_node, &cfqq->sort_list);
-        RB_CLEAR_COLOR(&crq->rb_node);
-
-        if (cfq_cfqq_on_rr(cfqq) && RB_EMPTY(&cfqq->sort_list))
-                cfq_del_cfqq_rr(cfqd, cfqq);
-}
-
-static struct cfq_rq *
-__cfq_add_crq_rb(struct cfq_rq *crq)
-{
-        struct rb_node **p = &crq->cfq_queue->sort_list.rb_node;
-        struct rb_node *parent = NULL;
-        struct cfq_rq *__crq;
-
-        while (*p) {
-                parent = *p;
-                __crq = rb_entry_crq(parent);
-
-                if (crq->rb_key < __crq->rb_key)
-                        p = &(*p)->rb_left;
-                else if (crq->rb_key > __crq->rb_key)
-                        p = &(*p)->rb_right;
-                else
-                        return __crq;
-        }
-
-        rb_link_node(&crq->rb_node, parent, p);
-        return NULL;
-}
-
-static void cfq_add_crq_rb(struct cfq_rq *crq)
-{
-        struct cfq_queue *cfqq = crq->cfq_queue;
-        struct cfq_data *cfqd = cfqq->cfqd;
-        struct request *rq = crq->request;
-        struct cfq_rq *__alias;
-
-        crq->rb_key = rq_rb_key(rq);
-        cfqq->queued[cfq_crq_is_sync(crq)]++;
-
-        /*
-         * looks a little odd, but the first insert might return an alias.
-         * if that happens, put the alias on the dispatch list
-         */
-        while ((__alias = __cfq_add_crq_rb(crq)) != NULL)
-                cfq_dispatch_insert(cfqd->queue, __alias);
-
-        rb_insert_color(&crq->rb_node, &cfqq->sort_list);
-
-        if (!cfq_cfqq_on_rr(cfqq))
-                cfq_add_cfqq_rr(cfqd, cfqq);
-
-        /*
-         * check if this request is a better next-serve candidate
-         */
-        cfqq->next_crq = cfq_choose_req(cfqd, cfqq->next_crq, crq);
-}
-
-static inline void
-cfq_reposition_crq_rb(struct cfq_queue *cfqq, struct cfq_rq *crq)
-{
-        rb_erase(&crq->rb_node, &cfqq->sort_list);
-        cfqq->queued[cfq_crq_is_sync(crq)]--;
-
-        cfq_add_crq_rb(crq);
-}
-
-static struct request *cfq_find_rq_rb(struct cfq_data *cfqd, sector_t sector)
-
-{
-        struct cfq_queue *cfqq = cfq_find_cfq_hash(cfqd, current->pid, CFQ_KEY_ANY);
-        struct rb_node *n;
-
-        if (!cfqq)
-                goto out;
-
-        n = cfqq->sort_list.rb_node;
-        while (n) {
-                struct cfq_rq *crq = rb_entry_crq(n);
-
-                if (sector < crq->rb_key)
-                        n = n->rb_left;
-                else if (sector > crq->rb_key)
-                        n = n->rb_right;
-                else
-                        return crq->request;
-        }
-
-out:
-        return NULL;
-}
-
-static void cfq_activate_request(request_queue_t *q, struct request *rq)
-{
-        struct cfq_data *cfqd = q->elevator->elevator_data;
-
-        cfqd->rq_in_driver++;
-}
-
-static void cfq_deactivate_request(request_queue_t *q, struct request *rq)
-{
-        struct cfq_data *cfqd = q->elevator->elevator_data;
-
-        WARN_ON(!cfqd->rq_in_driver);
-        cfqd->rq_in_driver--;
-}
-
-static void cfq_remove_request(struct request *rq)
-{
-        struct cfq_rq *crq = RQ_DATA(rq);
-
-        list_del_init(&rq->queuelist);
-        cfq_del_crq_rb(crq);
-        cfq_del_crq_hash(crq);
-}
-
-static int
-cfq_merge(request_queue_t *q, struct request **req, struct bio *bio)
-{
-        struct cfq_data *cfqd = q->elevator->elevator_data;
-        struct request *__rq;
-        int ret;
-
-        __rq = cfq_find_rq_hash(cfqd, bio->bi_sector);
-        if (__rq && elv_rq_merge_ok(__rq, bio)) {
-                ret = ELEVATOR_BACK_MERGE;
-                goto out;
-        }
-
-        __rq = cfq_find_rq_rb(cfqd, bio->bi_sector + bio_sectors(bio));
-        if (__rq && elv_rq_merge_ok(__rq, bio)) {
-                ret = ELEVATOR_FRONT_MERGE;
-                goto out;
-        }
-
-        return ELEVATOR_NO_MERGE;
-out:
-        *req = __rq;
-        return ret;
-}
-
-static void cfq_merged_request(request_queue_t *q, struct request *req)
-{
-        struct cfq_data *cfqd = q->elevator->elevator_data;
-        struct cfq_rq *crq = RQ_DATA(req);
-
-        cfq_del_crq_hash(crq);
-        cfq_add_crq_hash(cfqd, crq);
-
-        if (rq_rb_key(req) != crq->rb_key) {
-                struct cfq_queue *cfqq = crq->cfq_queue;
-
-                cfq_update_next_crq(crq);
-                cfq_reposition_crq_rb(cfqq, crq);
-        }
-}
-
-static void
-cfq_merged_requests(request_queue_t *q, struct request *rq,
-                    struct request *next)
-{
-        cfq_merged_request(q, rq);
-
-        /*
-         * reposition in fifo if next is older than rq
-         */
-        if (!list_empty(&rq->queuelist) && !list_empty(&next->queuelist) &&
-            time_before(next->start_time, rq->start_time))
-                list_move(&rq->queuelist, &next->queuelist);
-
-        cfq_remove_request(next);
-}
-
-static inline void
-__cfq_set_active_queue(struct cfq_data *cfqd, struct cfq_queue *cfqq)
-{
-        if (cfqq) {
-                /*
-                 * stop potential idle class queues waiting service
-                 */
-                del_timer(&cfqd->idle_class_timer);
-
-                cfqq->slice_start = jiffies;
-                cfqq->slice_end = 0;
-                cfqq->slice_left = 0;
-                cfq_clear_cfqq_must_alloc_slice(cfqq);
-                cfq_clear_cfqq_fifo_expire(cfqq);
-                cfq_clear_cfqq_expired(cfqq);
-        }
-
-        cfqd->active_queue = cfqq;
-}
-
-/*
- * 0
- * 0,1
- * 0,1,2
- * 0,1,2,3
- * 0,1,2,3,4
- * 0,1,2,3,4,5
- * 0,1,2,3,4,5,6
- * 0,1,2,3,4,5,6,7
- */
-static int cfq_get_next_prio_level(struct cfq_data *cfqd)
-{
-        int prio, wrap;
-
-        prio = -1;
-        wrap = 0;
-        do {
-                int p;
-
-                for (p = cfqd->cur_prio; p <= cfqd->cur_end_prio; p++) {
-                        if (!list_empty(&cfqd->rr_list[p])) {
-                                prio = p;
-                                break;
-                        }
-                }
-
-                if (prio != -1)
-                        break;
-                cfqd->cur_prio = 0;
-                if (++cfqd->cur_end_prio == CFQ_PRIO_LISTS) {
-                        cfqd->cur_end_prio = 0;
-                        if (wrap)
-                                break;
-                        wrap = 1;
-                }
-        } while (1);
-
-        if (unlikely(prio == -1))
-                return -1;
-
-        BUG_ON(prio >= CFQ_PRIO_LISTS);
-
-        list_splice_init(&cfqd->rr_list[prio], &cfqd->cur_rr);
-
-        cfqd->cur_prio = prio + 1;
-        if (cfqd->cur_prio > cfqd->cur_end_prio) {
-                cfqd->cur_end_prio = cfqd->cur_prio;
-                cfqd->cur_prio = 0;
-        }
-        if (cfqd->cur_end_prio == CFQ_PRIO_LISTS) {
-                cfqd->cur_prio = 0;
-                cfqd->cur_end_prio = 0;
-        }
-
-        return prio;
-}
-
-static struct cfq_queue *cfq_set_active_queue(struct cfq_data *cfqd)
-{
-        struct cfq_queue *cfqq;
-
-        /*
-         * if current queue is expired but not done with its requests yet,
-         * wait for that to happen
-         */
-        if ((cfqq = cfqd->active_queue) != NULL) {
-                if (cfq_cfqq_expired(cfqq) && cfq_cfqq_dispatched(cfqq))
-                        return NULL;
-        }
-
-        /*
-         * if current list is non-empty, grab first entry. if it is empty,
-         * get next prio level and grab first entry then if any are spliced
-         */
-        if (!list_empty(&cfqd->cur_rr) || cfq_get_next_prio_level(cfqd) != -1)
-                cfqq = list_entry_cfqq(cfqd->cur_rr.next);
-
-        /*
-         * if we have idle queues and no rt or be queues had pending
-         * requests, either allow immediate service if the grace period
-         * has passed or arm the idle grace timer
-         */
-        if (!cfqq && !list_empty(&cfqd->idle_rr)) {
-                unsigned long end = cfqd->last_end_request + CFQ_IDLE_GRACE;
-
-                if (time_after_eq(jiffies, end))
-                        cfqq = list_entry_cfqq(cfqd->idle_rr.next);
-                else
-                        mod_timer(&cfqd->idle_class_timer, end);
-        }
-
-        __cfq_set_active_queue(cfqd, cfqq);
-        return cfqq;
-}
-
-/*
- * current cfqq expired its slice (or was too idle), select new one
- */
-static void
-__cfq_slice_expired(struct cfq_data *cfqd, struct cfq_queue *cfqq,
-                    int preempted)
-{
-        unsigned long now = jiffies;
-
-        if (cfq_cfqq_wait_request(cfqq))
-                del_timer(&cfqd->idle_slice_timer);
-
-        if (!preempted && !cfq_cfqq_dispatched(cfqq))
-                cfqq->service_last = now;
-
-        cfq_clear_cfqq_must_dispatch(cfqq);
-        cfq_clear_cfqq_wait_request(cfqq);
-
-        /*
-         * store what was left of this slice, if the queue idled out
-         * or was preempted
-         */
-        if (time_after(now, cfqq->slice_end))
-                cfqq->slice_left = now - cfqq->slice_end;
-        else
-                cfqq->slice_left = 0;
-
-        if (cfq_cfqq_on_rr(cfqq))
-                cfq_resort_rr_list(cfqq, preempted);
-
-        if (cfqq == cfqd->active_queue)
-                cfqd->active_queue = NULL;
-
-        if (cfqd->active_cic) {
-                put_io_context(cfqd->active_cic->ioc);
-                cfqd->active_cic = NULL;
-        }
-
-        cfqd->dispatch_slice = 0;
-}
-
-static inline void cfq_slice_expired(struct cfq_data *cfqd, int preempted)
-{
-        struct cfq_queue *cfqq = cfqd->active_queue;
-
-        if (cfqq) {
-                /*
-                 * use deferred expiry, if there are requests in progress as
-                 * not to disturb the slice of the next queue
-                 */
-                if (cfq_cfqq_dispatched(cfqq))
-                        cfq_mark_cfqq_expired(cfqq);
-                else
-                        __cfq_slice_expired(cfqd, cfqq, preempted);
-        }
-}
-
-static int cfq_arm_slice_timer(struct cfq_data *cfqd, struct cfq_queue *cfqq)
-
-{
-        WARN_ON(!RB_EMPTY(&cfqq->sort_list));
-        WARN_ON(cfqq != cfqd->active_queue);
-
-        /*
-         * idle is disabled, either manually or by past process history
-         */
-        if (!cfqd->cfq_slice_idle)
-                return 0;
-        if (!cfq_cfqq_idle_window(cfqq))
-                return 0;
-        /*
-         * task has exited, don't wait
-         */
-        if (cfqd->active_cic && !cfqd->active_cic->ioc->task)
-                return 0;
-
-        cfq_mark_cfqq_must_dispatch(cfqq);
-        cfq_mark_cfqq_wait_request(cfqq);
-
-        if (!timer_pending(&cfqd->idle_slice_timer)) {
-                unsigned long slice_left = min(cfqq->slice_end - 1, (unsigned long) cfqd->cfq_slice_idle);
-
-                cfqd->idle_slice_timer.expires = jiffies + slice_left;
-                add_timer(&cfqd->idle_slice_timer);
-        }
-
-        return 1;
-}
-
-static void cfq_dispatch_insert(request_queue_t *q, struct cfq_rq *crq)
-{
-        struct cfq_data *cfqd = q->elevator->elevator_data;
-        struct cfq_queue *cfqq = crq->cfq_queue;
-
-        cfqq->next_crq = cfq_find_next_crq(cfqd, cfqq, crq);
-        cfq_remove_request(crq->request);
-        cfqq->on_dispatch[cfq_crq_is_sync(crq)]++;
-        elv_dispatch_sort(q, crq->request);
-}
-
-/*
- * return expired entry, or NULL to just start from scratch in rbtree
- */
-static inline struct cfq_rq *cfq_check_fifo(struct cfq_queue *cfqq)
-{
-        struct cfq_data *cfqd = cfqq->cfqd;
-        struct request *rq;
-        struct cfq_rq *crq;
-
-        if (cfq_cfqq_fifo_expire(cfqq))
-                return NULL;
-
-        if (!list_empty(&cfqq->fifo)) {
-                int fifo = cfq_cfqq_class_sync(cfqq);
-
-                crq = RQ_DATA(list_entry_fifo(cfqq->fifo.next));
-                rq = crq->request;
-                if (time_after(jiffies, rq->start_time + cfqd->cfq_fifo_expire[fifo])) {
-                        cfq_mark_cfqq_fifo_expire(cfqq);
-                        return crq;
-                }
-        }
-
-        return NULL;
-}
-
-/*
- * Scale schedule slice based on io priority. Use the sync time slice only
- * if a queue is marked sync and has sync io queued. A sync queue with async
- * io only, should not get full sync slice length.
- */
-static inline int
-cfq_prio_to_slice(struct cfq_data *cfqd, struct cfq_queue *cfqq)
-{
-        const int base_slice = cfqd->cfq_slice[cfq_cfqq_sync(cfqq)];
-
-        WARN_ON(cfqq->ioprio >= IOPRIO_BE_NR);
-
-        return base_slice + (base_slice/CFQ_SLICE_SCALE * (4 - cfqq->ioprio));
-}
-
-static inline void
-cfq_set_prio_slice(struct cfq_data *cfqd, struct cfq_queue *cfqq)
-{
-        cfqq->slice_end = cfq_prio_to_slice(cfqd, cfqq) + jiffies;
-}
-
-static inline int
-cfq_prio_to_maxrq(struct cfq_data *cfqd, struct cfq_queue *cfqq)
-{
-        const int base_rq = cfqd->cfq_slice_async_rq;
-
-        WARN_ON(cfqq->ioprio >= IOPRIO_BE_NR);
-
-        return 2 * (base_rq + base_rq * (CFQ_PRIO_LISTS - 1 - cfqq->ioprio));
-}
-
-/*
- * get next queue for service
- */
-static struct cfq_queue *cfq_select_queue(struct cfq_data *cfqd, int force)
-{
-        unsigned long now = jiffies;
-        struct cfq_queue *cfqq;
-
-        cfqq = cfqd->active_queue;
-        if (!cfqq)
-                goto new_queue;
-
-        if (cfq_cfqq_expired(cfqq))
-                goto new_queue;
-
-        /*
-         * slice has expired
-         */
-        if (!cfq_cfqq_must_dispatch(cfqq) && time_after(now, cfqq->slice_end))
-                goto expire;
-
-        /*
-         * if queue has requests, dispatch one. if not, check if
-         * enough slice is left to wait for one
-         */
-        if (!RB_EMPTY(&cfqq->sort_list))
-                goto keep_queue;
-        else if (!force && cfq_cfqq_class_sync(cfqq) &&
-                 time_before(now, cfqq->slice_end)) {
-                if (cfq_arm_slice_timer(cfqd, cfqq))
-                        return NULL;
-        }
-
-expire:
-        cfq_slice_expired(cfqd, 0);
-new_queue:
-        cfqq = cfq_set_active_queue(cfqd);
-keep_queue:
-        return cfqq;
-}
-
-static int
-__cfq_dispatch_requests(struct cfq_data *cfqd, struct cfq_queue *cfqq,
-                        int max_dispatch)
-{
-        int dispatched = 0;
-
-        BUG_ON(RB_EMPTY(&cfqq->sort_list));
-
-        do {
-                struct cfq_rq *crq;
-
-                /*
-                 * follow expired path, else get first next available
-                 */
-                if ((crq = cfq_check_fifo(cfqq)) == NULL)
-                        crq = cfqq->next_crq;
-
-                /*
-                 * finally, insert request into driver dispatch list
-                 */
-                cfq_dispatch_insert(cfqd->queue, crq);
-
-                cfqd->dispatch_slice++;
-                dispatched++;
-
-                if (!cfqd->active_cic) {
-                        atomic_inc(&crq->io_context->ioc->refcount);
-                        cfqd->active_cic = crq->io_context;
-                }
-
-                if (RB_EMPTY(&cfqq->sort_list))
-                        break;
-
-        } while (dispatched < max_dispatch);
-
-        /*
-         * if slice end isn't set yet, set it. if at least one request was
-         * sync, use the sync time slice value
-         */
-        if (!cfqq->slice_end)
-                cfq_set_prio_slice(cfqd, cfqq);
-
-        /*
-         * expire an async queue immediately if it has used up its slice. idle
-         * queue always expire after 1 dispatch round.
-         */
-        if ((!cfq_cfqq_sync(cfqq) &&
-            cfqd->dispatch_slice >= cfq_prio_to_maxrq(cfqd, cfqq)) ||
-            cfq_class_idle(cfqq))
-                cfq_slice_expired(cfqd, 0);
-
-        return dispatched;
-}
-
-static int
-cfq_dispatch_requests(request_queue_t *q, int force)
-{
-        struct cfq_data *cfqd = q->elevator->elevator_data;
-        struct cfq_queue *cfqq;
-
-        if (!cfqd->busy_queues)
-                return 0;
-
-        cfqq = cfq_select_queue(cfqd, force);
-        if (cfqq) {
-                int max_dispatch;
-
-                /*
-                 * if idle window is disabled, allow queue buildup
-                 */
-                if (!cfq_cfqq_idle_window(cfqq) &&
-                    cfqd->rq_in_driver >= cfqd->cfq_max_depth)
-                        return 0;
-
-                cfq_clear_cfqq_must_dispatch(cfqq);
-                cfq_clear_cfqq_wait_request(cfqq);
-                del_timer(&cfqd->idle_slice_timer);
-
-                if (!force) {
-                        max_dispatch = cfqd->cfq_quantum;
-                        if (cfq_class_idle(cfqq))
-                                max_dispatch = 1;
-                } else
-                        max_dispatch = INT_MAX;
-
-                return __cfq_dispatch_requests(cfqd, cfqq, max_dispatch);
-        }
-
-        return 0;
-}
-
-/*
- * task holds one reference to the queue, dropped when task exits. each crq
- * in-flight on this queue also holds a reference, dropped when crq is freed.
- *
- * queue lock must be held here.
- */
-static void cfq_put_queue(struct cfq_queue *cfqq)
-{
-        struct cfq_data *cfqd = cfqq->cfqd;
-
-        BUG_ON(atomic_read(&cfqq->ref) <= 0);
-
-        if (!atomic_dec_and_test(&cfqq->ref))
-                return;
-
-        BUG_ON(rb_first(&cfqq->sort_list));
-        BUG_ON(cfqq->allocated[READ] + cfqq->allocated[WRITE]);
-        BUG_ON(cfq_cfqq_on_rr(cfqq));
-
-        if (unlikely(cfqd->active_queue == cfqq)) {
-                __cfq_slice_expired(cfqd, cfqq, 0);
-                cfq_schedule_dispatch(cfqd);
-        }
-
-        cfq_put_cfqd(cfqq->cfqd);
-
-        /*
-         * it's on the empty list and still hashed
-         */
-        list_del(&cfqq->cfq_list);
-        hlist_del(&cfqq->cfq_hash);
-        kmem_cache_free(cfq_pool, cfqq);
-}
-
-static inline struct cfq_queue *
-__cfq_find_cfq_hash(struct cfq_data *cfqd, unsigned int key, unsigned int prio,
-                    const int hashval)
-{
-        struct hlist_head *hash_list = &cfqd->cfq_hash[hashval];
-        struct hlist_node *entry, *next;
-
-        hlist_for_each_safe(entry, next, hash_list) {
-                struct cfq_queue *__cfqq = list_entry_qhash(entry);
-                const unsigned short __p = IOPRIO_PRIO_VALUE(__cfqq->ioprio_class, __cfqq->ioprio);
-
-                if (__cfqq->key == key && (__p == prio || prio == CFQ_KEY_ANY))
-                        return __cfqq;
-        }
-
-        return NULL;
-}
-
-static struct cfq_queue *
-cfq_find_cfq_hash(struct cfq_data *cfqd, unsigned int key, unsigned short prio)
-{
-        return __cfq_find_cfq_hash(cfqd, key, prio, hash_long(key, CFQ_QHASH_SHIFT));
-}
-
-static void cfq_free_io_context(struct cfq_io_context *cic)
-{
-        struct cfq_io_context *__cic;
-        struct list_head *entry, *next;
-
-        list_for_each_safe(entry, next, &cic->list) {
-                __cic = list_entry(entry, struct cfq_io_context, list);
-                kmem_cache_free(cfq_ioc_pool, __cic);
-        }
-
-        kmem_cache_free(cfq_ioc_pool, cic);
-}
-
-/*
- * Called with interrupts disabled
- */
-static void cfq_exit_single_io_context(struct cfq_io_context *cic)
-{
-        struct cfq_data *cfqd = cic->cfqq->cfqd;
-        request_queue_t *q = cfqd->queue;
-
-        WARN_ON(!irqs_disabled());
-
-        spin_lock(q->queue_lock);
-
-        if (unlikely(cic->cfqq == cfqd->active_queue)) {
-                __cfq_slice_expired(cfqd, cic->cfqq, 0);
-                cfq_schedule_dispatch(cfqd);
-        }
-
-        cfq_put_queue(cic->cfqq);
-        cic->cfqq = NULL;
-        spin_unlock(q->queue_lock);
-}
-
-/*
- * Another task may update the task cic list, if it is doing a queue lookup
- * on its behalf. cfq_cic_lock excludes such concurrent updates
- */
-static void cfq_exit_io_context(struct cfq_io_context *cic)
-{
-        struct cfq_io_context *__cic;
-        struct list_head *entry;
-        unsigned long flags;
-
-        local_irq_save(flags);
-
-        /*
-         * put the reference this task is holding to the various queues
-         */
-        list_for_each(entry, &cic->list) {
-                __cic = list_entry(entry, struct cfq_io_context, list);
-                cfq_exit_single_io_context(__cic);
-        }
-
-        cfq_exit_single_io_context(cic);
-        local_irq_restore(flags);
-}
-
-static struct cfq_io_context *
-cfq_alloc_io_context(struct cfq_data *cfqd, gfp_t gfp_mask)
-{
-        struct cfq_io_context *cic = kmem_cache_alloc(cfq_ioc_pool, gfp_mask);
-
-        if (cic) {
-                INIT_LIST_HEAD(&cic->list);
-                cic->cfqq = NULL;
-                cic->key = NULL;
-                cic->last_end_request = jiffies;
-                cic->ttime_total = 0;
-                cic->ttime_samples = 0;
-                cic->ttime_mean = 0;
-                cic->dtor = cfq_free_io_context;
-                cic->exit = cfq_exit_io_context;
-        }
-
-        return cic;
-}
-
-static void cfq_init_prio_data(struct cfq_queue *cfqq)
-{
-        struct task_struct *tsk = current;
-        int ioprio_class;
-
-        if (!cfq_cfqq_prio_changed(cfqq))
-                return;
-
-        ioprio_class = IOPRIO_PRIO_CLASS(tsk->ioprio);
-        switch (ioprio_class) {
-                default:
-                        printk(KERN_ERR "cfq: bad prio %x\n", ioprio_class);
-                case IOPRIO_CLASS_NONE:
-                        /*
-                         * no prio set, place us in the middle of the BE classes
-                         */
-                        cfqq->ioprio = task_nice_ioprio(tsk);
-                        cfqq->ioprio_class = IOPRIO_CLASS_BE;
-                        break;
-                case IOPRIO_CLASS_RT:
-                        cfqq->ioprio = task_ioprio(tsk);
-                        cfqq->ioprio_class = IOPRIO_CLASS_RT;
-                        break;
-                case IOPRIO_CLASS_BE:
-                        cfqq->ioprio = task_ioprio(tsk);
-                        cfqq->ioprio_class = IOPRIO_CLASS_BE;
-                        break;
-                case IOPRIO_CLASS_IDLE:
-                        cfqq->ioprio_class = IOPRIO_CLASS_IDLE;
-                        cfqq->ioprio = 7;
-                        cfq_clear_cfqq_idle_window(cfqq);
-                        break;
-        }
-
-        /*
-         * keep track of original prio settings in case we have to temporarily
-         * elevate the priority of this queue
-         */
-        cfqq->org_ioprio = cfqq->ioprio;
-        cfqq->org_ioprio_class = cfqq->ioprio_class;
-
-        if (cfq_cfqq_on_rr(cfqq))
-                cfq_resort_rr_list(cfqq, 0);
-
-        cfq_clear_cfqq_prio_changed(cfqq);
-}
-
-static inline void changed_ioprio(struct cfq_queue *cfqq)
-{
-        if (cfqq) {
-                struct cfq_data *cfqd = cfqq->cfqd;
-
-                spin_lock(cfqd->queue->queue_lock);
-                cfq_mark_cfqq_prio_changed(cfqq);
-                cfq_init_prio_data(cfqq);
-                spin_unlock(cfqd->queue->queue_lock);
-        }
-}
-
-/*
- * callback from sys_ioprio_set, irqs are disabled
- */
-static int cfq_ioc_set_ioprio(struct io_context *ioc, unsigned int ioprio)
-{
-        struct cfq_io_context *cic = ioc->cic;
-
-        changed_ioprio(cic->cfqq);
-
-        list_for_each_entry(cic, &cic->list, list)
-                changed_ioprio(cic->cfqq);
-
-        return 0;
-}
-
-static struct cfq_queue *
-cfq_get_queue(struct cfq_data *cfqd, unsigned int key, unsigned short ioprio,
-              gfp_t gfp_mask)
-{
-        const int hashval = hash_long(key, CFQ_QHASH_SHIFT);
-        struct cfq_queue *cfqq, *new_cfqq = NULL;
-
-retry:
-        cfqq = __cfq_find_cfq_hash(cfqd, key, ioprio, hashval);
-
-        if (!cfqq) {
-                if (new_cfqq) {
-                        cfqq = new_cfqq;
-                        new_cfqq = NULL;
-                } else if (gfp_mask & __GFP_WAIT) {
-                        spin_unlock_irq(cfqd->queue->queue_lock);
-                        new_cfqq = kmem_cache_alloc(cfq_pool, gfp_mask);
-                        spin_lock_irq(cfqd->queue->queue_lock);
-                        goto retry;
-                } else {
-                        cfqq = kmem_cache_alloc(cfq_pool, gfp_mask);
-                        if (!cfqq)
-                                goto out;
-                }
-
-                memset(cfqq, 0, sizeof(*cfqq));
-
-                INIT_HLIST_NODE(&cfqq->cfq_hash);
-                INIT_LIST_HEAD(&cfqq->cfq_list);
-                RB_CLEAR_ROOT(&cfqq->sort_list);
-                INIT_LIST_HEAD(&cfqq->fifo);
-
-                cfqq->key = key;
-                hlist_add_head(&cfqq->cfq_hash, &cfqd->cfq_hash[hashval]);
-                atomic_set(&cfqq->ref, 0);
-                cfqq->cfqd = cfqd;
-                atomic_inc(&cfqd->ref);
-                cfqq->service_last = 0;
-                /*
-                 * set ->slice_left to allow preemption for a new process
-                 */
-                cfqq->slice_left = 2 * cfqd->cfq_slice_idle;
-                cfq_mark_cfqq_idle_window(cfqq);
-                cfq_mark_cfqq_prio_changed(cfqq);
-                cfq_init_prio_data(cfqq);
-        }
-
-        if (new_cfqq)
-                kmem_cache_free(cfq_pool, new_cfqq);
-
-        atomic_inc(&cfqq->ref);
-out:
-        WARN_ON((gfp_mask & __GFP_WAIT) && !cfqq);
-        return cfqq;
-}
-
-/*
- * Setup general io context and cfq io context. There can be several cfq
- * io contexts per general io context, if this process is doing io to more
- * than one device managed by cfq. Note that caller is holding a reference to
- * cfqq, so we don't need to worry about it disappearing
- */
-static struct cfq_io_context *
-cfq_get_io_context(struct cfq_data *cfqd, pid_t pid, gfp_t gfp_mask)
-{
-        struct io_context *ioc = NULL;
-        struct cfq_io_context *cic;
-
-        might_sleep_if(gfp_mask & __GFP_WAIT);
-
-        ioc = get_io_context(gfp_mask);
-        if (!ioc)
-                return NULL;
-
-        if ((cic = ioc->cic) == NULL) {
-                cic = cfq_alloc_io_context(cfqd, gfp_mask);
-
-                if (cic == NULL)
-                        goto err;
-
-                /*
-                 * manually increment generic io_context usage count, it
-                 * cannot go away since we are already holding one ref to it
-                 */
-                ioc->cic = cic;
-                ioc->set_ioprio = cfq_ioc_set_ioprio;
-                cic->ioc = ioc;
-                cic->key = cfqd;
-                atomic_inc(&cfqd->ref);
-        } else {
-                struct cfq_io_context *__cic;
-
-                /*
-                 * the first cic on the list is actually the head itself
-                 */
-                if (cic->key == cfqd)
-                        goto out;
-
-                /*
-                 * cic exists, check if we already are there. linear search
-                 * should be ok here, the list will usually not be more than
-                 * 1 or a few entries long
-                 */
-                list_for_each_entry(__cic, &cic->list, list) {
-                        /*
-                         * this process is already holding a reference to
-                         * this queue, so no need to get one more
-                         */
-                        if (__cic->key == cfqd) {
-                                cic = __cic;
-                                goto out;
-                        }
-                }
-
-                /*
-                 * nope, process doesn't have a cic assoicated with this
-                 * cfqq yet. get a new one and add to list
-                 */
-                __cic = cfq_alloc_io_context(cfqd, gfp_mask);
-                if (__cic == NULL)
-                        goto err;
-
-                __cic->ioc = ioc;
-                __cic->key = cfqd;
-                atomic_inc(&cfqd->ref);
-                list_add(&__cic->list, &cic->list);
-                cic = __cic;
-        }
-
-out:
-        return cic;
-err:
-        put_io_context(ioc);
-        return NULL;
-}
-
-static void
-cfq_update_io_thinktime(struct cfq_data *cfqd, struct cfq_io_context *cic)
-{
-        unsigned long elapsed, ttime;
-
-        /*
-         * if this context already has stuff queued, thinktime is from
-         * last queue not last end
-         */
-#if 0
-        if (time_after(cic->last_end_request, cic->last_queue))
-                elapsed = jiffies - cic->last_end_request;
-        else
-                elapsed = jiffies - cic->last_queue;
-#else
-                elapsed = jiffies - cic->last_end_request;
-#endif
-
-        ttime = min(elapsed, 2UL * cfqd->cfq_slice_idle);
-
-        cic->ttime_samples = (7*cic->ttime_samples + 256) / 8;
-        cic->ttime_total = (7*cic->ttime_total + 256*ttime) / 8;
-        cic->ttime_mean = (cic->ttime_total + 128) / cic->ttime_samples;
-}
-
-#define sample_valid(samples)   ((samples) > 80)
-
-/*
- * Disable idle window if the process thinks too long or seeks so much that
- * it doesn't matter
- */
-static void
-cfq_update_idle_window(struct cfq_data *cfqd, struct cfq_queue *cfqq,
-                       struct cfq_io_context *cic)
-{
-        int enable_idle = cfq_cfqq_idle_window(cfqq);
-
-        if (!cic->ioc->task || !cfqd->cfq_slice_idle)
-                enable_idle = 0;
-        else if (sample_valid(cic->ttime_samples)) {
-                if (cic->ttime_mean > cfqd->cfq_slice_idle)
-                        enable_idle = 0;
-                else
-                        enable_idle = 1;
-        }
-
-        if (enable_idle)
-                cfq_mark_cfqq_idle_window(cfqq);
-        else
-                cfq_clear_cfqq_idle_window(cfqq);
-}
-
-
-/*
- * Check if new_cfqq should preempt the currently active queue. Return 0 for
- * no or if we aren't sure, a 1 will cause a preempt.
- */
-static int
-cfq_should_preempt(struct cfq_data *cfqd, struct cfq_queue *new_cfqq,
-                   struct cfq_rq *crq)
-{
-        struct cfq_queue *cfqq = cfqd->active_queue;
-
-        if (cfq_class_idle(new_cfqq))
-                return 0;
-
-        if (!cfqq)
-                return 1;
-
-        if (cfq_class_idle(cfqq))
-                return 1;
-        if (!cfq_cfqq_wait_request(new_cfqq))
-                return 0;
-        /*
-         * if it doesn't have slice left, forget it
-         */
-        if (new_cfqq->slice_left < cfqd->cfq_slice_idle)
-                return 0;
-        if (cfq_crq_is_sync(crq) && !cfq_cfqq_sync(cfqq))
-                return 1;
-
-        return 0;
-}
-
-/*
- * cfqq preempts the active queue. if we allowed preempt with no slice left,
- * let it have half of its nominal slice.
- */
-static void cfq_preempt_queue(struct cfq_data *cfqd, struct cfq_queue *cfqq)
-{
-        struct cfq_queue *__cfqq, *next;
-
-        list_for_each_entry_safe(__cfqq, next, &cfqd->cur_rr, cfq_list)
-                cfq_resort_rr_list(__cfqq, 1);
-
-        if (!cfqq->slice_left)
-                cfqq->slice_left = cfq_prio_to_slice(cfqd, cfqq) / 2;
-
-        cfqq->slice_end = cfqq->slice_left + jiffies;
-        __cfq_slice_expired(cfqd, cfqq, 1);
-        __cfq_set_active_queue(cfqd, cfqq);
-}
-
-/*
- * should really be a ll_rw_blk.c helper
- */
-static void cfq_start_queueing(struct cfq_data *cfqd, struct cfq_queue *cfqq)
-{
-        request_queue_t *q = cfqd->queue;
-
-        if (!blk_queue_plugged(q))
-                q->request_fn(q);
-        else
-                __generic_unplug_device(q);
-}
-
-/*
- * Called when a new fs request (crq) is added (to cfqq). Check if there's
- * something we should do about it
- */
-static void
-cfq_crq_enqueued(struct cfq_data *cfqd, struct cfq_queue *cfqq,
-                 struct cfq_rq *crq)
-{
-        struct cfq_io_context *cic;
-
-        cfqq->next_crq = cfq_choose_req(cfqd, cfqq->next_crq, crq);
-
-        /*
-         * we never wait for an async request and we don't allow preemption
-         * of an async request. so just return early
-         */
-        if (!cfq_crq_is_sync(crq))
-                return;
-
-        cic = crq->io_context;
-
-        cfq_update_io_thinktime(cfqd, cic);
-        cfq_update_idle_window(cfqd, cfqq, cic);
-
-        cic->last_queue = jiffies;
-
-        if (cfqq == cfqd->active_queue) {
-                /*
-                 * if we are waiting for a request for this queue, let it rip
-                 * immediately and flag that we must not expire this queue
-                 * just now
-                 */
-                if (cfq_cfqq_wait_request(cfqq)) {
-                        cfq_mark_cfqq_must_dispatch(cfqq);
-                        del_timer(&cfqd->idle_slice_timer);
-                        cfq_start_queueing(cfqd, cfqq);
-                }
-        } else if (cfq_should_preempt(cfqd, cfqq, crq)) {
-                /*
-                 * not the active queue - expire current slice if it is
-                 * idle and has expired it's mean thinktime or this new queue
-                 * has some old slice time left and is of higher priority
-                 */
-                cfq_preempt_queue(cfqd, cfqq);
-                cfq_mark_cfqq_must_dispatch(cfqq);
-                cfq_start_queueing(cfqd, cfqq);
-        }
-}
-
-static void cfq_insert_request(request_queue_t *q, struct request *rq)
-{
-        struct cfq_data *cfqd = q->elevator->elevator_data;
-        struct cfq_rq *crq = RQ_DATA(rq);
-        struct cfq_queue *cfqq = crq->cfq_queue;
-
-        cfq_init_prio_data(cfqq);
-
-        cfq_add_crq_rb(crq);
-
-        list_add_tail(&rq->queuelist, &cfqq->fifo);
-
-        if (rq_mergeable(rq))
-                cfq_add_crq_hash(cfqd, crq);
-
-        cfq_crq_enqueued(cfqd, cfqq, crq);
-}
-
-static void cfq_completed_request(request_queue_t *q, struct request *rq)
-{
-        struct cfq_rq *crq = RQ_DATA(rq);
-        struct cfq_queue *cfqq = crq->cfq_queue;
-        struct cfq_data *cfqd = cfqq->cfqd;
-        const int sync = cfq_crq_is_sync(crq);
-        unsigned long now;
-
-        now = jiffies;
-
-        WARN_ON(!cfqd->rq_in_driver);
-        WARN_ON(!cfqq->on_dispatch[sync]);
-        cfqd->rq_in_driver--;
-        cfqq->on_dispatch[sync]--;
-
-        if (!cfq_class_idle(cfqq))
-                cfqd->last_end_request = now;
-
-        if (!cfq_cfqq_dispatched(cfqq)) {
-                if (cfq_cfqq_on_rr(cfqq)) {
-                        cfqq->service_last = now;
-                        cfq_resort_rr_list(cfqq, 0);
-                }
-                if (cfq_cfqq_expired(cfqq)) {
-                        __cfq_slice_expired(cfqd, cfqq, 0);
-                        cfq_schedule_dispatch(cfqd);
-                }
-        }
-
-        if (cfq_crq_is_sync(crq))
-                crq->io_context->last_end_request = now;
-}
-
-static struct request *
-cfq_former_request(request_queue_t *q, struct request *rq)
-{
-        struct cfq_rq *crq = RQ_DATA(rq);
-        struct rb_node *rbprev = rb_prev(&crq->rb_node);
-
-        if (rbprev)
-                return rb_entry_crq(rbprev)->request;
-
-        return NULL;
-}
-
-static struct request *
-cfq_latter_request(request_queue_t *q, struct request *rq)
-{
-        struct cfq_rq *crq = RQ_DATA(rq);
-        struct rb_node *rbnext = rb_next(&crq->rb_node);
-
-        if (rbnext)
-                return rb_entry_crq(rbnext)->request;
-
-        return NULL;
-}
-
-/*
- * we temporarily boost lower priority queues if they are holding fs exclusive
- * resources. they are boosted to normal prio (CLASS_BE/4)
- */
-static void cfq_prio_boost(struct cfq_queue *cfqq)
-{
-        const int ioprio_class = cfqq->ioprio_class;
-        const int ioprio = cfqq->ioprio;
-
-        if (has_fs_excl()) {
-                /*
-                 * boost idle prio on transactions that would lock out other
-                 * users of the filesystem
-                 */
-                if (cfq_class_idle(cfqq))
-                        cfqq->ioprio_class = IOPRIO_CLASS_BE;
-                if (cfqq->ioprio > IOPRIO_NORM)
-                        cfqq->ioprio = IOPRIO_NORM;
-        } else {
-                /*
-                 * check if we need to unboost the queue
-                 */
-                if (cfqq->ioprio_class != cfqq->org_ioprio_class)
-                        cfqq->ioprio_class = cfqq->org_ioprio_class;
-                if (cfqq->ioprio != cfqq->org_ioprio)
-                        cfqq->ioprio = cfqq->org_ioprio;
-        }
-
-        /*
-         * refile between round-robin lists if we moved the priority class
-         */
-        if ((ioprio_class != cfqq->ioprio_class || ioprio != cfqq->ioprio) &&
-            cfq_cfqq_on_rr(cfqq))
-                cfq_resort_rr_list(cfqq, 0);
-}
-
-static inline pid_t cfq_queue_pid(struct task_struct *task, int rw)
-{
-        if (rw == READ || process_sync(task))
-                return task->pid;
-
-        return CFQ_KEY_ASYNC;
-}
-
-static inline int
-__cfq_may_queue(struct cfq_data *cfqd, struct cfq_queue *cfqq,
-                struct task_struct *task, int rw)
-{
-#if 1
-        if ((cfq_cfqq_wait_request(cfqq) || cfq_cfqq_must_alloc(cfqq)) &&
-            !cfq_cfqq_must_alloc_slice(cfqq)) {
-                cfq_mark_cfqq_must_alloc_slice(cfqq);
-                return ELV_MQUEUE_MUST;
-        }
-
-        return ELV_MQUEUE_MAY;
-#else
-        if (!cfqq || task->flags & PF_MEMALLOC)
-                return ELV_MQUEUE_MAY;
-        if (!cfqq->allocated[rw] || cfq_cfqq_must_alloc(cfqq)) {
-                if (cfq_cfqq_wait_request(cfqq))
-                        return ELV_MQUEUE_MUST;
-
-                /*
-                 * only allow 1 ELV_MQUEUE_MUST per slice, otherwise we
-                 * can quickly flood the queue with writes from a single task
-                 */
-                if (rw == READ || !cfq_cfqq_must_alloc_slice(cfqq)) {
-                        cfq_mark_cfqq_must_alloc_slice(cfqq);
-                        return ELV_MQUEUE_MUST;
-                }
-
-                return ELV_MQUEUE_MAY;
-        }
-        if (cfq_class_idle(cfqq))
-                return ELV_MQUEUE_NO;
-        if (cfqq->allocated[rw] >= cfqd->max_queued) {
-                struct io_context *ioc = get_io_context(GFP_ATOMIC);
-                int ret = ELV_MQUEUE_NO;
-
-                if (ioc && ioc->nr_batch_requests)
-                        ret = ELV_MQUEUE_MAY;
-
-                put_io_context(ioc);
-                return ret;
-        }
-
-        return ELV_MQUEUE_MAY;
-#endif
-}
-
-static int cfq_may_queue(request_queue_t *q, int rw, struct bio *bio)
-{
-        struct cfq_data *cfqd = q->elevator->elevator_data;
-        struct task_struct *tsk = current;
-        struct cfq_queue *cfqq;
-
-        /*
-         * don't force setup of a queue from here, as a call to may_queue
-         * does not necessarily imply that a request actually will be queued.
-         * so just lookup a possibly existing queue, or return 'may queue'
-         * if that fails
-         */
-        cfqq = cfq_find_cfq_hash(cfqd, cfq_queue_pid(tsk, rw), tsk->ioprio);
-        if (cfqq) {
-                cfq_init_prio_data(cfqq);
-                cfq_prio_boost(cfqq);
-
-                return __cfq_may_queue(cfqd, cfqq, tsk, rw);
-        }
-
-        return ELV_MQUEUE_MAY;
-}
-
-static void cfq_check_waiters(request_queue_t *q, struct cfq_queue *cfqq)
-{
-        struct cfq_data *cfqd = q->elevator->elevator_data;
-        struct request_list *rl = &q->rq;
-
-        if (cfqq->allocated[READ] <= cfqd->max_queued || cfqd->rq_starved) {
-                smp_mb();
-                if (waitqueue_active(&rl->wait[READ]))
-                        wake_up(&rl->wait[READ]);
-        }
-
-        if (cfqq->allocated[WRITE] <= cfqd->max_queued || cfqd->rq_starved) {
-                smp_mb();
-                if (waitqueue_active(&rl->wait[WRITE]))
-                        wake_up(&rl->wait[WRITE]);
-        }
-}
-
-/*
- * queue lock held here
- */
-static void cfq_put_request(request_queue_t *q, struct request *rq)
-{
-        struct cfq_data *cfqd = q->elevator->elevator_data;
-        struct cfq_rq *crq = RQ_DATA(rq);
-
-        if (crq) {
-                struct cfq_queue *cfqq = crq->cfq_queue;
-                const int rw = rq_data_dir(rq);
-
-                BUG_ON(!cfqq->allocated[rw]);
-                cfqq->allocated[rw]--;
-
-                put_io_context(crq->io_context->ioc);
-
-                mempool_free(crq, cfqd->crq_pool);
-                rq->elevator_private = NULL;
-
-                cfq_check_waiters(q, cfqq);
-                cfq_put_queue(cfqq);
-        }
-}
-
-/*
- * Allocate cfq data structures associated with this request.
- */
-static int
-cfq_set_request(request_queue_t *q, struct request *rq, struct bio *bio,
-                gfp_t gfp_mask)
-{
-        struct cfq_data *cfqd = q->elevator->elevator_data;
-        struct task_struct *tsk = current;
-        struct cfq_io_context *cic;
-        const int rw = rq_data_dir(rq);
-        pid_t key = cfq_queue_pid(tsk, rw);
-        struct cfq_queue *cfqq;
-        struct cfq_rq *crq;
-        unsigned long flags;
-
-        might_sleep_if(gfp_mask & __GFP_WAIT);
-
-        cic = cfq_get_io_context(cfqd, key, gfp_mask);
-
-        spin_lock_irqsave(q->queue_lock, flags);
-
-        if (!cic)
-                goto queue_fail;
-
-        if (!cic->cfqq) {
-                cfqq = cfq_get_queue(cfqd, key, tsk->ioprio, gfp_mask);
-                if (!cfqq)
-                        goto queue_fail;
-
-                cic->cfqq = cfqq;
-        } else
-                cfqq = cic->cfqq;
-
-        cfqq->allocated[rw]++;
-        cfq_clear_cfqq_must_alloc(cfqq);
-        cfqd->rq_starved = 0;
-        atomic_inc(&cfqq->ref);
-        spin_unlock_irqrestore(q->queue_lock, flags);
-
-        crq = mempool_alloc(cfqd->crq_pool, gfp_mask);
-        if (crq) {
-                RB_CLEAR(&crq->rb_node);
-                crq->rb_key = 0;
-                crq->request = rq;
-                INIT_HLIST_NODE(&crq->hash);
-                crq->cfq_queue = cfqq;
-                crq->io_context = cic;
-
-                if (rw == READ || process_sync(tsk))
-                        cfq_mark_crq_is_sync(crq);
-                else
-                        cfq_clear_crq_is_sync(crq);
-
-                rq->elevator_private = crq;
-                return 0;
-        }
-
-        spin_lock_irqsave(q->queue_lock, flags);
-        cfqq->allocated[rw]--;
-        if (!(cfqq->allocated[0] + cfqq->allocated[1]))
-                cfq_mark_cfqq_must_alloc(cfqq);
-        cfq_put_queue(cfqq);
-queue_fail:
-        if (cic)
-                put_io_context(cic->ioc);
-        /*
-         * mark us rq allocation starved. we need to kickstart the process
-         * ourselves if there are no pending requests that can do it for us.
-         * that would be an extremely rare OOM situation
-         */
-        cfqd->rq_starved = 1;
-        cfq_schedule_dispatch(cfqd);
-        spin_unlock_irqrestore(q->queue_lock, flags);
-        return 1;
-}
-
-static void cfq_kick_queue(void *data)
-{
-        request_queue_t *q = data;
-        struct cfq_data *cfqd = q->elevator->elevator_data;
-        unsigned long flags;
-
-        spin_lock_irqsave(q->queue_lock, flags);
-
-        if (cfqd->rq_starved) {
-                struct request_list *rl = &q->rq;
-
-                /*
-                 * we aren't guaranteed to get a request after this, but we
-                 * have to be opportunistic
-                 */
-                smp_mb();
-                if (waitqueue_active(&rl->wait[READ]))
-                        wake_up(&rl->wait[READ]);
-                if (waitqueue_active(&rl->wait[WRITE]))
-                        wake_up(&rl->wait[WRITE]);
-        }
-
-        blk_remove_plug(q);
-        q->request_fn(q);
-        spin_unlock_irqrestore(q->queue_lock, flags);
-}
-
-/*
- * Timer running if the active_queue is currently idling inside its time slice
- */
-static void cfq_idle_slice_timer(unsigned long data)
-{
-        struct cfq_data *cfqd = (struct cfq_data *) data;
-        struct cfq_queue *cfqq;
-        unsigned long flags;
-
-        spin_lock_irqsave(cfqd->queue->queue_lock, flags);
-
-        if ((cfqq = cfqd->active_queue) != NULL) {
-                unsigned long now = jiffies;
-
-                /*
-                 * expired
-                 */
-                if (time_after(now, cfqq->slice_end))
-                        goto expire;
-
-                /*
-                 * only expire and reinvoke request handler, if there are
-                 * other queues with pending requests
-                 */
-                if (!cfqd->busy_queues) {
-                        cfqd->idle_slice_timer.expires = min(now + cfqd->cfq_slice_idle, cfqq->slice_end);
-                        add_timer(&cfqd->idle_slice_timer);
-                        goto out_cont;
-                }
-
-                /*
-                 * not expired and it has a request pending, let it dispatch
-                 */
-                if (!RB_EMPTY(&cfqq->sort_list)) {
-                        cfq_mark_cfqq_must_dispatch(cfqq);
-                        goto out_kick;
-                }
-        }
-expire:
-        cfq_slice_expired(cfqd, 0);
-out_kick:
-        cfq_schedule_dispatch(cfqd);
-out_cont:
-        spin_unlock_irqrestore(cfqd->queue->queue_lock, flags);
-}
-
-/*
- * Timer running if an idle class queue is waiting for service
- */
-static void cfq_idle_class_timer(unsigned long data)
-{
-        struct cfq_data *cfqd = (struct cfq_data *) data;
-        unsigned long flags, end;
-
-        spin_lock_irqsave(cfqd->queue->queue_lock, flags);
-
-        /*
-         * race with a non-idle queue, reset timer
-         */
-        end = cfqd->last_end_request + CFQ_IDLE_GRACE;
-        if (!time_after_eq(jiffies, end)) {
-                cfqd->idle_class_timer.expires = end;
-                add_timer(&cfqd->idle_class_timer);
-        } else
-                cfq_schedule_dispatch(cfqd);
-
-        spin_unlock_irqrestore(cfqd->queue->queue_lock, flags);
-}
-
-static void cfq_shutdown_timer_wq(struct cfq_data *cfqd)
-{
-        del_timer_sync(&cfqd->idle_slice_timer);
-        del_timer_sync(&cfqd->idle_class_timer);
-        blk_sync_queue(cfqd->queue);
-}
-
-static void cfq_put_cfqd(struct cfq_data *cfqd)
-{
-        request_queue_t *q = cfqd->queue;
-
-        if (!atomic_dec_and_test(&cfqd->ref))
-                return;
-
-        cfq_shutdown_timer_wq(cfqd);
-        blk_put_queue(q);
-
-        mempool_destroy(cfqd->crq_pool);
-        kfree(cfqd->crq_hash);
-        kfree(cfqd->cfq_hash);
-        kfree(cfqd);
-}
-
-static void cfq_exit_queue(elevator_t *e)
-{
-        struct cfq_data *cfqd = e->elevator_data;
-
-        cfq_shutdown_timer_wq(cfqd);
-        cfq_put_cfqd(cfqd);
-}
-
-static int cfq_init_queue(request_queue_t *q, elevator_t *e)
-{
-        struct cfq_data *cfqd;
-        int i;
-
-        cfqd = kmalloc(sizeof(*cfqd), GFP_KERNEL);
-        if (!cfqd)
-                return -ENOMEM;
-
-        memset(cfqd, 0, sizeof(*cfqd));
-
-        for (i = 0; i < CFQ_PRIO_LISTS; i++)
-                INIT_LIST_HEAD(&cfqd->rr_list[i]);
-
-        INIT_LIST_HEAD(&cfqd->busy_rr);
-        INIT_LIST_HEAD(&cfqd->cur_rr);
-        INIT_LIST_HEAD(&cfqd->idle_rr);
-        INIT_LIST_HEAD(&cfqd->empty_list);
-
-        cfqd->crq_hash = kmalloc(sizeof(struct hlist_head) * CFQ_MHASH_ENTRIES, GFP_KERNEL);
-        if (!cfqd->crq_hash)
-                goto out_crqhash;
-
-        cfqd->cfq_hash = kmalloc(sizeof(struct hlist_head) * CFQ_QHASH_ENTRIES, GFP_KERNEL);
-        if (!cfqd->cfq_hash)
-                goto out_cfqhash;
-
-        cfqd->crq_pool = mempool_create(BLKDEV_MIN_RQ, mempool_alloc_slab, mempool_free_slab, crq_pool);
-        if (!cfqd->crq_pool)
-                goto out_crqpool;
-
-        for (i = 0; i < CFQ_MHASH_ENTRIES; i++)
-                INIT_HLIST_HEAD(&cfqd->crq_hash[i]);
-        for (i = 0; i < CFQ_QHASH_ENTRIES; i++)
-                INIT_HLIST_HEAD(&cfqd->cfq_hash[i]);
-
-        e->elevator_data = cfqd;
-
-        cfqd->queue = q;
-        atomic_inc(&q->refcnt);
-
-        cfqd->max_queued = q->nr_requests / 4;
-        q->nr_batching = cfq_queued;
-
-        init_timer(&cfqd->idle_slice_timer);
-        cfqd->idle_slice_timer.function = cfq_idle_slice_timer;
-        cfqd->idle_slice_timer.data = (unsigned long) cfqd;
-
-        init_timer(&cfqd->idle_class_timer);
-        cfqd->idle_class_timer.function = cfq_idle_class_timer;
-        cfqd->idle_class_timer.data = (unsigned long) cfqd;
-
-        INIT_WORK(&cfqd->unplug_work, cfq_kick_queue, q);
-
-        atomic_set(&cfqd->ref, 1);
-
-        cfqd->cfq_queued = cfq_queued;
-        cfqd->cfq_quantum = cfq_quantum;
-        cfqd->cfq_fifo_expire[0] = cfq_fifo_expire[0];
-        cfqd->cfq_fifo_expire[1] = cfq_fifo_expire[1];
-        cfqd->cfq_back_max = cfq_back_max;
-        cfqd->cfq_back_penalty = cfq_back_penalty;
-        cfqd->cfq_slice[0] = cfq_slice_async;
-        cfqd->cfq_slice[1] = cfq_slice_sync;
-        cfqd->cfq_slice_async_rq = cfq_slice_async_rq;
-        cfqd->cfq_slice_idle = cfq_slice_idle;
-        cfqd->cfq_max_depth = cfq_max_depth;
-
-        return 0;
-out_crqpool:
-        kfree(cfqd->cfq_hash);
-out_cfqhash:
-        kfree(cfqd->crq_hash);
-out_crqhash:
-        kfree(cfqd);
-        return -ENOMEM;
-}
-
-static void cfq_slab_kill(void)
-{
-        if (crq_pool)
-                kmem_cache_destroy(crq_pool);
-        if (cfq_pool)
-                kmem_cache_destroy(cfq_pool);
-        if (cfq_ioc_pool)
-                kmem_cache_destroy(cfq_ioc_pool);
-}
-
-static int __init cfq_slab_setup(void)
-{
-        crq_pool = kmem_cache_create("crq_pool", sizeof(struct cfq_rq), 0, 0,
-                                        NULL, NULL);
-        if (!crq_pool)
-                goto fail;
-
-        cfq_pool = kmem_cache_create("cfq_pool", sizeof(struct cfq_queue), 0, 0,
-                                        NULL, NULL);
-        if (!cfq_pool)
-                goto fail;
-
-        cfq_ioc_pool = kmem_cache_create("cfq_ioc_pool",
-                        sizeof(struct cfq_io_context), 0, 0, NULL, NULL);
-        if (!cfq_ioc_pool)
-                goto fail;
-
-        return 0;
-fail:
-        cfq_slab_kill();
-        return -ENOMEM;
-}
-
-/*
- * sysfs parts below -->
- */
-struct cfq_fs_entry {
-        struct attribute attr;
-        ssize_t (*show)(struct cfq_data *, char *);
-        ssize_t (*store)(struct cfq_data *, const char *, size_t);
-};
-
-static ssize_t
-cfq_var_show(unsigned int var, char *page)
-{
-        return sprintf(page, "%d\n", var);
-}
-
-static ssize_t
-cfq_var_store(unsigned int *var, const char *page, size_t count)
-{
-        char *p = (char *) page;
-
-        *var = simple_strtoul(p, &p, 10);
-        return count;
-}
-
-#define SHOW_FUNCTION(__FUNC, __VAR, __CONV)                            \
-static ssize_t __FUNC(struct cfq_data *cfqd, char *page)                \
-{                                                                       \
-        unsigned int __data = __VAR;                                    \
-        if (__CONV)                                                     \
-                __data = jiffies_to_msecs(__data);                      \
-        return cfq_var_show(__data, (page));                            \
-}
-SHOW_FUNCTION(cfq_quantum_show, cfqd->cfq_quantum, 0);
-SHOW_FUNCTION(cfq_queued_show, cfqd->cfq_queued, 0);
-SHOW_FUNCTION(cfq_fifo_expire_sync_show, cfqd->cfq_fifo_expire[1], 1);
-SHOW_FUNCTION(cfq_fifo_expire_async_show, cfqd->cfq_fifo_expire[0], 1);
-SHOW_FUNCTION(cfq_back_max_show, cfqd->cfq_back_max, 0);
-SHOW_FUNCTION(cfq_back_penalty_show, cfqd->cfq_back_penalty, 0);
-SHOW_FUNCTION(cfq_slice_idle_show, cfqd->cfq_slice_idle, 1);
-SHOW_FUNCTION(cfq_slice_sync_show, cfqd->cfq_slice[1], 1);
-SHOW_FUNCTION(cfq_slice_async_show, cfqd->cfq_slice[0], 1);
-SHOW_FUNCTION(cfq_slice_async_rq_show, cfqd->cfq_slice_async_rq, 0);
-SHOW_FUNCTION(cfq_max_depth_show, cfqd->cfq_max_depth, 0);
-#undef SHOW_FUNCTION
-
-#define STORE_FUNCTION(__FUNC, __PTR, MIN, MAX, __CONV)                 \
-static ssize_t __FUNC(struct cfq_data *cfqd, const char *page, size_t count)    \
-{                                                                       \
-        unsigned int __data;                                            \
-        int ret = cfq_var_store(&__data, (page), count);                \
-        if (__data < (MIN))                                             \
-                __data = (MIN);                                         \
-        else if (__data > (MAX))                                        \
-                __data = (MAX);                                         \
-        if (__CONV)                                                     \
-                *(__PTR) = msecs_to_jiffies(__data);                    \
-        else                                                            \
-                *(__PTR) = __data;                                      \
-        return ret;                                                     \
-}
-STORE_FUNCTION(cfq_quantum_store, &cfqd->cfq_quantum, 1, UINT_MAX, 0);
-STORE_FUNCTION(cfq_queued_store, &cfqd->cfq_queued, 1, UINT_MAX, 0);
-STORE_FUNCTION(cfq_fifo_expire_sync_store, &cfqd->cfq_fifo_expire[1], 1, UINT_MAX, 1);
-STORE_FUNCTION(cfq_fifo_expire_async_store, &cfqd->cfq_fifo_expire[0], 1, UINT_MAX, 1);
-STORE_FUNCTION(cfq_back_max_store, &cfqd->cfq_back_max, 0, UINT_MAX, 0);
-STORE_FUNCTION(cfq_back_penalty_store, &cfqd->cfq_back_penalty, 1, UINT_MAX, 0);
-STORE_FUNCTION(cfq_slice_idle_store, &cfqd->cfq_slice_idle, 0, UINT_MAX, 1);
-STORE_FUNCTION(cfq_slice_sync_store, &cfqd->cfq_slice[1], 1, UINT_MAX, 1);
-STORE_FUNCTION(cfq_slice_async_store, &cfqd->cfq_slice[0], 1, UINT_MAX, 1);
-STORE_FUNCTION(cfq_slice_async_rq_store, &cfqd->cfq_slice_async_rq, 1, UINT_MAX, 0);
-STORE_FUNCTION(cfq_max_depth_store, &cfqd->cfq_max_depth, 1, UINT_MAX, 0);
-#undef STORE_FUNCTION
-
-static struct cfq_fs_entry cfq_quantum_entry = {
-        .attr = {.name = "quantum", .mode = S_IRUGO | S_IWUSR },
-        .show = cfq_quantum_show,
-        .store = cfq_quantum_store,
-};
-static struct cfq_fs_entry cfq_queued_entry = {
-        .attr = {.name = "queued", .mode = S_IRUGO | S_IWUSR },
-        .show = cfq_queued_show,
-        .store = cfq_queued_store,
-};
-static struct cfq_fs_entry cfq_fifo_expire_sync_entry = {
-        .attr = {.name = "fifo_expire_sync", .mode = S_IRUGO | S_IWUSR },
-        .show = cfq_fifo_expire_sync_show,
-        .store = cfq_fifo_expire_sync_store,
-};
-static struct cfq_fs_entry cfq_fifo_expire_async_entry = {
-        .attr = {.name = "fifo_expire_async", .mode = S_IRUGO | S_IWUSR },
-        .show = cfq_fifo_expire_async_show,
-        .store = cfq_fifo_expire_async_store,
-};
-static struct cfq_fs_entry cfq_back_max_entry = {
-        .attr = {.name = "back_seek_max", .mode = S_IRUGO | S_IWUSR },
-        .show = cfq_back_max_show,
-        .store = cfq_back_max_store,
-};
-static struct cfq_fs_entry cfq_back_penalty_entry = {
-        .attr = {.name = "back_seek_penalty", .mode = S_IRUGO | S_IWUSR },
-        .show = cfq_back_penalty_show,
-        .store = cfq_back_penalty_store,
-};
-static struct cfq_fs_entry cfq_slice_sync_entry = {
-        .attr = {.name = "slice_sync", .mode = S_IRUGO | S_IWUSR },
-        .show = cfq_slice_sync_show,
-        .store = cfq_slice_sync_store,
-};
-static struct cfq_fs_entry cfq_slice_async_entry = {
-        .attr = {.name = "slice_async", .mode = S_IRUGO | S_IWUSR },
-        .show = cfq_slice_async_show,
-        .store = cfq_slice_async_store,
-};
-static struct cfq_fs_entry cfq_slice_async_rq_entry = {
-        .attr = {.name = "slice_async_rq", .mode = S_IRUGO | S_IWUSR },
-        .show = cfq_slice_async_rq_show,
-        .store = cfq_slice_async_rq_store,
-};
-static struct cfq_fs_entry cfq_slice_idle_entry = {
-        .attr = {.name = "slice_idle", .mode = S_IRUGO | S_IWUSR },
-        .show = cfq_slice_idle_show,
-        .store = cfq_slice_idle_store,
-};
-static struct cfq_fs_entry cfq_max_depth_entry = {
-        .attr = {.name = "max_depth", .mode = S_IRUGO | S_IWUSR },
-        .show = cfq_max_depth_show,
-        .store = cfq_max_depth_store,
-};
-
-static struct attribute *default_attrs[] = {
-        &cfq_quantum_entry.attr,
-        &cfq_queued_entry.attr,
-        &cfq_fifo_expire_sync_entry.attr,
-        &cfq_fifo_expire_async_entry.attr,
-        &cfq_back_max_entry.attr,
-        &cfq_back_penalty_entry.attr,
-        &cfq_slice_sync_entry.attr,
-        &cfq_slice_async_entry.attr,
-        &cfq_slice_async_rq_entry.attr,
-        &cfq_slice_idle_entry.attr,
-        &cfq_max_depth_entry.attr,
-        NULL,
-};
-
-#define to_cfq(atr) container_of((atr), struct cfq_fs_entry, attr)
-
-static ssize_t
-cfq_attr_show(struct kobject *kobj, struct attribute *attr, char *page)
-{
-        elevator_t *e = container_of(kobj, elevator_t, kobj);
-        struct cfq_fs_entry *entry = to_cfq(attr);
-
-        if (!entry->show)
-                return -EIO;
-
-        return entry->show(e->elevator_data, page);
-}
-
-static ssize_t
-cfq_attr_store(struct kobject *kobj, struct attribute *attr,
-               const char *page, size_t length)
-{
-        elevator_t *e = container_of(kobj, elevator_t, kobj);
-        struct cfq_fs_entry *entry = to_cfq(attr);
-
-        if (!entry->store)
-                return -EIO;
-
-        return entry->store(e->elevator_data, page, length);
-}
-
-static struct sysfs_ops cfq_sysfs_ops = {
-        .show   = cfq_attr_show,
-        .store  = cfq_attr_store,
-};
-
-static struct kobj_type cfq_ktype = {
-        .sysfs_ops      = &cfq_sysfs_ops,
-        .default_attrs  = default_attrs,
-};
-
-static struct elevator_type iosched_cfq = {
-        .ops = {
-                .elevator_merge_fn =            cfq_merge,
-                .elevator_merged_fn =           cfq_merged_request,
-                .elevator_merge_req_fn =        cfq_merged_requests,
-                .elevator_dispatch_fn =         cfq_dispatch_requests,
-                .elevator_add_req_fn =          cfq_insert_request,
-                .elevator_activate_req_fn =     cfq_activate_request,
-                .elevator_deactivate_req_fn =   cfq_deactivate_request,
-                .elevator_queue_empty_fn =      cfq_queue_empty,
-                .elevator_completed_req_fn =    cfq_completed_request,
-                .elevator_former_req_fn =       cfq_former_request,
-                .elevator_latter_req_fn =       cfq_latter_request,
-                .elevator_set_req_fn =          cfq_set_request,
-                .elevator_put_req_fn =          cfq_put_request,
-                .elevator_may_queue_fn =        cfq_may_queue,
-                .elevator_init_fn =             cfq_init_queue,
-                .elevator_exit_fn =             cfq_exit_queue,
-        },
-        .elevator_ktype =       &cfq_ktype,
-        .elevator_name =        "cfq",
-        .elevator_owner =       THIS_MODULE,
-};
-
-static int __init cfq_init(void)
-{
-        int ret;
-
-        /*
-         * could be 0 on HZ < 1000 setups
-         */
-        if (!cfq_slice_async)
-                cfq_slice_async = 1;
-        if (!cfq_slice_idle)
-                cfq_slice_idle = 1;
-
-        if (cfq_slab_setup())
-                return -ENOMEM;
-
-        ret = elv_register(&iosched_cfq);
-        if (ret)
-                cfq_slab_kill();
-
-        return ret;
-}
-
-static void __exit cfq_exit(void)
-{
-        elv_unregister(&iosched_cfq);
-        cfq_slab_kill();
-}
-
-module_init(cfq_init);
-module_exit(cfq_exit);
-
-MODULE_AUTHOR("Jens Axboe");
-MODULE_LICENSE("GPL");
-MODULE_DESCRIPTION("Completely Fair Queueing IO scheduler");
diff --git a/drivers/block/deadline-iosched.c b/drivers/block/deadline-iosched.c
deleted file mode 100644
index 7929471d7df7..000000000000
--- a/drivers/block/deadline-iosched.c
+++ /dev/null
@@ -1,878 +0,0 @@
-/*
- *  linux/drivers/block/deadline-iosched.c
- *
- *  Deadline i/o scheduler.
- *
- *  Copyright (C) 2002 Jens Axboe <axboe@suse.de>
- */
-#include <linux/kernel.h>
-#include <linux/fs.h>
-#include <linux/blkdev.h>
-#include <linux/elevator.h>
-#include <linux/bio.h>
-#include <linux/config.h>
-#include <linux/module.h>
-#include <linux/slab.h>
-#include <linux/init.h>
-#include <linux/compiler.h>
-#include <linux/hash.h>
-#include <linux/rbtree.h>
-
-/*
- * See Documentation/block/deadline-iosched.txt
- */
-static int read_expire = HZ / 2;  /* max time before a read is submitted. */
-static int write_expire = 5 * HZ; /* ditto for writes, these limits are SOFT! */
-static int writes_starved = 2;    /* max times reads can starve a write */
-static int fifo_batch = 16;       /* # of sequential requests treated as one
-                                     by the above parameters. For throughput. */
-
-static const int deadline_hash_shift = 5;
-#define DL_HASH_BLOCK(sec)      ((sec) >> 3)
-#define DL_HASH_FN(sec)         (hash_long(DL_HASH_BLOCK((sec)), deadline_hash_shift))
-#define DL_HASH_ENTRIES         (1 << deadline_hash_shift)
-#define rq_hash_key(rq)         ((rq)->sector + (rq)->nr_sectors)
-#define list_entry_hash(ptr)    list_entry((ptr), struct deadline_rq, hash)
-#define ON_HASH(drq)            (drq)->on_hash
-
-struct deadline_data {
-        /*
-         * run time data
-         */
-
-        /*
-         * requests (deadline_rq s) are present on both sort_list and fifo_list
-         */
-        struct rb_root sort_list[2];    
-        struct list_head fifo_list[2];
-        
-        /*
-         * next in sort order. read, write or both are NULL
-         */
-        struct deadline_rq *next_drq[2];
-        struct list_head *hash;         /* request hash */
-        unsigned int batching;          /* number of sequential requests made */
-        sector_t last_sector;           /* head position */
-        unsigned int starved;           /* times reads have starved writes */
-
-        /*
-         * settings that change how the i/o scheduler behaves
-         */
-        int fifo_expire[2];
-        int fifo_batch;
-        int writes_starved;
-        int front_merges;
-
-        mempool_t *drq_pool;
-};
-
-/*
- * pre-request data.
- */
-struct deadline_rq {
-        /*
-         * rbtree index, key is the starting offset
-         */
-        struct rb_node rb_node;
-        sector_t rb_key;
-
-        struct request *request;
-
-        /*
-         * request hash, key is the ending offset (for back merge lookup)
-         */
-        struct list_head hash;
-        char on_hash;
-
-        /*
-         * expire fifo
-         */
-        struct list_head fifo;
-        unsigned long expires;
-};
-
-static void deadline_move_request(struct deadline_data *dd, struct deadline_rq *drq);
-
-static kmem_cache_t *drq_pool;
-
-#define RQ_DATA(rq)     ((struct deadline_rq *) (rq)->elevator_private)
-
-/*
- * the back merge hash support functions
- */
-static inline void __deadline_del_drq_hash(struct deadline_rq *drq)
-{
-        drq->on_hash = 0;
-        list_del_init(&drq->hash);
-}
-
-static inline void deadline_del_drq_hash(struct deadline_rq *drq)
-{
-        if (ON_HASH(drq))
-                __deadline_del_drq_hash(drq);
-}
-
-static inline void
-deadline_add_drq_hash(struct deadline_data *dd, struct deadline_rq *drq)
-{
-        struct request *rq = drq->request;
-
-        BUG_ON(ON_HASH(drq));
-
-        drq->on_hash = 1;
-        list_add(&drq->hash, &dd->hash[DL_HASH_FN(rq_hash_key(rq))]);
-}
-
-/*
- * move hot entry to front of chain
- */
-static inline void
-deadline_hot_drq_hash(struct deadline_data *dd, struct deadline_rq *drq)
-{
-        struct request *rq = drq->request;
-        struct list_head *head = &dd->hash[DL_HASH_FN(rq_hash_key(rq))];
-
-        if (ON_HASH(drq) && drq->hash.prev != head) {
-                list_del(&drq->hash);
-                list_add(&drq->hash, head);
-        }
-}
-
-static struct request *
-deadline_find_drq_hash(struct deadline_data *dd, sector_t offset)
-{
-        struct list_head *hash_list = &dd->hash[DL_HASH_FN(offset)];
-        struct list_head *entry, *next = hash_list->next;
-
-        while ((entry = next) != hash_list) {
-                struct deadline_rq *drq = list_entry_hash(entry);
-                struct request *__rq = drq->request;
-
-                next = entry->next;
-                
-                BUG_ON(!ON_HASH(drq));
-
-                if (!rq_mergeable(__rq)) {
-                        __deadline_del_drq_hash(drq);
-                        continue;
-                }
-
-                if (rq_hash_key(__rq) == offset)
-                        return __rq;
-        }
-
-        return NULL;
-}
-
-/*
- * rb tree support functions
- */
-#define RB_NONE         (2)
-#define RB_EMPTY(root)  ((root)->rb_node == NULL)
-#define ON_RB(node)     ((node)->rb_color != RB_NONE)
-#define RB_CLEAR(node)  ((node)->rb_color = RB_NONE)
-#define rb_entry_drq(node)      rb_entry((node), struct deadline_rq, rb_node)
-#define DRQ_RB_ROOT(dd, drq)    (&(dd)->sort_list[rq_data_dir((drq)->request)])
-#define rq_rb_key(rq)           (rq)->sector
-
-static struct deadline_rq *
-__deadline_add_drq_rb(struct deadline_data *dd, struct deadline_rq *drq)
-{
-        struct rb_node **p = &DRQ_RB_ROOT(dd, drq)->rb_node;
-        struct rb_node *parent = NULL;
-        struct deadline_rq *__drq;
-
-        while (*p) {
-                parent = *p;
-                __drq = rb_entry_drq(parent);
-
-                if (drq->rb_key < __drq->rb_key)
-                        p = &(*p)->rb_left;
-                else if (drq->rb_key > __drq->rb_key)
-                        p = &(*p)->rb_right;
-                else
-                        return __drq;
-        }
-
-        rb_link_node(&drq->rb_node, parent, p);
-        return NULL;
-}
-
-static void
-deadline_add_drq_rb(struct deadline_data *dd, struct deadline_rq *drq)
-{
-        struct deadline_rq *__alias;
-
-        drq->rb_key = rq_rb_key(drq->request);
-
-retry:
-        __alias = __deadline_add_drq_rb(dd, drq);
-        if (!__alias) {
-                rb_insert_color(&drq->rb_node, DRQ_RB_ROOT(dd, drq));
-                return;
-        }
-
-        deadline_move_request(dd, __alias);
-        goto retry;
-}
-
-static inline void
-deadline_del_drq_rb(struct deadline_data *dd, struct deadline_rq *drq)
-{
-        const int data_dir = rq_data_dir(drq->request);
-
-        if (dd->next_drq[data_dir] == drq) {
-                struct rb_node *rbnext = rb_next(&drq->rb_node);
-
-                dd->next_drq[data_dir] = NULL;
-                if (rbnext)
-                        dd->next_drq[data_dir] = rb_entry_drq(rbnext);
-        }
-
-        BUG_ON(!ON_RB(&drq->rb_node));
-        rb_erase(&drq->rb_node, DRQ_RB_ROOT(dd, drq));
-        RB_CLEAR(&drq->rb_node);
-}
-
-static struct request *
-deadline_find_drq_rb(struct deadline_data *dd, sector_t sector, int data_dir)
-{
-        struct rb_node *n = dd->sort_list[data_dir].rb_node;
-        struct deadline_rq *drq;
-
-        while (n) {
-                drq = rb_entry_drq(n);
-
-                if (sector < drq->rb_key)
-                        n = n->rb_left;
-                else if (sector > drq->rb_key)
-                        n = n->rb_right;
-                else
-                        return drq->request;
-        }
-
-        return NULL;
-}
-
-/*
- * deadline_find_first_drq finds the first (lowest sector numbered) request
- * for the specified data_dir. Used to sweep back to the start of the disk
- * (1-way elevator) after we process the last (highest sector) request.
- */
-static struct deadline_rq *
-deadline_find_first_drq(struct deadline_data *dd, int data_dir)
-{
-        struct rb_node *n = dd->sort_list[data_dir].rb_node;
-
-        for (;;) {
-                if (n->rb_left == NULL)
-                        return rb_entry_drq(n);
-                
-                n = n->rb_left;
-        }
-}
-
-/*
- * add drq to rbtree and fifo
- */
-static void
-deadline_add_request(struct request_queue *q, struct request *rq)
-{
-        struct deadline_data *dd = q->elevator->elevator_data;
-        struct deadline_rq *drq = RQ_DATA(rq);
-
-        const int data_dir = rq_data_dir(drq->request);
-
-        deadline_add_drq_rb(dd, drq);
-        /*
-         * set expire time (only used for reads) and add to fifo list
-         */
-        drq->expires = jiffies + dd->fifo_expire[data_dir];
-        list_add_tail(&drq->fifo, &dd->fifo_list[data_dir]);
-
-        if (rq_mergeable(rq))
-                deadline_add_drq_hash(dd, drq);
-}
-
-/*
- * remove rq from rbtree, fifo, and hash
- */
-static void deadline_remove_request(request_queue_t *q, struct request *rq)
-{
-        struct deadline_rq *drq = RQ_DATA(rq);
-        struct deadline_data *dd = q->elevator->elevator_data;
-
-        list_del_init(&drq->fifo);
-        deadline_del_drq_rb(dd, drq);
-        deadline_del_drq_hash(drq);
-}
-
-static int
-deadline_merge(request_queue_t *q, struct request **req, struct bio *bio)
-{
-        struct deadline_data *dd = q->elevator->elevator_data;
-        struct request *__rq;
-        int ret;
-
-        /*
-         * see if the merge hash can satisfy a back merge
-         */
-        __rq = deadline_find_drq_hash(dd, bio->bi_sector);
-        if (__rq) {
-                BUG_ON(__rq->sector + __rq->nr_sectors != bio->bi_sector);
-
-                if (elv_rq_merge_ok(__rq, bio)) {
-                        ret = ELEVATOR_BACK_MERGE;
-                        goto out;
-                }
-        }
-
-        /*
-         * check for front merge
-         */
-        if (dd->front_merges) {
-                sector_t rb_key = bio->bi_sector + bio_sectors(bio);
-
-                __rq = deadline_find_drq_rb(dd, rb_key, bio_data_dir(bio));
-                if (__rq) {
-                        BUG_ON(rb_key != rq_rb_key(__rq));
-
-                        if (elv_rq_merge_ok(__rq, bio)) {
-                                ret = ELEVATOR_FRONT_MERGE;
-                                goto out;
-                        }
-                }
-        }
-
-        return ELEVATOR_NO_MERGE;
-out:
-        if (ret)
-                deadline_hot_drq_hash(dd, RQ_DATA(__rq));
-        *req = __rq;
-        return ret;
-}
-
-static void deadline_merged_request(request_queue_t *q, struct request *req)
-{
-        struct deadline_data *dd = q->elevator->elevator_data;
-        struct deadline_rq *drq = RQ_DATA(req);
-
-        /*
-         * hash always needs to be repositioned, key is end sector
-         */
-        deadline_del_drq_hash(drq);
-        deadline_add_drq_hash(dd, drq);
-
-        /*
-         * if the merge was a front merge, we need to reposition request
-         */
-        if (rq_rb_key(req) != drq->rb_key) {
-                deadline_del_drq_rb(dd, drq);
-                deadline_add_drq_rb(dd, drq);
-        }
-}
-
-static void
-deadline_merged_requests(request_queue_t *q, struct request *req,
-                         struct request *next)
-{
-        struct deadline_data *dd = q->elevator->elevator_data;
-        struct deadline_rq *drq = RQ_DATA(req);
-        struct deadline_rq *dnext = RQ_DATA(next);
-
-        BUG_ON(!drq);
-        BUG_ON(!dnext);
-
-        /*
-         * reposition drq (this is the merged request) in hash, and in rbtree
-         * in case of a front merge
-         */
-        deadline_del_drq_hash(drq);
-        deadline_add_drq_hash(dd, drq);
-
-        if (rq_rb_key(req) != drq->rb_key) {
-                deadline_del_drq_rb(dd, drq);
-                deadline_add_drq_rb(dd, drq);
-        }
-
-        /*
-         * if dnext expires before drq, assign its expire time to drq
-         * and move into dnext position (dnext will be deleted) in fifo
-         */
-        if (!list_empty(&drq->fifo) && !list_empty(&dnext->fifo)) {
-                if (time_before(dnext->expires, drq->expires)) {
-                        list_move(&drq->fifo, &dnext->fifo);
-                        drq->expires = dnext->expires;
-                }
-        }
-
-        /*
-         * kill knowledge of next, this one is a goner
-         */
-        deadline_remove_request(q, next);
-}
-
-/*
- * move request from sort list to dispatch queue.
- */
-static inline void
-deadline_move_to_dispatch(struct deadline_data *dd, struct deadline_rq *drq)
-{
-        request_queue_t *q = drq->request->q;
-
-        deadline_remove_request(q, drq->request);
-        elv_dispatch_add_tail(q, drq->request);
-}
-
-/*
- * move an entry to dispatch queue
- */
-static void
-deadline_move_request(struct deadline_data *dd, struct deadline_rq *drq)
-{
-        const int data_dir = rq_data_dir(drq->request);
-        struct rb_node *rbnext = rb_next(&drq->rb_node);
-
-        dd->next_drq[READ] = NULL;
-        dd->next_drq[WRITE] = NULL;
-
-        if (rbnext)
-                dd->next_drq[data_dir] = rb_entry_drq(rbnext);
-        
-        dd->last_sector = drq->request->sector + drq->request->nr_sectors;
-
-        /*
-         * take it off the sort and fifo list, move
-         * to dispatch queue
-         */
-        deadline_move_to_dispatch(dd, drq);
-}
-
-#define list_entry_fifo(ptr)    list_entry((ptr), struct deadline_rq, fifo)
-
-/*
- * deadline_check_fifo returns 0 if there are no expired reads on the fifo,
- * 1 otherwise. Requires !list_empty(&dd->fifo_list[data_dir])
- */
-static inline int deadline_check_fifo(struct deadline_data *dd, int ddir)
-{
-        struct deadline_rq *drq = list_entry_fifo(dd->fifo_list[ddir].next);
-
-        /*
-         * drq is expired!
-         */
-        if (time_after(jiffies, drq->expires))
-                return 1;
-
-        return 0;
-}
-
-/*
- * deadline_dispatch_requests selects the best request according to
- * read/write expire, fifo_batch, etc
- */
-static int deadline_dispatch_requests(request_queue_t *q, int force)
-{
-        struct deadline_data *dd = q->elevator->elevator_data;
-        const int reads = !list_empty(&dd->fifo_list[READ]);
-        const int writes = !list_empty(&dd->fifo_list[WRITE]);
-        struct deadline_rq *drq;
-        int data_dir;
-
-        /*
-         * batches are currently reads XOR writes
-         */
-        if (dd->next_drq[WRITE])
-                drq = dd->next_drq[WRITE];
-        else
-                drq = dd->next_drq[READ];
-
-        if (drq) {
-                /* we have a "next request" */
-                
-                if (dd->last_sector != drq->request->sector)
-                        /* end the batch on a non sequential request */
-                        dd->batching += dd->fifo_batch;
-                
-                if (dd->batching < dd->fifo_batch)
-                        /* we are still entitled to batch */
-                        goto dispatch_request;
-        }
-
-        /*
-         * at this point we are not running a batch. select the appropriate
-         * data direction (read / write)
-         */
-
-        if (reads) {
-                BUG_ON(RB_EMPTY(&dd->sort_list[READ]));
-
-                if (writes && (dd->starved++ >= dd->writes_starved))
-                        goto dispatch_writes;
-
-                data_dir = READ;
-
-                goto dispatch_find_request;
-        }
-
-        /*
-         * there are either no reads or writes have been starved
-         */
-
-        if (writes) {
-dispatch_writes:
-                BUG_ON(RB_EMPTY(&dd->sort_list[WRITE]));
-
-                dd->starved = 0;
-
-                data_dir = WRITE;
-
-                goto dispatch_find_request;
-        }
-
-        return 0;
-
-dispatch_find_request:
-        /*
-         * we are not running a batch, find best request for selected data_dir
-         */
-        if (deadline_check_fifo(dd, data_dir)) {
-                /* An expired request exists - satisfy it */
-                dd->batching = 0;
-                drq = list_entry_fifo(dd->fifo_list[data_dir].next);
-                
-        } else if (dd->next_drq[data_dir]) {
-                /*
-                 * The last req was the same dir and we have a next request in
-                 * sort order. No expired requests so continue on from here.
-                 */
-                drq = dd->next_drq[data_dir];
-        } else {
-                /*
-                 * The last req was the other direction or we have run out of
-                 * higher-sectored requests. Go back to the lowest sectored
-                 * request (1 way elevator) and start a new batch.
-                 */
-                dd->batching = 0;
-                drq = deadline_find_first_drq(dd, data_dir);
-        }
-
-dispatch_request:
-        /*
-         * drq is the selected appropriate request.
-         */
-        dd->batching++;
-        deadline_move_request(dd, drq);
-
-        return 1;
-}
-
-static int deadline_queue_empty(request_queue_t *q)
-{
-        struct deadline_data *dd = q->elevator->elevator_data;
-
-        return list_empty(&dd->fifo_list[WRITE])
-                && list_empty(&dd->fifo_list[READ]);
-}
-
-static struct request *
-deadline_former_request(request_queue_t *q, struct request *rq)
-{
-        struct deadline_rq *drq = RQ_DATA(rq);
-        struct rb_node *rbprev = rb_prev(&drq->rb_node);
-
-        if (rbprev)
-                return rb_entry_drq(rbprev)->request;
-
-        return NULL;
-}
-
-static struct request *
-deadline_latter_request(request_queue_t *q, struct request *rq)
-{
-        struct deadline_rq *drq = RQ_DATA(rq);
-        struct rb_node *rbnext = rb_next(&drq->rb_node);
-
-        if (rbnext)
-                return rb_entry_drq(rbnext)->request;
-
-        return NULL;
-}
-
-static void deadline_exit_queue(elevator_t *e)
-{
-        struct deadline_data *dd = e->elevator_data;
-
-        BUG_ON(!list_empty(&dd->fifo_list[READ]));
-        BUG_ON(!list_empty(&dd->fifo_list[WRITE]));
-
-        mempool_destroy(dd->drq_pool);
-        kfree(dd->hash);
-        kfree(dd);
-}
-
-/*
- * initialize elevator private data (deadline_data), and alloc a drq for
- * each request on the free lists
- */
-static int deadline_init_queue(request_queue_t *q, elevator_t *e)
-{
-        struct deadline_data *dd;
-        int i;
-
-        if (!drq_pool)
-                return -ENOMEM;
-
-        dd = kmalloc_node(sizeof(*dd), GFP_KERNEL, q->node);
-        if (!dd)
-                return -ENOMEM;
-        memset(dd, 0, sizeof(*dd));
-
-        dd->hash = kmalloc_node(sizeof(struct list_head)*DL_HASH_ENTRIES,
-                                GFP_KERNEL, q->node);
-        if (!dd->hash) {
-                kfree(dd);
-                return -ENOMEM;
-        }
-
-        dd->drq_pool = mempool_create_node(BLKDEV_MIN_RQ, mempool_alloc_slab,
-                                        mempool_free_slab, drq_pool, q->node);
-        if (!dd->drq_pool) {
-                kfree(dd->hash);
-                kfree(dd);
-                return -ENOMEM;
-        }
-
-        for (i = 0; i < DL_HASH_ENTRIES; i++)
-                INIT_LIST_HEAD(&dd->hash[i]);
-
-        INIT_LIST_HEAD(&dd->fifo_list[READ]);
-        INIT_LIST_HEAD(&dd->fifo_list[WRITE]);
-        dd->sort_list[READ] = RB_ROOT;
-        dd->sort_list[WRITE] = RB_ROOT;
-        dd->fifo_expire[READ] = read_expire;
-        dd->fifo_expire[WRITE] = write_expire;
-        dd->writes_starved = writes_starved;
-        dd->front_merges = 1;
-        dd->fifo_batch = fifo_batch;
-        e->elevator_data = dd;
-        return 0;
-}
-
-static void deadline_put_request(request_queue_t *q, struct request *rq)
-{
-        struct deadline_data *dd = q->elevator->elevator_data;
-        struct deadline_rq *drq = RQ_DATA(rq);
-
-        mempool_free(drq, dd->drq_pool);
-        rq->elevator_private = NULL;
-}
-
-static int
-deadline_set_request(request_queue_t *q, struct request *rq, struct bio *bio,
-                     gfp_t gfp_mask)
-{
-        struct deadline_data *dd = q->elevator->elevator_data;
-        struct deadline_rq *drq;
-
-        drq = mempool_alloc(dd->drq_pool, gfp_mask);
-        if (drq) {
-                memset(drq, 0, sizeof(*drq));
-                RB_CLEAR(&drq->rb_node);
-                drq->request = rq;
-
-                INIT_LIST_HEAD(&drq->hash);
-                drq->on_hash = 0;
-
-                INIT_LIST_HEAD(&drq->fifo);
-
-                rq->elevator_private = drq;
-                return 0;
-        }
-
-        return 1;
-}
-
-/*
- * sysfs parts below
- */
-struct deadline_fs_entry {
-        struct attribute attr;
-        ssize_t (*show)(struct deadline_data *, char *);
-        ssize_t (*store)(struct deadline_data *, const char *, size_t);
-};
-
-static ssize_t
-deadline_var_show(int var, char *page)
-{
-        return sprintf(page, "%d\n", var);
-}
-
-static ssize_t
-deadline_var_store(int *var, const char *page, size_t count)
-{
-        char *p = (char *) page;
-
-        *var = simple_strtol(p, &p, 10);
-        return count;
-}
-
-#define SHOW_FUNCTION(__FUNC, __VAR, __CONV)                            \
-static ssize_t __FUNC(struct deadline_data *dd, char *page)             \
-{                                                                       \
-        int __data = __VAR;                                     \
-        if (__CONV)                                                     \
-                __data = jiffies_to_msecs(__data);                      \
-        return deadline_var_show(__data, (page));                       \
-}
-SHOW_FUNCTION(deadline_readexpire_show, dd->fifo_expire[READ], 1);
-SHOW_FUNCTION(deadline_writeexpire_show, dd->fifo_expire[WRITE], 1);
-SHOW_FUNCTION(deadline_writesstarved_show, dd->writes_starved, 0);
-SHOW_FUNCTION(deadline_frontmerges_show, dd->front_merges, 0);
-SHOW_FUNCTION(deadline_fifobatch_show, dd->fifo_batch, 0);
-#undef SHOW_FUNCTION
-
-#define STORE_FUNCTION(__FUNC, __PTR, MIN, MAX, __CONV)                 \
-static ssize_t __FUNC(struct deadline_data *dd, const char *page, size_t count) \
-{                                                                       \
-        int __data;                                                     \
-        int ret = deadline_var_store(&__data, (page), count);           \
-        if (__data < (MIN))                                             \
-                __data = (MIN);                                         \
-        else if (__data > (MAX))                                        \
-                __data = (MAX);                                         \
-        if (__CONV)                                                     \
-                *(__PTR) = msecs_to_jiffies(__data);                    \
-        else                                                            \
-                *(__PTR) = __data;                                      \
-        return ret;                                                     \
-}
-STORE_FUNCTION(deadline_readexpire_store, &dd->fifo_expire[READ], 0, INT_MAX, 1);
-STORE_FUNCTION(deadline_writeexpire_store, &dd->fifo_expire[WRITE], 0, INT_MAX, 1);
-STORE_FUNCTION(deadline_writesstarved_store, &dd->writes_starved, INT_MIN, INT_MAX, 0);
-STORE_FUNCTION(deadline_frontmerges_store, &dd->front_merges, 0, 1, 0);
-STORE_FUNCTION(deadline_fifobatch_store, &dd->fifo_batch, 0, INT_MAX, 0);
-#undef STORE_FUNCTION
-
-static struct deadline_fs_entry deadline_readexpire_entry = {
-        .attr = {.name = "read_expire", .mode = S_IRUGO | S_IWUSR },
-        .show = deadline_readexpire_show,
-        .store = deadline_readexpire_store,
-};
-static struct deadline_fs_entry deadline_writeexpire_entry = {
-        .attr = {.name = "write_expire", .mode = S_IRUGO | S_IWUSR },
-        .show = deadline_writeexpire_show,
-        .store = deadline_writeexpire_store,
-};
-static struct deadline_fs_entry deadline_writesstarved_entry = {
-        .attr = {.name = "writes_starved", .mode = S_IRUGO | S_IWUSR },
-        .show = deadline_writesstarved_show,
-        .store = deadline_writesstarved_store,
-};
-static struct deadline_fs_entry deadline_frontmerges_entry = {
-        .attr = {.name = "front_merges", .mode = S_IRUGO | S_IWUSR },
-        .show = deadline_frontmerges_show,
-        .store = deadline_frontmerges_store,
-};
-static struct deadline_fs_entry deadline_fifobatch_entry = {
-        .attr = {.name = "fifo_batch", .mode = S_IRUGO | S_IWUSR },
-        .show = deadline_fifobatch_show,
-        .store = deadline_fifobatch_store,
-};
-
-static struct attribute *default_attrs[] = {
-        &deadline_readexpire_entry.attr,
-        &deadline_writeexpire_entry.attr,
-        &deadline_writesstarved_entry.attr,
-        &deadline_frontmerges_entry.attr,
-        &deadline_fifobatch_entry.attr,
-        NULL,
-};
-
-#define to_deadline(atr) container_of((atr), struct deadline_fs_entry, attr)
-
-static ssize_t
-deadline_attr_show(struct kobject *kobj, struct attribute *attr, char *page)
-{
-        elevator_t *e = container_of(kobj, elevator_t, kobj);
-        struct deadline_fs_entry *entry = to_deadline(attr);
-
-        if (!entry->show)
-                return -EIO;
-
-        return entry->show(e->elevator_data, page);
-}
-
-static ssize_t
-deadline_attr_store(struct kobject *kobj, struct attribute *attr,
-                    const char *page, size_t length)
-{
-        elevator_t *e = container_of(kobj, elevator_t, kobj);
-        struct deadline_fs_entry *entry = to_deadline(attr);
-
-        if (!entry->store)
-                return -EIO;
-
-        return entry->store(e->elevator_data, page, length);
-}
-
-static struct sysfs_ops deadline_sysfs_ops = {
-        .show   = deadline_attr_show,
-        .store  = deadline_attr_store,
-};
-
-static struct kobj_type deadline_ktype = {
-        .sysfs_ops      = &deadline_sysfs_ops,
-        .default_attrs  = default_attrs,
-};
-
-static struct elevator_type iosched_deadline = {
-        .ops = {
-                .elevator_merge_fn =            deadline_merge,
-                .elevator_merged_fn =           deadline_merged_request,
-                .elevator_merge_req_fn =        deadline_merged_requests,
-                .elevator_dispatch_fn =         deadline_dispatch_requests,
-                .elevator_add_req_fn =          deadline_add_request,
-                .elevator_queue_empty_fn =      deadline_queue_empty,
-                .elevator_former_req_fn =       deadline_former_request,
-                .elevator_latter_req_fn =       deadline_latter_request,
-                .elevator_set_req_fn =          deadline_set_request,
-                .elevator_put_req_fn =          deadline_put_request,
-                .elevator_init_fn =             deadline_init_queue,
-                .elevator_exit_fn =             deadline_exit_queue,
-        },
-
-        .elevator_ktype = &deadline_ktype,
-        .elevator_name = "deadline",
-        .elevator_owner = THIS_MODULE,
-};
-
-static int __init deadline_init(void)
-{
-        int ret;
-
-        drq_pool = kmem_cache_create("deadline_drq", sizeof(struct deadline_rq),
-                                     0, 0, NULL, NULL);
-
-        if (!drq_pool)
-                return -ENOMEM;
-
-        ret = elv_register(&iosched_deadline);
-        if (ret)
-                kmem_cache_destroy(drq_pool);
-
-        return ret;
-}
-
-static void __exit deadline_exit(void)
-{
-        kmem_cache_destroy(drq_pool);
-        elv_unregister(&iosched_deadline);
-}
-
-module_init(deadline_init);
-module_exit(deadline_exit);
-
-MODULE_AUTHOR("Jens Axboe");
-MODULE_LICENSE("GPL");
-MODULE_DESCRIPTION("deadline IO scheduler");
diff --git a/drivers/block/elevator.c b/drivers/block/elevator.c
deleted file mode 100644
index d4a49a3df829..000000000000
--- a/drivers/block/elevator.c
+++ /dev/null
@@ -1,802 +0,0 @@
-/*
- *  linux/drivers/block/elevator.c
- *
- *  Block device elevator/IO-scheduler.
- *
- *  Copyright (C) 2000 Andrea Arcangeli <andrea@suse.de> SuSE
- *
- * 30042000 Jens Axboe <axboe@suse.de> :
- *
- * Split the elevator a bit so that it is possible to choose a different
- * one or even write a new "plug in". There are three pieces:
- * - elevator_fn, inserts a new request in the queue list
- * - elevator_merge_fn, decides whether a new buffer can be merged with
- *   an existing request
- * - elevator_dequeue_fn, called when a request is taken off the active list
- *
- * 20082000 Dave Jones <davej@suse.de> :
- * Removed tests for max-bomb-segments, which was breaking elvtune
- *  when run without -bN
- *
- * Jens:
- * - Rework again to work with bio instead of buffer_heads
- * - loose bi_dev comparisons, partition handling is right now
- * - completely modularize elevator setup and teardown
- *
- */
-#include <linux/kernel.h>
-#include <linux/fs.h>
-#include <linux/blkdev.h>
-#include <linux/elevator.h>
-#include <linux/bio.h>
-#include <linux/config.h>
-#include <linux/module.h>
-#include <linux/slab.h>
-#include <linux/init.h>
-#include <linux/compiler.h>
-#include <linux/delay.h>
-
-#include <asm/uaccess.h>
-
-static DEFINE_SPINLOCK(elv_list_lock);
-static LIST_HEAD(elv_list);
-
-/*
- * can we safely merge with this request?
- */
-inline int elv_rq_merge_ok(struct request *rq, struct bio *bio)
-{
-        if (!rq_mergeable(rq))
-                return 0;
-
-        /*
-         * different data direction or already started, don't merge
-         */
-        if (bio_data_dir(bio) != rq_data_dir(rq))
-                return 0;
-
-        /*
-         * same device and no special stuff set, merge is ok
-         */
-        if (rq->rq_disk == bio->bi_bdev->bd_disk &&
-            !rq->waiting && !rq->special)
-                return 1;
-
-        return 0;
-}
-EXPORT_SYMBOL(elv_rq_merge_ok);
-
-inline int elv_try_merge(struct request *__rq, struct bio *bio)
-{
-        int ret = ELEVATOR_NO_MERGE;
-
-        /*
-         * we can merge and sequence is ok, check if it's possible
-         */
-        if (elv_rq_merge_ok(__rq, bio)) {
-                if (__rq->sector + __rq->nr_sectors == bio->bi_sector)
-                        ret = ELEVATOR_BACK_MERGE;
-                else if (__rq->sector - bio_sectors(bio) == bio->bi_sector)
-                        ret = ELEVATOR_FRONT_MERGE;
-        }
-
-        return ret;
-}
-EXPORT_SYMBOL(elv_try_merge);
-
-static struct elevator_type *elevator_find(const char *name)
-{
-        struct elevator_type *e = NULL;
-        struct list_head *entry;
-
-        list_for_each(entry, &elv_list) {
-                struct elevator_type *__e;
-
-                __e = list_entry(entry, struct elevator_type, list);
-
-                if (!strcmp(__e->elevator_name, name)) {
-                        e = __e;
-                        break;
-                }
-        }
-
-        return e;
-}
-
-static void elevator_put(struct elevator_type *e)
-{
-        module_put(e->elevator_owner);
-}
-
-static struct elevator_type *elevator_get(const char *name)
-{
-        struct elevator_type *e;
-
-        spin_lock_irq(&elv_list_lock);
-
-        e = elevator_find(name);
-        if (e && !try_module_get(e->elevator_owner))
-                e = NULL;
-
-        spin_unlock_irq(&elv_list_lock);
-
-        return e;
-}
-
-static int elevator_attach(request_queue_t *q, struct elevator_type *e,
-                           struct elevator_queue *eq)
-{
-        int ret = 0;
-
-        memset(eq, 0, sizeof(*eq));
-        eq->ops = &e->ops;
-        eq->elevator_type = e;
-
-        q->elevator = eq;
-
-        if (eq->ops->elevator_init_fn)
-                ret = eq->ops->elevator_init_fn(q, eq);
-
-        return ret;
-}
-
-static char chosen_elevator[16];
-
-static void elevator_setup_default(void)
-{
-        struct elevator_type *e;
-
-        /*
-         * If default has not been set, use the compiled-in selection.
-         */
-        if (!chosen_elevator[0])
-                strcpy(chosen_elevator, CONFIG_DEFAULT_IOSCHED);
-
-        /*
-         * If the given scheduler is not available, fall back to no-op.
-         */
-        if (!(e = elevator_find(chosen_elevator)))
-                strcpy(chosen_elevator, "noop");
-        elevator_put(e);
-}
-
-static int __init elevator_setup(char *str)
-{
-        strncpy(chosen_elevator, str, sizeof(chosen_elevator) - 1);
-        return 0;
-}
-
-__setup("elevator=", elevator_setup);
-
-int elevator_init(request_queue_t *q, char *name)
-{
-        struct elevator_type *e = NULL;
-        struct elevator_queue *eq;
-        int ret = 0;
-
-        INIT_LIST_HEAD(&q->queue_head);
-        q->last_merge = NULL;
-        q->end_sector = 0;
-        q->boundary_rq = NULL;
-
-        elevator_setup_default();
-
-        if (!name)
-                name = chosen_elevator;
-
-        e = elevator_get(name);
-        if (!e)
-                return -EINVAL;
-
-        eq = kmalloc(sizeof(struct elevator_queue), GFP_KERNEL);
-        if (!eq) {
-                elevator_put(e->elevator_type);
-                return -ENOMEM;
-        }
-
-        ret = elevator_attach(q, e, eq);
-        if (ret) {
-                kfree(eq);
-                elevator_put(e->elevator_type);
-        }
-
-        return ret;
-}
-
-void elevator_exit(elevator_t *e)
-{
-        if (e->ops->elevator_exit_fn)
-                e->ops->elevator_exit_fn(e);
-
-        elevator_put(e->elevator_type);
-        e->elevator_type = NULL;
-        kfree(e);
-}
-
-/*
- * Insert rq into dispatch queue of q.  Queue lock must be held on
- * entry.  If sort != 0, rq is sort-inserted; otherwise, rq will be
- * appended to the dispatch queue.  To be used by specific elevators.
- */
-void elv_dispatch_sort(request_queue_t *q, struct request *rq)
-{
-        sector_t boundary;
-        struct list_head *entry;
-
-        if (q->last_merge == rq)
-                q->last_merge = NULL;
-
-        boundary = q->end_sector;
-
-        list_for_each_prev(entry, &q->queue_head) {
-                struct request *pos = list_entry_rq(entry);
-
-                if (pos->flags & (REQ_SOFTBARRIER|REQ_HARDBARRIER|REQ_STARTED))
-                        break;
-                if (rq->sector >= boundary) {
-                        if (pos->sector < boundary)
-                                continue;
-                } else {
-                        if (pos->sector >= boundary)
-                                break;
-                }
-                if (rq->sector >= pos->sector)
-                        break;
-        }
-
-        list_add(&rq->queuelist, entry);
-}
-
-int elv_merge(request_queue_t *q, struct request **req, struct bio *bio)
-{
-        elevator_t *e = q->elevator;
-        int ret;
-
-        if (q->last_merge) {
-                ret = elv_try_merge(q->last_merge, bio);
-                if (ret != ELEVATOR_NO_MERGE) {
-                        *req = q->last_merge;
-                        return ret;
-                }
-        }
-
-        if (e->ops->elevator_merge_fn)
-                return e->ops->elevator_merge_fn(q, req, bio);
-
-        return ELEVATOR_NO_MERGE;
-}
-
-void elv_merged_request(request_queue_t *q, struct request *rq)
-{
-        elevator_t *e = q->elevator;
-
-        if (e->ops->elevator_merged_fn)
-                e->ops->elevator_merged_fn(q, rq);
-
-        q->last_merge = rq;
-}
-
-void elv_merge_requests(request_queue_t *q, struct request *rq,
-                             struct request *next)
-{
-        elevator_t *e = q->elevator;
-
-        if (e->ops->elevator_merge_req_fn)
-                e->ops->elevator_merge_req_fn(q, rq, next);
-
-        q->last_merge = rq;
-}
-
-void elv_requeue_request(request_queue_t *q, struct request *rq)
-{
-        elevator_t *e = q->elevator;
-
-        /*
-         * it already went through dequeue, we need to decrement the
-         * in_flight count again
-         */
-        if (blk_account_rq(rq)) {
-                q->in_flight--;
-                if (blk_sorted_rq(rq) && e->ops->elevator_deactivate_req_fn)
-                        e->ops->elevator_deactivate_req_fn(q, rq);
-        }
-
-        rq->flags &= ~REQ_STARTED;
-
-        /*
-         * if this is the flush, requeue the original instead and drop the flush
-         */
-        if (rq->flags & REQ_BAR_FLUSH) {
-                clear_bit(QUEUE_FLAG_FLUSH, &q->queue_flags);
-                rq = rq->end_io_data;
-        }
-
-        __elv_add_request(q, rq, ELEVATOR_INSERT_FRONT, 0);
-}
-
-void __elv_add_request(request_queue_t *q, struct request *rq, int where,
-                       int plug)
-{
-        if (rq->flags & (REQ_SOFTBARRIER | REQ_HARDBARRIER)) {
-                /*
-                 * barriers implicitly indicate back insertion
-                 */
-                if (where == ELEVATOR_INSERT_SORT)
-                        where = ELEVATOR_INSERT_BACK;
-
-                /*
-                 * this request is scheduling boundary, update end_sector
-                 */
-                if (blk_fs_request(rq)) {
-                        q->end_sector = rq_end_sector(rq);
-                        q->boundary_rq = rq;
-                }
-        } else if (!(rq->flags & REQ_ELVPRIV) && where == ELEVATOR_INSERT_SORT)
-                where = ELEVATOR_INSERT_BACK;
-
-        if (plug)
-                blk_plug_device(q);
-
-        rq->q = q;
-
-        switch (where) {
-        case ELEVATOR_INSERT_FRONT:
-                rq->flags |= REQ_SOFTBARRIER;
-
-                list_add(&rq->queuelist, &q->queue_head);
-                break;
-
-        case ELEVATOR_INSERT_BACK:
-                rq->flags |= REQ_SOFTBARRIER;
-
-                while (q->elevator->ops->elevator_dispatch_fn(q, 1))
-                        ;
-                list_add_tail(&rq->queuelist, &q->queue_head);
-                /*
-                 * We kick the queue here for the following reasons.
-                 * - The elevator might have returned NULL previously
-                 *   to delay requests and returned them now.  As the
-                 *   queue wasn't empty before this request, ll_rw_blk
-                 *   won't run the queue on return, resulting in hang.
-                 * - Usually, back inserted requests won't be merged
-                 *   with anything.  There's no point in delaying queue
-                 *   processing.
-                 */
-                blk_remove_plug(q);
-                q->request_fn(q);
-                break;
-
-        case ELEVATOR_INSERT_SORT:
-                BUG_ON(!blk_fs_request(rq));
-                rq->flags |= REQ_SORTED;
-                if (q->last_merge == NULL && rq_mergeable(rq))
-                        q->last_merge = rq;
-                /*
-                 * Some ioscheds (cfq) run q->request_fn directly, so
-                 * rq cannot be accessed after calling
-                 * elevator_add_req_fn.
-                 */
-                q->elevator->ops->elevator_add_req_fn(q, rq);
-                break;
-
-        default:
-                printk(KERN_ERR "%s: bad insertion point %d\n",
-                       __FUNCTION__, where);
-                BUG();
-        }
-
-        if (blk_queue_plugged(q)) {
-                int nrq = q->rq.count[READ] + q->rq.count[WRITE]
-                        - q->in_flight;
-
-                if (nrq >= q->unplug_thresh)
-                        __generic_unplug_device(q);
-        }
-}
-
-void elv_add_request(request_queue_t *q, struct request *rq, int where,
-                     int plug)
-{
-        unsigned long flags;
-
-        spin_lock_irqsave(q->queue_lock, flags);
-        __elv_add_request(q, rq, where, plug);
-        spin_unlock_irqrestore(q->queue_lock, flags);
-}
-
-static inline struct request *__elv_next_request(request_queue_t *q)
-{
-        struct request *rq;
-
-        if (unlikely(list_empty(&q->queue_head) &&
-                     !q->elevator->ops->elevator_dispatch_fn(q, 0)))
-                return NULL;
-
-        rq = list_entry_rq(q->queue_head.next);
-
-        /*
-         * if this is a barrier write and the device has to issue a
-         * flush sequence to support it, check how far we are
-         */
-        if (blk_fs_request(rq) && blk_barrier_rq(rq)) {
-                BUG_ON(q->ordered == QUEUE_ORDERED_NONE);
-
-                if (q->ordered == QUEUE_ORDERED_FLUSH &&
-                    !blk_barrier_preflush(rq))
-                        rq = blk_start_pre_flush(q, rq);
-        }
-
-        return rq;
-}
-
-struct request *elv_next_request(request_queue_t *q)
-{
-        struct request *rq;
-        int ret;
-
-        while ((rq = __elv_next_request(q)) != NULL) {
-                if (!(rq->flags & REQ_STARTED)) {
-                        elevator_t *e = q->elevator;
-
-                        /*
-                         * This is the first time the device driver
-                         * sees this request (possibly after
-                         * requeueing).  Notify IO scheduler.
-                         */
-                        if (blk_sorted_rq(rq) &&
-                            e->ops->elevator_activate_req_fn)
-                                e->ops->elevator_activate_req_fn(q, rq);
-
-                        /*
-                         * just mark as started even if we don't start
-                         * it, a request that has been delayed should
-                         * not be passed by new incoming requests
-                         */
-                        rq->flags |= REQ_STARTED;
-                }
-
-                if (!q->boundary_rq || q->boundary_rq == rq) {
-                        q->end_sector = rq_end_sector(rq);
-                        q->boundary_rq = NULL;
-                }
-
-                if ((rq->flags & REQ_DONTPREP) || !q->prep_rq_fn)
-                        break;
-
-                ret = q->prep_rq_fn(q, rq);
-                if (ret == BLKPREP_OK) {
-                        break;
-                } else if (ret == BLKPREP_DEFER) {
-                        /*
-                         * the request may have been (partially) prepped.
-                         * we need to keep this request in the front to
-                         * avoid resource deadlock.  REQ_STARTED will
-                         * prevent other fs requests from passing this one.
-                         */
-                        rq = NULL;
-                        break;
-                } else if (ret == BLKPREP_KILL) {
-                        int nr_bytes = rq->hard_nr_sectors << 9;
-
-                        if (!nr_bytes)
-                                nr_bytes = rq->data_len;
-
-                        blkdev_dequeue_request(rq);
-                        rq->flags |= REQ_QUIET;
-                        end_that_request_chunk(rq, 0, nr_bytes);
-                        end_that_request_last(rq);
-                } else {
-                        printk(KERN_ERR "%s: bad return=%d\n", __FUNCTION__,
-                                                                ret);
-                        break;
-                }
-        }
-
-        return rq;
-}
-
-void elv_dequeue_request(request_queue_t *q, struct request *rq)
-{
-        BUG_ON(list_empty(&rq->queuelist));
-
-        list_del_init(&rq->queuelist);
-
-        /*
-         * the time frame between a request being removed from the lists
-         * and to it is freed is accounted as io that is in progress at
-         * the driver side.
-         */
-        if (blk_account_rq(rq))
-                q->in_flight++;
-}
-
-int elv_queue_empty(request_queue_t *q)
-{
-        elevator_t *e = q->elevator;
-
-        if (!list_empty(&q->queue_head))
-                return 0;
-
-        if (e->ops->elevator_queue_empty_fn)
-                return e->ops->elevator_queue_empty_fn(q);
-
-        return 1;
-}
-
-struct request *elv_latter_request(request_queue_t *q, struct request *rq)
-{
-        struct list_head *next;
-
-        elevator_t *e = q->elevator;
-
-        if (e->ops->elevator_latter_req_fn)
-                return e->ops->elevator_latter_req_fn(q, rq);
-
-        next = rq->queuelist.next;
-        if (next != &q->queue_head && next != &rq->queuelist)
-                return list_entry_rq(next);
-
-        return NULL;
-}
-
-struct request *elv_former_request(request_queue_t *q, struct request *rq)
-{
-        struct list_head *prev;
-
-        elevator_t *e = q->elevator;
-
-        if (e->ops->elevator_former_req_fn)
-                return e->ops->elevator_former_req_fn(q, rq);
-
-        prev = rq->queuelist.prev;
-        if (prev != &q->queue_head && prev != &rq->queuelist)
-                return list_entry_rq(prev);
-
-        return NULL;
-}
-
-int elv_set_request(request_queue_t *q, struct request *rq, struct bio *bio,
-                    gfp_t gfp_mask)
-{
-        elevator_t *e = q->elevator;
-
-        if (e->ops->elevator_set_req_fn)
-                return e->ops->elevator_set_req_fn(q, rq, bio, gfp_mask);
-
-        rq->elevator_private = NULL;
-        return 0;
-}
-
-void elv_put_request(request_queue_t *q, struct request *rq)
-{
-        elevator_t *e = q->elevator;
-
-        if (e->ops->elevator_put_req_fn)
-                e->ops->elevator_put_req_fn(q, rq);
-}
-
-int elv_may_queue(request_queue_t *q, int rw, struct bio *bio)
-{
-        elevator_t *e = q->elevator;
-
-        if (e->ops->elevator_may_queue_fn)
-                return e->ops->elevator_may_queue_fn(q, rw, bio);
-
-        return ELV_MQUEUE_MAY;
-}
-
-void elv_completed_request(request_queue_t *q, struct request *rq)
-{
-        elevator_t *e = q->elevator;
-
-        /*
-         * request is released from the driver, io must be done
-         */
-        if (blk_account_rq(rq)) {
-                q->in_flight--;
-                if (blk_sorted_rq(rq) && e->ops->elevator_completed_req_fn)
-                        e->ops->elevator_completed_req_fn(q, rq);
-        }
-}
-
-int elv_register_queue(struct request_queue *q)
-{
-        elevator_t *e = q->elevator;
-
-        e->kobj.parent = kobject_get(&q->kobj);
-        if (!e->kobj.parent)
-                return -EBUSY;
-
-        snprintf(e->kobj.name, KOBJ_NAME_LEN, "%s", "iosched");
-        e->kobj.ktype = e->elevator_type->elevator_ktype;
-
-        return kobject_register(&e->kobj);
-}
-
-void elv_unregister_queue(struct request_queue *q)
-{
-        if (q) {
-                elevator_t *e = q->elevator;
-                kobject_unregister(&e->kobj);
-                kobject_put(&q->kobj);
-        }
-}
-
-int elv_register(struct elevator_type *e)
-{
-        spin_lock_irq(&elv_list_lock);
-        if (elevator_find(e->elevator_name))
-                BUG();
-        list_add_tail(&e->list, &elv_list);
-        spin_unlock_irq(&elv_list_lock);
-
-        printk(KERN_INFO "io scheduler %s registered", e->elevator_name);
-        if (!strcmp(e->elevator_name, chosen_elevator))
-                printk(" (default)");
-        printk("\n");
-        return 0;
-}
-EXPORT_SYMBOL_GPL(elv_register);
-
-void elv_unregister(struct elevator_type *e)
-{
-        struct task_struct *g, *p;
-
-        /*
-         * Iterate every thread in the process to remove the io contexts.
-         */
-        read_lock(&tasklist_lock);
-        do_each_thread(g, p) {
-                struct io_context *ioc = p->io_context;
-                if (ioc && ioc->cic) {
-                        ioc->cic->exit(ioc->cic);
-                        ioc->cic->dtor(ioc->cic);
-                        ioc->cic = NULL;
-                }
-                if (ioc && ioc->aic) {
-                        ioc->aic->exit(ioc->aic);
-                        ioc->aic->dtor(ioc->aic);
-                        ioc->aic = NULL;
-                }
-        } while_each_thread(g, p);
-        read_unlock(&tasklist_lock);
-
-        spin_lock_irq(&elv_list_lock);
-        list_del_init(&e->list);
-        spin_unlock_irq(&elv_list_lock);
-}
-EXPORT_SYMBOL_GPL(elv_unregister);
-
-/*
- * switch to new_e io scheduler. be careful not to introduce deadlocks -
- * we don't free the old io scheduler, before we have allocated what we
- * need for the new one. this way we have a chance of going back to the old
- * one, if the new one fails init for some reason.
- */
-static void elevator_switch(request_queue_t *q, struct elevator_type *new_e)
-{
-        elevator_t *old_elevator, *e;
-
-        /*
-         * Allocate new elevator
-         */
-        e = kmalloc(sizeof(elevator_t), GFP_KERNEL);
-        if (!e)
-                goto error;
-
-        /*
-         * Turn on BYPASS and drain all requests w/ elevator private data
-         */
-        spin_lock_irq(q->queue_lock);
-
-        set_bit(QUEUE_FLAG_ELVSWITCH, &q->queue_flags);
-
-        while (q->elevator->ops->elevator_dispatch_fn(q, 1))
-                ;
-
-        while (q->rq.elvpriv) {
-                spin_unlock_irq(q->queue_lock);
-                msleep(10);
-                spin_lock_irq(q->queue_lock);
-        }
-
-        spin_unlock_irq(q->queue_lock);
-
-        /*
-         * unregister old elevator data
-         */
-        elv_unregister_queue(q);
-        old_elevator = q->elevator;
-
-        /*
-         * attach and start new elevator
-         */
-        if (elevator_attach(q, new_e, e))
-                goto fail;
-
-        if (elv_register_queue(q))
-                goto fail_register;
-
-        /*
-         * finally exit old elevator and turn off BYPASS.
-         */
-        elevator_exit(old_elevator);
-        clear_bit(QUEUE_FLAG_ELVSWITCH, &q->queue_flags);
-        return;
-
-fail_register:
-        /*
-         * switch failed, exit the new io scheduler and reattach the old
-         * one again (along with re-adding the sysfs dir)
-         */
-        elevator_exit(e);
-        e = NULL;
-fail:
-        q->elevator = old_elevator;
-        elv_register_queue(q);
-        clear_bit(QUEUE_FLAG_ELVSWITCH, &q->queue_flags);
-        kfree(e);
-error:
-        elevator_put(new_e);
-        printk(KERN_ERR "elevator: switch to %s failed\n",new_e->elevator_name);
-}
-
-ssize_t elv_iosched_store(request_queue_t *q, const char *name, size_t count)
-{
-        char elevator_name[ELV_NAME_MAX];
-        struct elevator_type *e;
-
-        memset(elevator_name, 0, sizeof(elevator_name));
-        strncpy(elevator_name, name, sizeof(elevator_name));
-
-        if (elevator_name[strlen(elevator_name) - 1] == '\n')
-                elevator_name[strlen(elevator_name) - 1] = '\0';
-
-        e = elevator_get(elevator_name);
-        if (!e) {
-                printk(KERN_ERR "elevator: type %s not found\n", elevator_name);
-                return -EINVAL;
-        }
-
-        if (!strcmp(elevator_name, q->elevator->elevator_type->elevator_name)) {
-                elevator_put(e);
-                return count;
-        }
-
-        elevator_switch(q, e);
-        return count;
-}
-
-ssize_t elv_iosched_show(request_queue_t *q, char *name)
-{
-        elevator_t *e = q->elevator;
-        struct elevator_type *elv = e->elevator_type;
-        struct list_head *entry;
-        int len = 0;
-
-        spin_lock_irq(q->queue_lock);
-        list_for_each(entry, &elv_list) {
-                struct elevator_type *__e;
-
-                __e = list_entry(entry, struct elevator_type, list);
-                if (!strcmp(elv->elevator_name, __e->elevator_name))
-                        len += sprintf(name+len, "[%s] ", elv->elevator_name);
-                else
-                        len += sprintf(name+len, "%s ", __e->elevator_name);
-        }
-        spin_unlock_irq(q->queue_lock);
-
-        len += sprintf(len+name, "\n");
-        return len;
-}
-
-EXPORT_SYMBOL(elv_dispatch_sort);
-EXPORT_SYMBOL(elv_add_request);
-EXPORT_SYMBOL(__elv_add_request);
-EXPORT_SYMBOL(elv_requeue_request);
-EXPORT_SYMBOL(elv_next_request);
-EXPORT_SYMBOL(elv_dequeue_request);
-EXPORT_SYMBOL(elv_queue_empty);
-EXPORT_SYMBOL(elv_completed_request);
-EXPORT_SYMBOL(elevator_exit);
-EXPORT_SYMBOL(elevator_init);
diff --git a/drivers/block/genhd.c b/drivers/block/genhd.c
deleted file mode 100644
index 54aec4a1ae13..000000000000
--- a/drivers/block/genhd.c
+++ /dev/null
@@ -1,726 +0,0 @@
-/*
- *  gendisk handling
- */
-
-#include <linux/config.h>
-#include <linux/module.h>
-#include <linux/fs.h>
-#include <linux/genhd.h>
-#include <linux/kernel.h>
-#include <linux/blkdev.h>
-#include <linux/init.h>
-#include <linux/spinlock.h>
-#include <linux/seq_file.h>
-#include <linux/slab.h>
-#include <linux/kmod.h>
-#include <linux/kobj_map.h>
-#include <linux/buffer_head.h>
-
-#define MAX_PROBE_HASH 255      /* random */
-
-static struct subsystem block_subsys;
-
-static DECLARE_MUTEX(block_subsys_sem);
-
-/*
- * Can be deleted altogether. Later.
- *
- */
-static struct blk_major_name {
-        struct blk_major_name *next;
-        int major;
-        char name[16];
-} *major_names[MAX_PROBE_HASH];
-
-/* index in the above - for now: assume no multimajor ranges */
-static inline int major_to_index(int major)
-{
-        return major % MAX_PROBE_HASH;
-}
-
-#ifdef CONFIG_PROC_FS
-/* get block device names in somewhat random order */
-int get_blkdev_list(char *p, int used)
-{
-        struct blk_major_name *n;
-        int i, len;
-
-        len = snprintf(p, (PAGE_SIZE-used), "\nBlock devices:\n");
-
-        down(&block_subsys_sem);
-        for (i = 0; i < ARRAY_SIZE(major_names); i++) {
-                for (n = major_names[i]; n; n = n->next) {
-                        /*
-                         * If the curent string plus the 5 extra characters
-                         * in the line would run us off the page, then we're done
-                         */
-                        if ((len + used + strlen(n->name) + 5) >= PAGE_SIZE)
-                                goto page_full;
-                        len += sprintf(p+len, "%3d %s\n",
-                                       n->major, n->name);
-                }
-        }
-page_full:
-        up(&block_subsys_sem);
-
-        return len;
-}
-#endif
-
-int register_blkdev(unsigned int major, const char *name)
-{
-        struct blk_major_name **n, *p;
-        int index, ret = 0;
-
-        down(&block_subsys_sem);
-
-        /* temporary */
-        if (major == 0) {
-                for (index = ARRAY_SIZE(major_names)-1; index > 0; index--) {
-                        if (major_names[index] == NULL)
-                                break;
-                }
-
-                if (index == 0) {
-                        printk("register_blkdev: failed to get major for %s\n",
-                               name);
-                        ret = -EBUSY;
-                        goto out;
-                }
-                major = index;
-                ret = major;
-        }
-
-        p = kmalloc(sizeof(struct blk_major_name), GFP_KERNEL);
-        if (p == NULL) {
-                ret = -ENOMEM;
-                goto out;
-        }
-
-        p->major = major;
-        strlcpy(p->name, name, sizeof(p->name));
-        p->next = NULL;
-        index = major_to_index(major);
-
-        for (n = &major_names[index]; *n; n = &(*n)->next) {
-                if ((*n)->major == major)
-                        break;
-        }
-        if (!*n)
-                *n = p;
-        else
-                ret = -EBUSY;
-
-        if (ret < 0) {
-                printk("register_blkdev: cannot get major %d for %s\n",
-                       major, name);
-                kfree(p);
-        }
-out:
-        up(&block_subsys_sem);
-        return ret;
-}
-
-EXPORT_SYMBOL(register_blkdev);
-
-/* todo: make void - error printk here */
-int unregister_blkdev(unsigned int major, const char *name)
-{
-        struct blk_major_name **n;
-        struct blk_major_name *p = NULL;
-        int index = major_to_index(major);
-        int ret = 0;
-
-        down(&block_subsys_sem);
-        for (n = &major_names[index]; *n; n = &(*n)->next)
-                if ((*n)->major == major)
-                        break;
-        if (!*n || strcmp((*n)->name, name))
-                ret = -EINVAL;
-        else {
-                p = *n;
-                *n = p->next;
-        }
-        up(&block_subsys_sem);
-        kfree(p);
-
-        return ret;
-}
-
-EXPORT_SYMBOL(unregister_blkdev);
-
-static struct kobj_map *bdev_map;
-
-/*
- * Register device numbers dev..(dev+range-1)
- * range must be nonzero
- * The hash chain is sorted on range, so that subranges can override.
- */
-void blk_register_region(dev_t dev, unsigned long range, struct module *module,
-                         struct kobject *(*probe)(dev_t, int *, void *),
-                         int (*lock)(dev_t, void *), void *data)
-{
-        kobj_map(bdev_map, dev, range, module, probe, lock, data);
-}
-
-EXPORT_SYMBOL(blk_register_region);
-
-void blk_unregister_region(dev_t dev, unsigned long range)
-{
-        kobj_unmap(bdev_map, dev, range);
-}
-
-EXPORT_SYMBOL(blk_unregister_region);
-
-static struct kobject *exact_match(dev_t dev, int *part, void *data)
-{
-        struct gendisk *p = data;
-        return &p->kobj;
-}
-
-static int exact_lock(dev_t dev, void *data)
-{
-        struct gendisk *p = data;
-
-        if (!get_disk(p))
-                return -1;
-        return 0;
-}
-
-/**
- * add_disk - add partitioning information to kernel list
- * @disk: per-device partitioning information
- *
- * This function registers the partitioning information in @disk
- * with the kernel.
- */
-void add_disk(struct gendisk *disk)
-{
-        disk->flags |= GENHD_FL_UP;
-        blk_register_region(MKDEV(disk->major, disk->first_minor),
-                            disk->minors, NULL, exact_match, exact_lock, disk);
-        register_disk(disk);
-        blk_register_queue(disk);
-}
-
-EXPORT_SYMBOL(add_disk);
-EXPORT_SYMBOL(del_gendisk);     /* in partitions/check.c */
-
-void unlink_gendisk(struct gendisk *disk)
-{
-        blk_unregister_queue(disk);
-        blk_unregister_region(MKDEV(disk->major, disk->first_minor),
-                              disk->minors);
-}
-
-#define to_disk(obj) container_of(obj,struct gendisk,kobj)
-
-/**
- * get_gendisk - get partitioning information for a given device
- * @dev: device to get partitioning information for
- *
- * This function gets the structure containing partitioning
- * information for the given device @dev.
- */
-struct gendisk *get_gendisk(dev_t dev, int *part)
-{
-        struct kobject *kobj = kobj_lookup(bdev_map, dev, part);
-        return  kobj ? to_disk(kobj) : NULL;
-}
-
-#ifdef CONFIG_PROC_FS
-/* iterator */
-static void *part_start(struct seq_file *part, loff_t *pos)
-{
-        struct list_head *p;
-        loff_t l = *pos;
-
-        down(&block_subsys_sem);
-        list_for_each(p, &block_subsys.kset.list)
-                if (!l--)
-                        return list_entry(p, struct gendisk, kobj.entry);
-        return NULL;
-}
-
-static void *part_next(struct seq_file *part, void *v, loff_t *pos)
-{
-        struct list_head *p = ((struct gendisk *)v)->kobj.entry.next;
-        ++*pos;
-        return p==&block_subsys.kset.list ? NULL : 
-                list_entry(p, struct gendisk, kobj.entry);
-}
-
-static void part_stop(struct seq_file *part, void *v)
-{
-        up(&block_subsys_sem);
-}
-
-static int show_partition(struct seq_file *part, void *v)
-{
-        struct gendisk *sgp = v;
-        int n;
-        char buf[BDEVNAME_SIZE];
-
-        if (&sgp->kobj.entry == block_subsys.kset.list.next)
-                seq_puts(part, "major minor  #blocks  name\n\n");
-
-        /* Don't show non-partitionable removeable devices or empty devices */
-        if (!get_capacity(sgp) ||
-                        (sgp->minors == 1 && (sgp->flags & GENHD_FL_REMOVABLE)))
-                return 0;
-        if (sgp->flags & GENHD_FL_SUPPRESS_PARTITION_INFO)
-                return 0;
-
-        /* show the full disk and all non-0 size partitions of it */
-        seq_printf(part, "%4d  %4d %10llu %s\n",
-                sgp->major, sgp->first_minor,
-                (unsigned long long)get_capacity(sgp) >> 1,
-                disk_name(sgp, 0, buf));
-        for (n = 0; n < sgp->minors - 1; n++) {
-                if (!sgp->part[n])
-                        continue;
-                if (sgp->part[n]->nr_sects == 0)
-                        continue;
-                seq_printf(part, "%4d  %4d %10llu %s\n",
-                        sgp->major, n + 1 + sgp->first_minor,
-                        (unsigned long long)sgp->part[n]->nr_sects >> 1 ,
-                        disk_name(sgp, n + 1, buf));
-        }
-
-        return 0;
-}
-
-struct seq_operations partitions_op = {
-        .start =part_start,
-        .next = part_next,
-        .stop = part_stop,
-        .show = show_partition
-};
-#endif
-
-
-extern int blk_dev_init(void);
-
-static struct kobject *base_probe(dev_t dev, int *part, void *data)
-{
-        if (request_module("block-major-%d-%d", MAJOR(dev), MINOR(dev)) > 0)
-                /* Make old-style 2.4 aliases work */
-                request_module("block-major-%d", MAJOR(dev));
-        return NULL;
-}
-
-static int __init genhd_device_init(void)
-{
-        bdev_map = kobj_map_init(base_probe, &block_subsys_sem);
-        blk_dev_init();
-        subsystem_register(&block_subsys);
-        return 0;
-}
-
-subsys_initcall(genhd_device_init);
-
-
-
-/*
- * kobject & sysfs bindings for block devices
- */
-static ssize_t disk_attr_show(struct kobject *kobj, struct attribute *attr,
-                              char *page)
-{
-        struct gendisk *disk = to_disk(kobj);
-        struct disk_attribute *disk_attr =
-                container_of(attr,struct disk_attribute,attr);
-        ssize_t ret = -EIO;
-
-        if (disk_attr->show)
-                ret = disk_attr->show(disk,page);
-        return ret;
-}
-
-static ssize_t disk_attr_store(struct kobject * kobj, struct attribute * attr,
-                               const char *page, size_t count)
-{
-        struct gendisk *disk = to_disk(kobj);
-        struct disk_attribute *disk_attr =
-                container_of(attr,struct disk_attribute,attr);
-        ssize_t ret = 0;
-
-        if (disk_attr->store)
-                ret = disk_attr->store(disk, page, count);
-        return ret;
-}
-
-static struct sysfs_ops disk_sysfs_ops = {
-        .show   = &disk_attr_show,
-        .store  = &disk_attr_store,
-};
-
-static ssize_t disk_uevent_store(struct gendisk * disk,
-                                 const char *buf, size_t count)
-{
-        kobject_hotplug(&disk->kobj, KOBJ_ADD);
-        return count;
-}
-static ssize_t disk_dev_read(struct gendisk * disk, char *page)
-{
-        dev_t base = MKDEV(disk->major, disk->first_minor); 
-        return print_dev_t(page, base);
-}
-static ssize_t disk_range_read(struct gendisk * disk, char *page)
-{
-        return sprintf(page, "%d\n", disk->minors);
-}
-static ssize_t disk_removable_read(struct gendisk * disk, char *page)
-{
-        return sprintf(page, "%d\n",
-                       (disk->flags & GENHD_FL_REMOVABLE ? 1 : 0));
-
-}
-static ssize_t disk_size_read(struct gendisk * disk, char *page)
-{
-        return sprintf(page, "%llu\n", (unsigned long long)get_capacity(disk));
-}
-
-static ssize_t disk_stats_read(struct gendisk * disk, char *page)
-{
-        preempt_disable();
-        disk_round_stats(disk);
-        preempt_enable();
-        return sprintf(page,
-                "%8u %8u %8llu %8u "
-                "%8u %8u %8llu %8u "
-                "%8u %8u %8u"
-                "\n",
-                disk_stat_read(disk, ios[0]), disk_stat_read(disk, merges[0]),
-                (unsigned long long)disk_stat_read(disk, sectors[0]),
-                jiffies_to_msecs(disk_stat_read(disk, ticks[0])),
-                disk_stat_read(disk, ios[1]), disk_stat_read(disk, merges[1]),
-                (unsigned long long)disk_stat_read(disk, sectors[1]),
-                jiffies_to_msecs(disk_stat_read(disk, ticks[1])),
-                disk->in_flight,
-                jiffies_to_msecs(disk_stat_read(disk, io_ticks)),
-                jiffies_to_msecs(disk_stat_read(disk, time_in_queue)));
-}
-static struct disk_attribute disk_attr_uevent = {
-        .attr = {.name = "uevent", .mode = S_IWUSR },
-        .store  = disk_uevent_store
-};
-static struct disk_attribute disk_attr_dev = {
-        .attr = {.name = "dev", .mode = S_IRUGO },
-        .show   = disk_dev_read
-};
-static struct disk_attribute disk_attr_range = {
-        .attr = {.name = "range", .mode = S_IRUGO },
-        .show   = disk_range_read
-};
-static struct disk_attribute disk_attr_removable = {
-        .attr = {.name = "removable", .mode = S_IRUGO },
-        .show   = disk_removable_read
-};
-static struct disk_attribute disk_attr_size = {
-        .attr = {.name = "size", .mode = S_IRUGO },
-        .show   = disk_size_read
-};
-static struct disk_attribute disk_attr_stat = {
-        .attr = {.name = "stat", .mode = S_IRUGO },
-        .show   = disk_stats_read
-};
-
-static struct attribute * default_attrs[] = {
-        &disk_attr_uevent.attr,
-        &disk_attr_dev.attr,
-        &disk_attr_range.attr,
-        &disk_attr_removable.attr,
-        &disk_attr_size.attr,
-        &disk_attr_stat.attr,
-        NULL,
-};
-
-static void disk_release(struct kobject * kobj)
-{
-        struct gendisk *disk = to_disk(kobj);
-        kfree(disk->random);
-        kfree(disk->part);
-        free_disk_stats(disk);
-        kfree(disk);
-}
-
-static struct kobj_type ktype_block = {
-        .release        = disk_release,
-        .sysfs_ops      = &disk_sysfs_ops,
-        .default_attrs  = default_attrs,
-};
-
-extern struct kobj_type ktype_part;
-
-static int block_hotplug_filter(struct kset *kset, struct kobject *kobj)
-{
-        struct kobj_type *ktype = get_ktype(kobj);
-
-        return ((ktype == &ktype_block) || (ktype == &ktype_part));
-}
-
-static int block_hotplug(struct kset *kset, struct kobject *kobj, char **envp,
-                         int num_envp, char *buffer, int buffer_size)
-{
-        struct kobj_type *ktype = get_ktype(kobj);
-        struct device *physdev;
-        struct gendisk *disk;
-        struct hd_struct *part;
-        int length = 0;
-        int i = 0;
-
-        if (ktype == &ktype_block) {
-                disk = container_of(kobj, struct gendisk, kobj);
-                add_hotplug_env_var(envp, num_envp, &i, buffer, buffer_size,
-                                    &length, "MINOR=%u", disk->first_minor);
-        } else if (ktype == &ktype_part) {
-                disk = container_of(kobj->parent, struct gendisk, kobj);
-                part = container_of(kobj, struct hd_struct, kobj);
-                add_hotplug_env_var(envp, num_envp, &i, buffer, buffer_size,
-                                    &length, "MINOR=%u",
-                                    disk->first_minor + part->partno);
-        } else
-                return 0;
-
-        add_hotplug_env_var(envp, num_envp, &i, buffer, buffer_size, &length,
-                            "MAJOR=%u", disk->major);
-
-        /* add physical device, backing this device  */
-        physdev = disk->driverfs_dev;
-        if (physdev) {
-                char *path = kobject_get_path(&physdev->kobj, GFP_KERNEL);
-
-                add_hotplug_env_var(envp, num_envp, &i, buffer, buffer_size,
-                                    &length, "PHYSDEVPATH=%s", path);
-                kfree(path);
-
-                if (physdev->bus)
-                        add_hotplug_env_var(envp, num_envp, &i,
-                                            buffer, buffer_size, &length,
-                                            "PHYSDEVBUS=%s",
-                                            physdev->bus->name);
-
-                if (physdev->driver)
-                        add_hotplug_env_var(envp, num_envp, &i,
-                                            buffer, buffer_size, &length,
-                                            "PHYSDEVDRIVER=%s",
-                                            physdev->driver->name);
-        }
-
-        /* terminate, set to next free slot, shrink available space */
-        envp[i] = NULL;
-        envp = &envp[i];
-        num_envp -= i;
-        buffer = &buffer[length];
-        buffer_size -= length;
-
-        return 0;
-}
-
-static struct kset_hotplug_ops block_hotplug_ops = {
-        .filter         = block_hotplug_filter,
-        .hotplug        = block_hotplug,
-};
-
-/* declare block_subsys. */
-static decl_subsys(block, &ktype_block, &block_hotplug_ops);
-
-
-/*
- * aggregate disk stat collector.  Uses the same stats that the sysfs
- * entries do, above, but makes them available through one seq_file.
- * Watching a few disks may be efficient through sysfs, but watching
- * all of them will be more efficient through this interface.
- *
- * The output looks suspiciously like /proc/partitions with a bunch of
- * extra fields.
- */
-
-/* iterator */
-static void *diskstats_start(struct seq_file *part, loff_t *pos)
-{
-        loff_t k = *pos;
-        struct list_head *p;
-
-        down(&block_subsys_sem);
-        list_for_each(p, &block_subsys.kset.list)
-                if (!k--)
-                        return list_entry(p, struct gendisk, kobj.entry);
-        return NULL;
-}
-
-static void *diskstats_next(struct seq_file *part, void *v, loff_t *pos)
-{
-        struct list_head *p = ((struct gendisk *)v)->kobj.entry.next;
-        ++*pos;
-        return p==&block_subsys.kset.list ? NULL :
-                list_entry(p, struct gendisk, kobj.entry);
-}
-
-static void diskstats_stop(struct seq_file *part, void *v)
-{
-        up(&block_subsys_sem);
-}
-
-static int diskstats_show(struct seq_file *s, void *v)
-{
-        struct gendisk *gp = v;
-        char buf[BDEVNAME_SIZE];
-        int n = 0;
-
-        /*
-        if (&sgp->kobj.entry == block_subsys.kset.list.next)
-                seq_puts(s,     "major minor name"
-                                "     rio rmerge rsect ruse wio wmerge "
-                                "wsect wuse running use aveq"
-                                "\n\n");
-        */
- 
-        preempt_disable();
-        disk_round_stats(gp);
-        preempt_enable();
-        seq_printf(s, "%4d %4d %s %u %u %llu %u %u %u %llu %u %u %u %u\n",
-                gp->major, n + gp->first_minor, disk_name(gp, n, buf),
-                disk_stat_read(gp, ios[0]), disk_stat_read(gp, merges[0]),
-                (unsigned long long)disk_stat_read(gp, sectors[0]),
-                jiffies_to_msecs(disk_stat_read(gp, ticks[0])),
-                disk_stat_read(gp, ios[1]), disk_stat_read(gp, merges[1]),
-                (unsigned long long)disk_stat_read(gp, sectors[1]),
-                jiffies_to_msecs(disk_stat_read(gp, ticks[1])),
-                gp->in_flight,
-                jiffies_to_msecs(disk_stat_read(gp, io_ticks)),
-                jiffies_to_msecs(disk_stat_read(gp, time_in_queue)));
-
-        /* now show all non-0 size partitions of it */
-        for (n = 0; n < gp->minors - 1; n++) {
-                struct hd_struct *hd = gp->part[n];
-
-                if (hd && hd->nr_sects)
-                        seq_printf(s, "%4d %4d %s %u %u %u %u\n",
-                                gp->major, n + gp->first_minor + 1,
-                                disk_name(gp, n + 1, buf),
-                                hd->ios[0], hd->sectors[0],
-                                hd->ios[1], hd->sectors[1]);
-        }
- 
-        return 0;
-}
-
-struct seq_operations diskstats_op = {
-        .start  = diskstats_start,
-        .next   = diskstats_next,
-        .stop   = diskstats_stop,
-        .show   = diskstats_show
-};
-
-struct gendisk *alloc_disk(int minors)
-{
-        return alloc_disk_node(minors, -1);
-}
-
-struct gendisk *alloc_disk_node(int minors, int node_id)
-{
-        struct gendisk *disk;
-
-        disk = kmalloc_node(sizeof(struct gendisk), GFP_KERNEL, node_id);
-        if (disk) {
-                memset(disk, 0, sizeof(struct gendisk));
-                if (!init_disk_stats(disk)) {
-                        kfree(disk);
-                        return NULL;
-                }
-                if (minors > 1) {
-                        int size = (minors - 1) * sizeof(struct hd_struct *);
-                        disk->part = kmalloc_node(size, GFP_KERNEL, node_id);
-                        if (!disk->part) {
-                                kfree(disk);
-                                return NULL;
-                        }
-                        memset(disk->part, 0, size);
-                }
-                disk->minors = minors;
-                kobj_set_kset_s(disk,block_subsys);
-                kobject_init(&disk->kobj);
-                rand_initialize_disk(disk);
-        }
-        return disk;
-}
-
-EXPORT_SYMBOL(alloc_disk);
-EXPORT_SYMBOL(alloc_disk_node);
-
-struct kobject *get_disk(struct gendisk *disk)
-{
-        struct module *owner;
-        struct kobject *kobj;
-
-        if (!disk->fops)
-                return NULL;
-        owner = disk->fops->owner;
-        if (owner && !try_module_get(owner))
-                return NULL;
-        kobj = kobject_get(&disk->kobj);
-        if (kobj == NULL) {
-                module_put(owner);
-                return NULL;
-        }
-        return kobj;
-
-}
-
-EXPORT_SYMBOL(get_disk);
-
-void put_disk(struct gendisk *disk)
-{
-        if (disk)
-                kobject_put(&disk->kobj);
-}
-
-EXPORT_SYMBOL(put_disk);
-
-void set_device_ro(struct block_device *bdev, int flag)
-{
-        if (bdev->bd_contains != bdev)
-                bdev->bd_part->policy = flag;
-        else
-                bdev->bd_disk->policy = flag;
-}
-
-EXPORT_SYMBOL(set_device_ro);
-
-void set_disk_ro(struct gendisk *disk, int flag)
-{
-        int i;
-        disk->policy = flag;
-        for (i = 0; i < disk->minors - 1; i++)
-                if (disk->part[i]) disk->part[i]->policy = flag;
-}
-
-EXPORT_SYMBOL(set_disk_ro);
-
-int bdev_read_only(struct block_device *bdev)
-{
-        if (!bdev)
-                return 0;
-        else if (bdev->bd_contains != bdev)
-                return bdev->bd_part->policy;
-        else
-                return bdev->bd_disk->policy;
-}
-
-EXPORT_SYMBOL(bdev_read_only);
-
-int invalidate_partition(struct gendisk *disk, int index)
-{
-        int res = 0;
-        struct block_device *bdev = bdget_disk(disk, index);
-        if (bdev) {
-                fsync_bdev(bdev);
-                res = __invalidate_device(bdev);
-                bdput(bdev);
-        }
-        return res;
-}
-
-EXPORT_SYMBOL(invalidate_partition);
diff --git a/drivers/block/ioctl.c b/drivers/block/ioctl.c
deleted file mode 100644
index 6e278474f9a8..000000000000
--- a/drivers/block/ioctl.c
+++ /dev/null
@@ -1,275 +0,0 @@
-#include <linux/sched.h>                /* for capable() */
-#include <linux/blkdev.h>
-#include <linux/blkpg.h>
-#include <linux/backing-dev.h>
-#include <linux/buffer_head.h>
-#include <linux/smp_lock.h>
-#include <asm/uaccess.h>
-
-static int blkpg_ioctl(struct block_device *bdev, struct blkpg_ioctl_arg __user *arg)
-{
-        struct block_device *bdevp;
-        struct gendisk *disk;
-        struct blkpg_ioctl_arg a;
-        struct blkpg_partition p;
-        long long start, length;
-        int part;
-        int i;
-
-        if (!capable(CAP_SYS_ADMIN))
-                return -EACCES;
-        if (copy_from_user(&a, arg, sizeof(struct blkpg_ioctl_arg)))
-                return -EFAULT;
-        if (copy_from_user(&p, a.data, sizeof(struct blkpg_partition)))
-                return -EFAULT;
-        disk = bdev->bd_disk;
-        if (bdev != bdev->bd_contains)
-                return -EINVAL;
-        part = p.pno;
-        if (part <= 0 || part >= disk->minors)
-                return -EINVAL;
-        switch (a.op) {
-                case BLKPG_ADD_PARTITION:
-                        start = p.start >> 9;
-                        length = p.length >> 9;
-                        /* check for fit in a hd_struct */ 
-                        if (sizeof(sector_t) == sizeof(long) && 
-                            sizeof(long long) > sizeof(long)) {
-                                long pstart = start, plength = length;
-                                if (pstart != start || plength != length
-                                    || pstart < 0 || plength < 0)
-                                        return -EINVAL;
-                        }
-                        /* partition number in use? */
-                        down(&bdev->bd_sem);
-                        if (disk->part[part - 1]) {
-                                up(&bdev->bd_sem);
-                                return -EBUSY;
-                        }
-                        /* overlap? */
-                        for (i = 0; i < disk->minors - 1; i++) {
-                                struct hd_struct *s = disk->part[i];
-
-                                if (!s)
-                                        continue;
-                                if (!(start+length <= s->start_sect ||
-                                      start >= s->start_sect + s->nr_sects)) {
-                                        up(&bdev->bd_sem);
-                                        return -EBUSY;
-                                }
-                        }
-                        /* all seems OK */
-                        add_partition(disk, part, start, length);
-                        up(&bdev->bd_sem);
-                        return 0;
-                case BLKPG_DEL_PARTITION:
-                        if (!disk->part[part-1])
-                                return -ENXIO;
-                        if (disk->part[part - 1]->nr_sects == 0)
-                                return -ENXIO;
-                        bdevp = bdget_disk(disk, part);
-                        if (!bdevp)
-                                return -ENOMEM;
-                        down(&bdevp->bd_sem);
-                        if (bdevp->bd_openers) {
-                                up(&bdevp->bd_sem);
-                                bdput(bdevp);
-                                return -EBUSY;
-                        }
-                        /* all seems OK */
-                        fsync_bdev(bdevp);
-                        invalidate_bdev(bdevp, 0);
-
-                        down(&bdev->bd_sem);
-                        delete_partition(disk, part);
-                        up(&bdev->bd_sem);
-                        up(&bdevp->bd_sem);
-                        bdput(bdevp);
-
-                        return 0;
-                default:
-                        return -EINVAL;
-        }
-}
-
-static int blkdev_reread_part(struct block_device *bdev)
-{
-        struct gendisk *disk = bdev->bd_disk;
-        int res;
-
-        if (disk->minors == 1 || bdev != bdev->bd_contains)
-                return -EINVAL;
-        if (!capable(CAP_SYS_ADMIN))
-                return -EACCES;
-        if (down_trylock(&bdev->bd_sem))
-                return -EBUSY;
-        res = rescan_partitions(disk, bdev);
-        up(&bdev->bd_sem);
-        return res;
-}
-
-static int put_ushort(unsigned long arg, unsigned short val)
-{
-        return put_user(val, (unsigned short __user *)arg);
-}
-
-static int put_int(unsigned long arg, int val)
-{
-        return put_user(val, (int __user *)arg);
-}
-
-static int put_long(unsigned long arg, long val)
-{
-        return put_user(val, (long __user *)arg);
-}
-
-static int put_ulong(unsigned long arg, unsigned long val)
-{
-        return put_user(val, (unsigned long __user *)arg);
-}
-
-static int put_u64(unsigned long arg, u64 val)
-{
-        return put_user(val, (u64 __user *)arg);
-}
-
-static int blkdev_locked_ioctl(struct file *file, struct block_device *bdev,
-                                unsigned cmd, unsigned long arg)
-{
-        struct backing_dev_info *bdi;
-        int ret, n;
-
-        switch (cmd) {
-        case BLKRAGET:
-        case BLKFRAGET:
-                if (!arg)
-                        return -EINVAL;
-                bdi = blk_get_backing_dev_info(bdev);
-                if (bdi == NULL)
-                        return -ENOTTY;
-                return put_long(arg, (bdi->ra_pages * PAGE_CACHE_SIZE) / 512);
-        case BLKROGET:
-                return put_int(arg, bdev_read_only(bdev) != 0);
-        case BLKBSZGET: /* get the logical block size (cf. BLKSSZGET) */
-                return put_int(arg, block_size(bdev));
-        case BLKSSZGET: /* get block device hardware sector size */
-                return put_int(arg, bdev_hardsect_size(bdev));
-        case BLKSECTGET:
-                return put_ushort(arg, bdev_get_queue(bdev)->max_sectors);
-        case BLKRASET:
-        case BLKFRASET:
-                if(!capable(CAP_SYS_ADMIN))
-                        return -EACCES;
-                bdi = blk_get_backing_dev_info(bdev);
-                if (bdi == NULL)
-                        return -ENOTTY;
-                bdi->ra_pages = (arg * 512) / PAGE_CACHE_SIZE;
-                return 0;
-        case BLKBSZSET:
-                /* set the logical block size */
-                if (!capable(CAP_SYS_ADMIN))
-                        return -EACCES;
-                if (!arg)
-                        return -EINVAL;
-                if (get_user(n, (int __user *) arg))
-                        return -EFAULT;
-                if (bd_claim(bdev, file) < 0)
-                        return -EBUSY;
-                ret = set_blocksize(bdev, n);
-                bd_release(bdev);
-                return ret;
-        case BLKPG:
-                return blkpg_ioctl(bdev, (struct blkpg_ioctl_arg __user *) arg);
-        case BLKRRPART:
-                return blkdev_reread_part(bdev);
-        case BLKGETSIZE:
-                if ((bdev->bd_inode->i_size >> 9) > ~0UL)
-                        return -EFBIG;
-                return put_ulong(arg, bdev->bd_inode->i_size >> 9);
-        case BLKGETSIZE64:
-                return put_u64(arg, bdev->bd_inode->i_size);
-        }
-        return -ENOIOCTLCMD;
-}
-
-static int blkdev_driver_ioctl(struct inode *inode, struct file *file,
-                struct gendisk *disk, unsigned cmd, unsigned long arg)
-{
-        int ret;
-        if (disk->fops->unlocked_ioctl)
-                return disk->fops->unlocked_ioctl(file, cmd, arg);
-
-        if (disk->fops->ioctl) {
-                lock_kernel();
-                ret = disk->fops->ioctl(inode, file, cmd, arg);
-                unlock_kernel();
-                return ret;
-        }
-
-        return -ENOTTY;
-}
-
-int blkdev_ioctl(struct inode *inode, struct file *file, unsigned cmd,
-                        unsigned long arg)
-{
-        struct block_device *bdev = inode->i_bdev;
-        struct gendisk *disk = bdev->bd_disk;
-        int ret, n;
-
-        switch(cmd) {
-        case BLKFLSBUF:
-                if (!capable(CAP_SYS_ADMIN))
-                        return -EACCES;
-
-                ret = blkdev_driver_ioctl(inode, file, disk, cmd, arg);
-                /* -EINVAL to handle old uncorrected drivers */
-                if (ret != -EINVAL && ret != -ENOTTY)
-                        return ret;
-
-                lock_kernel();
-                fsync_bdev(bdev);
-                invalidate_bdev(bdev, 0);
-                unlock_kernel();
-                return 0;
-
-        case BLKROSET:
-                ret = blkdev_driver_ioctl(inode, file, disk, cmd, arg);
-                /* -EINVAL to handle old uncorrected drivers */
-                if (ret != -EINVAL && ret != -ENOTTY)
-                        return ret;
-                if (!capable(CAP_SYS_ADMIN))
-                        return -EACCES;
-                if (get_user(n, (int __user *)(arg)))
-                        return -EFAULT;
-                lock_kernel();
-                set_device_ro(bdev, n);
-                unlock_kernel();
-                return 0;
-        }
-
-        lock_kernel();
-        ret = blkdev_locked_ioctl(file, bdev, cmd, arg);
-        unlock_kernel();
-        if (ret != -ENOIOCTLCMD)
-                return ret;
-
-        return blkdev_driver_ioctl(inode, file, disk, cmd, arg);
-}
-
-/* Most of the generic ioctls are handled in the normal fallback path.
-   This assumes the blkdev's low level compat_ioctl always returns
-   ENOIOCTLCMD for unknown ioctls. */
-long compat_blkdev_ioctl(struct file *file, unsigned cmd, unsigned long arg)
-{
-        struct block_device *bdev = file->f_dentry->d_inode->i_bdev;
-        struct gendisk *disk = bdev->bd_disk;
-        int ret = -ENOIOCTLCMD;
-        if (disk->fops->compat_ioctl) {
-                lock_kernel();
-                ret = disk->fops->compat_ioctl(file, cmd, arg);
-                unlock_kernel();
-        }
-        return ret;
-}
-
-EXPORT_SYMBOL_GPL(blkdev_ioctl);
diff --git a/drivers/block/ll_rw_blk.c b/drivers/block/ll_rw_blk.c
deleted file mode 100644
index 2747741677fb..000000000000
--- a/drivers/block/ll_rw_blk.c
+++ /dev/null
@@ -1,3613 +0,0 @@
-/*
- *  linux/drivers/block/ll_rw_blk.c
- *
- * Copyright (C) 1991, 1992 Linus Torvalds
- * Copyright (C) 1994,      Karl Keyte: Added support for disk statistics
- * Elevator latency, (C) 2000  Andrea Arcangeli <andrea@suse.de> SuSE
- * Queue request tables / lock, selectable elevator, Jens Axboe <axboe@suse.de>
- * kernel-doc documentation started by NeilBrown <neilb@cse.unsw.edu.au> -  July2000
- * bio rewrite, highmem i/o, etc, Jens Axboe <axboe@suse.de> - may 2001
- */
-
-/*
- * This handles all read/write requests to block devices
- */
-#include <linux/config.h>
-#include <linux/kernel.h>
-#include <linux/module.h>
-#include <linux/backing-dev.h>
-#include <linux/bio.h>
-#include <linux/blkdev.h>
-#include <linux/highmem.h>
-#include <linux/mm.h>
-#include <linux/kernel_stat.h>
-#include <linux/string.h>
-#include <linux/init.h>
-#include <linux/bootmem.h>      /* for max_pfn/max_low_pfn */
-#include <linux/completion.h>
-#include <linux/slab.h>
-#include <linux/swap.h>
-#include <linux/writeback.h>
-#include <linux/blkdev.h>
-
-/*
- * for max sense size
- */
-#include <scsi/scsi_cmnd.h>
-
-static void blk_unplug_work(void *data);
-static void blk_unplug_timeout(unsigned long data);
-static void drive_stat_acct(struct request *rq, int nr_sectors, int new_io);
-
-/*
- * For the allocated request tables
- */
-static kmem_cache_t *request_cachep;
-
-/*
- * For queue allocation
- */
-static kmem_cache_t *requestq_cachep;
-
-/*
- * For io context allocations
- */
-static kmem_cache_t *iocontext_cachep;
-
-static wait_queue_head_t congestion_wqh[2] = {
-                __WAIT_QUEUE_HEAD_INITIALIZER(congestion_wqh[0]),
-                __WAIT_QUEUE_HEAD_INITIALIZER(congestion_wqh[1])
-        };
-
-/*
- * Controlling structure to kblockd
- */
-static struct workqueue_struct *kblockd_workqueue; 
-
-unsigned long blk_max_low_pfn, blk_max_pfn;
-
-EXPORT_SYMBOL(blk_max_low_pfn);
-EXPORT_SYMBOL(blk_max_pfn);
-
-/* Amount of time in which a process may batch requests */
-#define BLK_BATCH_TIME  (HZ/50UL)
-
-/* Number of requests a "batching" process may submit */
-#define BLK_BATCH_REQ   32
-
-/*
- * Return the threshold (number of used requests) at which the queue is
- * considered to be congested.  It include a little hysteresis to keep the
- * context switch rate down.
- */
-static inline int queue_congestion_on_threshold(struct request_queue *q)
-{
-        return q->nr_congestion_on;
-}
-
-/*
- * The threshold at which a queue is considered to be uncongested
- */
-static inline int queue_congestion_off_threshold(struct request_queue *q)
-{
-        return q->nr_congestion_off;
-}
-
-static void blk_queue_congestion_threshold(struct request_queue *q)
-{
-        int nr;
-
-        nr = q->nr_requests - (q->nr_requests / 8) + 1;
-        if (nr > q->nr_requests)
-                nr = q->nr_requests;
-        q->nr_congestion_on = nr;
-
-        nr = q->nr_requests - (q->nr_requests / 8) - (q->nr_requests / 16) - 1;
-        if (nr < 1)
-                nr = 1;
-        q->nr_congestion_off = nr;
-}
-
-/*
- * A queue has just exitted congestion.  Note this in the global counter of
- * congested queues, and wake up anyone who was waiting for requests to be
- * put back.
- */
-static void clear_queue_congested(request_queue_t *q, int rw)
-{
-        enum bdi_state bit;
-        wait_queue_head_t *wqh = &congestion_wqh[rw];
-
-        bit = (rw == WRITE) ? BDI_write_congested : BDI_read_congested;
-        clear_bit(bit, &q->backing_dev_info.state);
-        smp_mb__after_clear_bit();
-        if (waitqueue_active(wqh))
-                wake_up(wqh);
-}
-
-/*
- * A queue has just entered congestion.  Flag that in the queue's VM-visible
- * state flags and increment the global gounter of congested queues.
- */
-static void set_queue_congested(request_queue_t *q, int rw)
-{
-        enum bdi_state bit;
-
-        bit = (rw == WRITE) ? BDI_write_congested : BDI_read_congested;
-        set_bit(bit, &q->backing_dev_info.state);
-}
-
-/**
- * blk_get_backing_dev_info - get the address of a queue's backing_dev_info
- * @bdev:       device
- *
- * Locates the passed device's request queue and returns the address of its
- * backing_dev_info
- *
- * Will return NULL if the request queue cannot be located.
- */
-struct backing_dev_info *blk_get_backing_dev_info(struct block_device *bdev)
-{
-        struct backing_dev_info *ret = NULL;
-        request_queue_t *q = bdev_get_queue(bdev);
-
-        if (q)
-                ret = &q->backing_dev_info;
-        return ret;
-}
-
-EXPORT_SYMBOL(blk_get_backing_dev_info);
-
-void blk_queue_activity_fn(request_queue_t *q, activity_fn *fn, void *data)
-{
-        q->activity_fn = fn;
-        q->activity_data = data;
-}
-
-EXPORT_SYMBOL(blk_queue_activity_fn);
-
-/**
- * blk_queue_prep_rq - set a prepare_request function for queue
- * @q:          queue
- * @pfn:        prepare_request function
- *
- * It's possible for a queue to register a prepare_request callback which
- * is invoked before the request is handed to the request_fn. The goal of
- * the function is to prepare a request for I/O, it can be used to build a
- * cdb from the request data for instance.
- *
- */
-void blk_queue_prep_rq(request_queue_t *q, prep_rq_fn *pfn)
-{
-        q->prep_rq_fn = pfn;
-}
-
-EXPORT_SYMBOL(blk_queue_prep_rq);
-
-/**
- * blk_queue_merge_bvec - set a merge_bvec function for queue
- * @q:          queue
- * @mbfn:       merge_bvec_fn
- *
- * Usually queues have static limitations on the max sectors or segments that
- * we can put in a request. Stacking drivers may have some settings that
- * are dynamic, and thus we have to query the queue whether it is ok to
- * add a new bio_vec to a bio at a given offset or not. If the block device
- * has such limitations, it needs to register a merge_bvec_fn to control
- * the size of bio's sent to it. Note that a block device *must* allow a
- * single page to be added to an empty bio. The block device driver may want
- * to use the bio_split() function to deal with these bio's. By default
- * no merge_bvec_fn is defined for a queue, and only the fixed limits are
- * honored.
- */
-void blk_queue_merge_bvec(request_queue_t *q, merge_bvec_fn *mbfn)
-{
-        q->merge_bvec_fn = mbfn;
-}
-
-EXPORT_SYMBOL(blk_queue_merge_bvec);
-
-/**
- * blk_queue_make_request - define an alternate make_request function for a device
- * @q:  the request queue for the device to be affected
- * @mfn: the alternate make_request function
- *
- * Description:
- *    The normal way for &struct bios to be passed to a device
- *    driver is for them to be collected into requests on a request
- *    queue, and then to allow the device driver to select requests
- *    off that queue when it is ready.  This works well for many block
- *    devices. However some block devices (typically virtual devices
- *    such as md or lvm) do not benefit from the processing on the
- *    request queue, and are served best by having the requests passed
- *    directly to them.  This can be achieved by providing a function
- *    to blk_queue_make_request().
- *
- * Caveat:
- *    The driver that does this *must* be able to deal appropriately
- *    with buffers in "highmemory". This can be accomplished by either calling
- *    __bio_kmap_atomic() to get a temporary kernel mapping, or by calling
- *    blk_queue_bounce() to create a buffer in normal memory.
- **/
-void blk_queue_make_request(request_queue_t * q, make_request_fn * mfn)
-{
-        /*
-         * set defaults
-         */
-        q->nr_requests = BLKDEV_MAX_RQ;
-        blk_queue_max_phys_segments(q, MAX_PHYS_SEGMENTS);
-        blk_queue_max_hw_segments(q, MAX_HW_SEGMENTS);
-        q->make_request_fn = mfn;
-        q->backing_dev_info.ra_pages = (VM_MAX_READAHEAD * 1024) / PAGE_CACHE_SIZE;
-        q->backing_dev_info.state = 0;
-        q->backing_dev_info.capabilities = BDI_CAP_MAP_COPY;
-        blk_queue_max_sectors(q, MAX_SECTORS);
-        blk_queue_hardsect_size(q, 512);
-        blk_queue_dma_alignment(q, 511);
-        blk_queue_congestion_threshold(q);
-        q->nr_batching = BLK_BATCH_REQ;
-
-        q->unplug_thresh = 4;           /* hmm */
-        q->unplug_delay = (3 * HZ) / 1000;      /* 3 milliseconds */
-        if (q->unplug_delay == 0)
-                q->unplug_delay = 1;
-
-        INIT_WORK(&q->unplug_work, blk_unplug_work, q);
-
-        q->unplug_timer.function = blk_unplug_timeout;
-        q->unplug_timer.data = (unsigned long)q;
-
-        /*
-         * by default assume old behaviour and bounce for any highmem page
-         */
-        blk_queue_bounce_limit(q, BLK_BOUNCE_HIGH);
-
-        blk_queue_activity_fn(q, NULL, NULL);
-}
-
-EXPORT_SYMBOL(blk_queue_make_request);
-
-static inline void rq_init(request_queue_t *q, struct request *rq)
-{
-        INIT_LIST_HEAD(&rq->queuelist);
-
-        rq->errors = 0;
-        rq->rq_status = RQ_ACTIVE;
-        rq->bio = rq->biotail = NULL;
-        rq->ioprio = 0;
-        rq->buffer = NULL;
-        rq->ref_count = 1;
-        rq->q = q;
-        rq->waiting = NULL;
-        rq->special = NULL;
-        rq->data_len = 0;
-        rq->data = NULL;
-        rq->nr_phys_segments = 0;
-        rq->sense = NULL;
-        rq->end_io = NULL;
-        rq->end_io_data = NULL;
-}
-
-/**
- * blk_queue_ordered - does this queue support ordered writes
- * @q:     the request queue
- * @flag:  see below
- *
- * Description:
- *   For journalled file systems, doing ordered writes on a commit
- *   block instead of explicitly doing wait_on_buffer (which is bad
- *   for performance) can be a big win. Block drivers supporting this
- *   feature should call this function and indicate so.
- *
- **/
-void blk_queue_ordered(request_queue_t *q, int flag)
-{
-        switch (flag) {
-                case QUEUE_ORDERED_NONE:
-                        if (q->flush_rq)
-                                kmem_cache_free(request_cachep, q->flush_rq);
-                        q->flush_rq = NULL;
-                        q->ordered = flag;
-                        break;
-                case QUEUE_ORDERED_TAG:
-                        q->ordered = flag;
-                        break;
-                case QUEUE_ORDERED_FLUSH:
-                        q->ordered = flag;
-                        if (!q->flush_rq)
-                                q->flush_rq = kmem_cache_alloc(request_cachep,
-                                                                GFP_KERNEL);
-                        break;
-                default:
-                        printk("blk_queue_ordered: bad value %d\n", flag);
-                        break;
-        }
-}
-
-EXPORT_SYMBOL(blk_queue_ordered);
-
-/**
- * blk_queue_issue_flush_fn - set function for issuing a flush
- * @q:     the request queue
- * @iff:   the function to be called issuing the flush
- *
- * Description:
- *   If a driver supports issuing a flush command, the support is notified
- *   to the block layer by defining it through this call.
- *
- **/
-void blk_queue_issue_flush_fn(request_queue_t *q, issue_flush_fn *iff)
-{
-        q->issue_flush_fn = iff;
-}
-
-EXPORT_SYMBOL(blk_queue_issue_flush_fn);
-
-/*
- * Cache flushing for ordered writes handling
- */
-static void blk_pre_flush_end_io(struct request *flush_rq)
-{
-        struct request *rq = flush_rq->end_io_data;
-        request_queue_t *q = rq->q;
-
-        elv_completed_request(q, flush_rq);
-
-        rq->flags |= REQ_BAR_PREFLUSH;
-
-        if (!flush_rq->errors)
-                elv_requeue_request(q, rq);
-        else {
-                q->end_flush_fn(q, flush_rq);
-                clear_bit(QUEUE_FLAG_FLUSH, &q->queue_flags);
-                q->request_fn(q);
-        }
-}
-
-static void blk_post_flush_end_io(struct request *flush_rq)
-{
-        struct request *rq = flush_rq->end_io_data;
-        request_queue_t *q = rq->q;
-
-        elv_completed_request(q, flush_rq);
-
-        rq->flags |= REQ_BAR_POSTFLUSH;
-
-        q->end_flush_fn(q, flush_rq);
-        clear_bit(QUEUE_FLAG_FLUSH, &q->queue_flags);
-        q->request_fn(q);
-}
-
-struct request *blk_start_pre_flush(request_queue_t *q, struct request *rq)
-{
-        struct request *flush_rq = q->flush_rq;
-
-        BUG_ON(!blk_barrier_rq(rq));
-
-        if (test_and_set_bit(QUEUE_FLAG_FLUSH, &q->queue_flags))
-                return NULL;
-
-        rq_init(q, flush_rq);
-        flush_rq->elevator_private = NULL;
-        flush_rq->flags = REQ_BAR_FLUSH;
-        flush_rq->rq_disk = rq->rq_disk;
-        flush_rq->rl = NULL;
-
-        /*
-         * prepare_flush returns 0 if no flush is needed, just mark both
-         * pre and post flush as done in that case
-         */
-        if (!q->prepare_flush_fn(q, flush_rq)) {
-                rq->flags |= REQ_BAR_PREFLUSH | REQ_BAR_POSTFLUSH;
-                clear_bit(QUEUE_FLAG_FLUSH, &q->queue_flags);
-                return rq;
-        }
-
-        /*
-         * some drivers dequeue requests right away, some only after io
-         * completion. make sure the request is dequeued.
-         */
-        if (!list_empty(&rq->queuelist))
-                blkdev_dequeue_request(rq);
-
-        flush_rq->end_io_data = rq;
-        flush_rq->end_io = blk_pre_flush_end_io;
-
-        __elv_add_request(q, flush_rq, ELEVATOR_INSERT_FRONT, 0);
-        return flush_rq;
-}
-
-static void blk_start_post_flush(request_queue_t *q, struct request *rq)
-{
-        struct request *flush_rq = q->flush_rq;
-
-        BUG_ON(!blk_barrier_rq(rq));
-
-        rq_init(q, flush_rq);
-        flush_rq->elevator_private = NULL;
-        flush_rq->flags = REQ_BAR_FLUSH;
-        flush_rq->rq_disk = rq->rq_disk;
-        flush_rq->rl = NULL;
-
-        if (q->prepare_flush_fn(q, flush_rq)) {
-                flush_rq->end_io_data = rq;
-                flush_rq->end_io = blk_post_flush_end_io;
-
-                __elv_add_request(q, flush_rq, ELEVATOR_INSERT_FRONT, 0);
-                q->request_fn(q);
-        }
-}
-
-static inline int blk_check_end_barrier(request_queue_t *q, struct request *rq,
-                                        int sectors)
-{
-        if (sectors > rq->nr_sectors)
-                sectors = rq->nr_sectors;
-
-        rq->nr_sectors -= sectors;
-        return rq->nr_sectors;
-}
-
-static int __blk_complete_barrier_rq(request_queue_t *q, struct request *rq,
-                                     int sectors, int queue_locked)
-{
-        if (q->ordered != QUEUE_ORDERED_FLUSH)
-                return 0;
-        if (!blk_fs_request(rq) || !blk_barrier_rq(rq))
-                return 0;
-        if (blk_barrier_postflush(rq))
-                return 0;
-
-        if (!blk_check_end_barrier(q, rq, sectors)) {
-                unsigned long flags = 0;
-
-                if (!queue_locked)
-                        spin_lock_irqsave(q->queue_lock, flags);
-
-                blk_start_post_flush(q, rq);
-
-                if (!queue_locked)
-                        spin_unlock_irqrestore(q->queue_lock, flags);
-        }
-
-        return 1;
-}
-
-/**
- * blk_complete_barrier_rq - complete possible barrier request
- * @q:  the request queue for the device
- * @rq:  the request
- * @sectors:  number of sectors to complete
- *
- * Description:
- *   Used in driver end_io handling to determine whether to postpone
- *   completion of a barrier request until a post flush has been done. This
- *   is the unlocked variant, used if the caller doesn't already hold the
- *   queue lock.
- **/
-int blk_complete_barrier_rq(request_queue_t *q, struct request *rq, int sectors)
-{
-        return __blk_complete_barrier_rq(q, rq, sectors, 0);
-}
-EXPORT_SYMBOL(blk_complete_barrier_rq);
-
-/**
- * blk_complete_barrier_rq_locked - complete possible barrier request
- * @q:  the request queue for the device
- * @rq:  the request
- * @sectors:  number of sectors to complete
- *
- * Description:
- *   See blk_complete_barrier_rq(). This variant must be used if the caller
- *   holds the queue lock.
- **/
-int blk_complete_barrier_rq_locked(request_queue_t *q, struct request *rq,
-                                   int sectors)
-{
-        return __blk_complete_barrier_rq(q, rq, sectors, 1);
-}
-EXPORT_SYMBOL(blk_complete_barrier_rq_locked);
-
-/**
- * blk_queue_bounce_limit - set bounce buffer limit for queue
- * @q:  the request queue for the device
- * @dma_addr:   bus address limit
- *
- * Description:
- *    Different hardware can have different requirements as to what pages
- *    it can do I/O directly to. A low level driver can call
- *    blk_queue_bounce_limit to have lower memory pages allocated as bounce
- *    buffers for doing I/O to pages residing above @page. By default
- *    the block layer sets this to the highest numbered "low" memory page.
- **/
-void blk_queue_bounce_limit(request_queue_t *q, u64 dma_addr)
-{
-        unsigned long bounce_pfn = dma_addr >> PAGE_SHIFT;
-
-        /*
-         * set appropriate bounce gfp mask -- unfortunately we don't have a
-         * full 4GB zone, so we have to resort to low memory for any bounces.
-         * ISA has its own < 16MB zone.
-         */
-        if (bounce_pfn < blk_max_low_pfn) {
-                BUG_ON(dma_addr < BLK_BOUNCE_ISA);
-                init_emergency_isa_pool();
-                q->bounce_gfp = GFP_NOIO | GFP_DMA;
-        } else
-                q->bounce_gfp = GFP_NOIO;
-
-        q->bounce_pfn = bounce_pfn;
-}
-
-EXPORT_SYMBOL(blk_queue_bounce_limit);
-
-/**
- * blk_queue_max_sectors - set max sectors for a request for this queue
- * @q:  the request queue for the device
- * @max_sectors:  max sectors in the usual 512b unit
- *
- * Description:
- *    Enables a low level driver to set an upper limit on the size of
- *    received requests.
- **/
-void blk_queue_max_sectors(request_queue_t *q, unsigned short max_sectors)
-{
-        if ((max_sectors << 9) < PAGE_CACHE_SIZE) {
-                max_sectors = 1 << (PAGE_CACHE_SHIFT - 9);
-                printk("%s: set to minimum %d\n", __FUNCTION__, max_sectors);
-        }
-
-        q->max_sectors = q->max_hw_sectors = max_sectors;
-}
-
-EXPORT_SYMBOL(blk_queue_max_sectors);
-
-/**
- * blk_queue_max_phys_segments - set max phys segments for a request for this queue
- * @q:  the request queue for the device
- * @max_segments:  max number of segments
- *
- * Description:
- *    Enables a low level driver to set an upper limit on the number of
- *    physical data segments in a request.  This would be the largest sized
- *    scatter list the driver could handle.
- **/
-void blk_queue_max_phys_segments(request_queue_t *q, unsigned short max_segments)
-{
-        if (!max_segments) {
-                max_segments = 1;
-                printk("%s: set to minimum %d\n", __FUNCTION__, max_segments);
-        }
-
-        q->max_phys_segments = max_segments;
-}
-
-EXPORT_SYMBOL(blk_queue_max_phys_segments);
-
-/**
- * blk_queue_max_hw_segments - set max hw segments for a request for this queue
- * @q:  the request queue for the device
- * @max_segments:  max number of segments
- *
- * Description:
- *    Enables a low level driver to set an upper limit on the number of
- *    hw data segments in a request.  This would be the largest number of
- *    address/length pairs the host adapter can actually give as once
- *    to the device.
- **/
-void blk_queue_max_hw_segments(request_queue_t *q, unsigned short max_segments)
-{
-        if (!max_segments) {
-                max_segments = 1;
-                printk("%s: set to minimum %d\n", __FUNCTION__, max_segments);
-        }
-
-        q->max_hw_segments = max_segments;
-}
-
-EXPORT_SYMBOL(blk_queue_max_hw_segments);
-
-/**
- * blk_queue_max_segment_size - set max segment size for blk_rq_map_sg
- * @q:  the request queue for the device
- * @max_size:  max size of segment in bytes
- *
- * Description:
- *    Enables a low level driver to set an upper limit on the size of a
- *    coalesced segment
- **/
-void blk_queue_max_segment_size(request_queue_t *q, unsigned int max_size)
-{
-        if (max_size < PAGE_CACHE_SIZE) {
-                max_size = PAGE_CACHE_SIZE;
-                printk("%s: set to minimum %d\n", __FUNCTION__, max_size);
-        }
-
-        q->max_segment_size = max_size;
-}
-
-EXPORT_SYMBOL(blk_queue_max_segment_size);
-
-/**
- * blk_queue_hardsect_size - set hardware sector size for the queue
- * @q:  the request queue for the device
- * @size:  the hardware sector size, in bytes
- *
- * Description:
- *   This should typically be set to the lowest possible sector size
- *   that the hardware can operate on (possible without reverting to
- *   even internal read-modify-write operations). Usually the default
- *   of 512 covers most hardware.
- **/
-void blk_queue_hardsect_size(request_queue_t *q, unsigned short size)
-{
-        q->hardsect_size = size;
-}
-
-EXPORT_SYMBOL(blk_queue_hardsect_size);
-
-/*
- * Returns the minimum that is _not_ zero, unless both are zero.
- */
-#define min_not_zero(l, r) (l == 0) ? r : ((r == 0) ? l : min(l, r))
-
-/**
- * blk_queue_stack_limits - inherit underlying queue limits for stacked drivers
- * @t:  the stacking driver (top)
- * @b:  the underlying device (bottom)
- **/
-void blk_queue_stack_limits(request_queue_t *t, request_queue_t *b)
-{
-        /* zero is "infinity" */
-        t->max_sectors = t->max_hw_sectors =
-                min_not_zero(t->max_sectors,b->max_sectors);
-
-        t->max_phys_segments = min(t->max_phys_segments,b->max_phys_segments);
-        t->max_hw_segments = min(t->max_hw_segments,b->max_hw_segments);
-        t->max_segment_size = min(t->max_segment_size,b->max_segment_size);
-        t->hardsect_size = max(t->hardsect_size,b->hardsect_size);
-}
-
-EXPORT_SYMBOL(blk_queue_stack_limits);
-
-/**
- * blk_queue_segment_boundary - set boundary rules for segment merging
- * @q:  the request queue for the device
- * @mask:  the memory boundary mask
- **/
-void blk_queue_segment_boundary(request_queue_t *q, unsigned long mask)
-{
-        if (mask < PAGE_CACHE_SIZE - 1) {
-                mask = PAGE_CACHE_SIZE - 1;
-                printk("%s: set to minimum %lx\n", __FUNCTION__, mask);
-        }
-
-        q->seg_boundary_mask = mask;
-}
-
-EXPORT_SYMBOL(blk_queue_segment_boundary);
-
-/**
- * blk_queue_dma_alignment - set dma length and memory alignment
- * @q:     the request queue for the device
- * @mask:  alignment mask
- *
- * description:
- *    set required memory and length aligment for direct dma transactions.
- *    this is used when buiding direct io requests for the queue.
- *
- **/
-void blk_queue_dma_alignment(request_queue_t *q, int mask)
-{
-        q->dma_alignment = mask;
-}
-
-EXPORT_SYMBOL(blk_queue_dma_alignment);
-
-/**
- * blk_queue_find_tag - find a request by its tag and queue
- *
- * @q:   The request queue for the device
- * @tag: The tag of the request
- *
- * Notes:
- *    Should be used when a device returns a tag and you want to match
- *    it with a request.
- *
- *    no locks need be held.
- **/
-struct request *blk_queue_find_tag(request_queue_t *q, int tag)
-{
-        struct blk_queue_tag *bqt = q->queue_tags;
-
-        if (unlikely(bqt == NULL || tag >= bqt->real_max_depth))
-                return NULL;
-
-        return bqt->tag_index[tag];
-}
-
-EXPORT_SYMBOL(blk_queue_find_tag);
-
-/**
- * __blk_queue_free_tags - release tag maintenance info
- * @q:  the request queue for the device
- *
- *  Notes:
- *    blk_cleanup_queue() will take care of calling this function, if tagging
- *    has been used. So there's no need to call this directly.
- **/
-static void __blk_queue_free_tags(request_queue_t *q)
-{
-        struct blk_queue_tag *bqt = q->queue_tags;
-
-        if (!bqt)
-                return;
-
-        if (atomic_dec_and_test(&bqt->refcnt)) {
-                BUG_ON(bqt->busy);
-                BUG_ON(!list_empty(&bqt->busy_list));
-
-                kfree(bqt->tag_index);
-                bqt->tag_index = NULL;
-
-                kfree(bqt->tag_map);
-                bqt->tag_map = NULL;
-
-                kfree(bqt);
-        }
-
-        q->queue_tags = NULL;
-        q->queue_flags &= ~(1 << QUEUE_FLAG_QUEUED);
-}
-
-/**
- * blk_queue_free_tags - release tag maintenance info
- * @q:  the request queue for the device
- *
- *  Notes:
- *      This is used to disabled tagged queuing to a device, yet leave
- *      queue in function.
- **/
-void blk_queue_free_tags(request_queue_t *q)
-{
-        clear_bit(QUEUE_FLAG_QUEUED, &q->queue_flags);
-}
-
-EXPORT_SYMBOL(blk_queue_free_tags);
-
-static int
-init_tag_map(request_queue_t *q, struct blk_queue_tag *tags, int depth)
-{
-        struct request **tag_index;
-        unsigned long *tag_map;
-        int nr_ulongs;
-
-        if (depth > q->nr_requests * 2) {
-                depth = q->nr_requests * 2;
-                printk(KERN_ERR "%s: adjusted depth to %d\n",
-                                __FUNCTION__, depth);
-        }
-
-        tag_index = kmalloc(depth * sizeof(struct request *), GFP_ATOMIC);
-        if (!tag_index)
-                goto fail;
-
-        nr_ulongs = ALIGN(depth, BITS_PER_LONG) / BITS_PER_LONG;
-        tag_map = kmalloc(nr_ulongs * sizeof(unsigned long), GFP_ATOMIC);
-        if (!tag_map)
-                goto fail;
-
-        memset(tag_index, 0, depth * sizeof(struct request *));
-        memset(tag_map, 0, nr_ulongs * sizeof(unsigned long));
-        tags->real_max_depth = depth;
-        tags->max_depth = depth;
-        tags->tag_index = tag_index;
-        tags->tag_map = tag_map;
-
-        return 0;
-fail:
-        kfree(tag_index);
-        return -ENOMEM;
-}
-
-/**
- * blk_queue_init_tags - initialize the queue tag info
- * @q:  the request queue for the device
- * @depth:  the maximum queue depth supported
- * @tags: the tag to use
- **/
-int blk_queue_init_tags(request_queue_t *q, int depth,
-                        struct blk_queue_tag *tags)
-{
-        int rc;
-
-        BUG_ON(tags && q->queue_tags && tags != q->queue_tags);
-
-        if (!tags && !q->queue_tags) {
-                tags = kmalloc(sizeof(struct blk_queue_tag), GFP_ATOMIC);
-                if (!tags)
-                        goto fail;
-
-                if (init_tag_map(q, tags, depth))
-                        goto fail;
-
-                INIT_LIST_HEAD(&tags->busy_list);
-                tags->busy = 0;
-                atomic_set(&tags->refcnt, 1);
-        } else if (q->queue_tags) {
-                if ((rc = blk_queue_resize_tags(q, depth)))
-                        return rc;
-                set_bit(QUEUE_FLAG_QUEUED, &q->queue_flags);
-                return 0;
-        } else
-                atomic_inc(&tags->refcnt);
-
-        /*
-         * assign it, all done
-         */
-        q->queue_tags = tags;
-        q->queue_flags |= (1 << QUEUE_FLAG_QUEUED);
-        return 0;
-fail:
-        kfree(tags);
-        return -ENOMEM;
-}
-
-EXPORT_SYMBOL(blk_queue_init_tags);
-
-/**
- * blk_queue_resize_tags - change the queueing depth
- * @q:  the request queue for the device
- * @new_depth: the new max command queueing depth
- *
- *  Notes:
- *    Must be called with the queue lock held.
- **/
-int blk_queue_resize_tags(request_queue_t *q, int new_depth)
-{
-        struct blk_queue_tag *bqt = q->queue_tags;
-        struct request **tag_index;
-        unsigned long *tag_map;
-        int max_depth, nr_ulongs;
-
-        if (!bqt)
-                return -ENXIO;
-
-        /*
-         * if we already have large enough real_max_depth.  just
-         * adjust max_depth.  *NOTE* as requests with tag value
-         * between new_depth and real_max_depth can be in-flight, tag
-         * map can not be shrunk blindly here.
-         */
-        if (new_depth <= bqt->real_max_depth) {
-                bqt->max_depth = new_depth;
-                return 0;
-        }
-
-        /*
-         * save the old state info, so we can copy it back
-         */
-        tag_index = bqt->tag_index;
-        tag_map = bqt->tag_map;
-        max_depth = bqt->real_max_depth;
-
-        if (init_tag_map(q, bqt, new_depth))
-                return -ENOMEM;
-
-        memcpy(bqt->tag_index, tag_index, max_depth * sizeof(struct request *));
-        nr_ulongs = ALIGN(max_depth, BITS_PER_LONG) / BITS_PER_LONG;
-        memcpy(bqt->tag_map, tag_map, nr_ulongs * sizeof(unsigned long));
-
-        kfree(tag_index);
-        kfree(tag_map);
-        return 0;
-}
-
-EXPORT_SYMBOL(blk_queue_resize_tags);
-
-/**
- * blk_queue_end_tag - end tag operations for a request
- * @q:  the request queue for the device
- * @rq: the request that has completed
- *
- *  Description:
- *    Typically called when end_that_request_first() returns 0, meaning
- *    all transfers have been done for a request. It's important to call
- *    this function before end_that_request_last(), as that will put the
- *    request back on the free list thus corrupting the internal tag list.
- *
- *  Notes:
- *   queue lock must be held.
- **/
-void blk_queue_end_tag(request_queue_t *q, struct request *rq)
-{
-        struct blk_queue_tag *bqt = q->queue_tags;
-        int tag = rq->tag;
-
-        BUG_ON(tag == -1);
-
-        if (unlikely(tag >= bqt->real_max_depth))
-                /*
-                 * This can happen after tag depth has been reduced.
-                 * FIXME: how about a warning or info message here?
-                 */
-                return;
-
-        if (unlikely(!__test_and_clear_bit(tag, bqt->tag_map))) {
-                printk(KERN_ERR "%s: attempt to clear non-busy tag (%d)\n",
-                       __FUNCTION__, tag);
-                return;
-        }
-
-        list_del_init(&rq->queuelist);
-        rq->flags &= ~REQ_QUEUED;
-        rq->tag = -1;
-
-        if (unlikely(bqt->tag_index[tag] == NULL))
-                printk(KERN_ERR "%s: tag %d is missing\n",
-                       __FUNCTION__, tag);
-
-        bqt->tag_index[tag] = NULL;
-        bqt->busy--;
-}
-
-EXPORT_SYMBOL(blk_queue_end_tag);
-
-/**
- * blk_queue_start_tag - find a free tag and assign it
- * @q:  the request queue for the device
- * @rq:  the block request that needs tagging
- *
- *  Description:
- *    This can either be used as a stand-alone helper, or possibly be
- *    assigned as the queue &prep_rq_fn (in which case &struct request
- *    automagically gets a tag assigned). Note that this function
- *    assumes that any type of request can be queued! if this is not
- *    true for your device, you must check the request type before
- *    calling this function.  The request will also be removed from
- *    the request queue, so it's the drivers responsibility to readd
- *    it if it should need to be restarted for some reason.
- *
- *  Notes:
- *   queue lock must be held.
- **/
-int blk_queue_start_tag(request_queue_t *q, struct request *rq)
-{
-        struct blk_queue_tag *bqt = q->queue_tags;
-        int tag;
-
-        if (unlikely((rq->flags & REQ_QUEUED))) {
-                printk(KERN_ERR 
-                       "%s: request %p for device [%s] already tagged %d",
-                       __FUNCTION__, rq,
-                       rq->rq_disk ? rq->rq_disk->disk_name : "?", rq->tag);
-                BUG();
-        }
-
-        tag = find_first_zero_bit(bqt->tag_map, bqt->max_depth);
-        if (tag >= bqt->max_depth)
-                return 1;
-
-        __set_bit(tag, bqt->tag_map);
-
-        rq->flags |= REQ_QUEUED;
-        rq->tag = tag;
-        bqt->tag_index[tag] = rq;
-        blkdev_dequeue_request(rq);
-        list_add(&rq->queuelist, &bqt->busy_list);
-        bqt->busy++;
-        return 0;
-}
-
-EXPORT_SYMBOL(blk_queue_start_tag);
-
-/**
- * blk_queue_invalidate_tags - invalidate all pending tags
- * @q:  the request queue for the device
- *
- *  Description:
- *   Hardware conditions may dictate a need to stop all pending requests.
- *   In this case, we will safely clear the block side of the tag queue and
- *   readd all requests to the request queue in the right order.
- *
- *  Notes:
- *   queue lock must be held.
- **/
-void blk_queue_invalidate_tags(request_queue_t *q)
-{
-        struct blk_queue_tag *bqt = q->queue_tags;
-        struct list_head *tmp, *n;
-        struct request *rq;
-
-        list_for_each_safe(tmp, n, &bqt->busy_list) {
-                rq = list_entry_rq(tmp);
-
-                if (rq->tag == -1) {
-                        printk(KERN_ERR
-                               "%s: bad tag found on list\n", __FUNCTION__);
-                        list_del_init(&rq->queuelist);
-                        rq->flags &= ~REQ_QUEUED;
-                } else
-                        blk_queue_end_tag(q, rq);
-
-                rq->flags &= ~REQ_STARTED;
-                __elv_add_request(q, rq, ELEVATOR_INSERT_BACK, 0);
-        }
-}
-
-EXPORT_SYMBOL(blk_queue_invalidate_tags);
-
-static char *rq_flags[] = {
-        "REQ_RW",
-        "REQ_FAILFAST",
-        "REQ_SORTED",
-        "REQ_SOFTBARRIER",
-        "REQ_HARDBARRIER",
-        "REQ_CMD",
-        "REQ_NOMERGE",
-        "REQ_STARTED",
-        "REQ_DONTPREP",
-        "REQ_QUEUED",
-        "REQ_ELVPRIV",
-        "REQ_PC",
-        "REQ_BLOCK_PC",
-        "REQ_SENSE",
-        "REQ_FAILED",
-        "REQ_QUIET",
-        "REQ_SPECIAL",
-        "REQ_DRIVE_CMD",
-        "REQ_DRIVE_TASK",
-        "REQ_DRIVE_TASKFILE",
-        "REQ_PREEMPT",
-        "REQ_PM_SUSPEND",
-        "REQ_PM_RESUME",
-        "REQ_PM_SHUTDOWN",
-};
-
-void blk_dump_rq_flags(struct request *rq, char *msg)
-{
-        int bit;
-
-        printk("%s: dev %s: flags = ", msg,
-                rq->rq_disk ? rq->rq_disk->disk_name : "?");
-        bit = 0;
-        do {
-                if (rq->flags & (1 << bit))
-                        printk("%s ", rq_flags[bit]);
-                bit++;
-        } while (bit < __REQ_NR_BITS);
-
-        printk("\nsector %llu, nr/cnr %lu/%u\n", (unsigned long long)rq->sector,
-                                                       rq->nr_sectors,
-                                                       rq->current_nr_sectors);
-        printk("bio %p, biotail %p, buffer %p, data %p, len %u\n", rq->bio, rq->biotail, rq->buffer, rq->data, rq->data_len);
-
-        if (rq->flags & (REQ_BLOCK_PC | REQ_PC)) {
-                printk("cdb: ");
-                for (bit = 0; bit < sizeof(rq->cmd); bit++)
-                        printk("%02x ", rq->cmd[bit]);
-                printk("\n");
-        }
-}
-
-EXPORT_SYMBOL(blk_dump_rq_flags);
-
-void blk_recount_segments(request_queue_t *q, struct bio *bio)
-{
-        struct bio_vec *bv, *bvprv = NULL;
-        int i, nr_phys_segs, nr_hw_segs, seg_size, hw_seg_size, cluster;
-        int high, highprv = 1;
-
-        if (unlikely(!bio->bi_io_vec))
-                return;
-
-        cluster = q->queue_flags & (1 << QUEUE_FLAG_CLUSTER);
-        hw_seg_size = seg_size = nr_phys_segs = nr_hw_segs = 0;
-        bio_for_each_segment(bv, bio, i) {
-                /*
-                 * the trick here is making sure that a high page is never
-                 * considered part of another segment, since that might
-                 * change with the bounce page.
-                 */
-                high = page_to_pfn(bv->bv_page) >= q->bounce_pfn;
-                if (high || highprv)
-                        goto new_hw_segment;
-                if (cluster) {
-                        if (seg_size + bv->bv_len > q->max_segment_size)
-                                goto new_segment;
-                        if (!BIOVEC_PHYS_MERGEABLE(bvprv, bv))
-                                goto new_segment;
-                        if (!BIOVEC_SEG_BOUNDARY(q, bvprv, bv))
-                                goto new_segment;
-                        if (BIOVEC_VIRT_OVERSIZE(hw_seg_size + bv->bv_len))
-                                goto new_hw_segment;
-
-                        seg_size += bv->bv_len;
-                        hw_seg_size += bv->bv_len;
-                        bvprv = bv;
-                        continue;
-                }
-new_segment:
-                if (BIOVEC_VIRT_MERGEABLE(bvprv, bv) &&
-                    !BIOVEC_VIRT_OVERSIZE(hw_seg_size + bv->bv_len)) {
-                        hw_seg_size += bv->bv_len;
-                } else {
-new_hw_segment:
-                        if (hw_seg_size > bio->bi_hw_front_size)
-                                bio->bi_hw_front_size = hw_seg_size;
-                        hw_seg_size = BIOVEC_VIRT_START_SIZE(bv) + bv->bv_len;
-                        nr_hw_segs++;
-                }
-
-                nr_phys_segs++;
-                bvprv = bv;
-                seg_size = bv->bv_len;
-                highprv = high;
-        }
-        if (hw_seg_size > bio->bi_hw_back_size)
-                bio->bi_hw_back_size = hw_seg_size;
-        if (nr_hw_segs == 1 && hw_seg_size > bio->bi_hw_front_size)
-                bio->bi_hw_front_size = hw_seg_size;
-        bio->bi_phys_segments = nr_phys_segs;
-        bio->bi_hw_segments = nr_hw_segs;
-        bio->bi_flags |= (1 << BIO_SEG_VALID);
-}
-
-
-static int blk_phys_contig_segment(request_queue_t *q, struct bio *bio,
-                                   struct bio *nxt)
-{
-        if (!(q->queue_flags & (1 << QUEUE_FLAG_CLUSTER)))
-                return 0;
-
-        if (!BIOVEC_PHYS_MERGEABLE(__BVEC_END(bio), __BVEC_START(nxt)))
-                return 0;
-        if (bio->bi_size + nxt->bi_size > q->max_segment_size)
-                return 0;
-
-        /*
-         * bio and nxt are contigous in memory, check if the queue allows
-         * these two to be merged into one
-         */
-        if (BIO_SEG_BOUNDARY(q, bio, nxt))
-                return 1;
-
-        return 0;
-}
-
-static int blk_hw_contig_segment(request_queue_t *q, struct bio *bio,
-                                 struct bio *nxt)
-{
-        if (unlikely(!bio_flagged(bio, BIO_SEG_VALID)))
-                blk_recount_segments(q, bio);
-        if (unlikely(!bio_flagged(nxt, BIO_SEG_VALID)))
-                blk_recount_segments(q, nxt);
-        if (!BIOVEC_VIRT_MERGEABLE(__BVEC_END(bio), __BVEC_START(nxt)) ||
-            BIOVEC_VIRT_OVERSIZE(bio->bi_hw_front_size + bio->bi_hw_back_size))
-                return 0;
-        if (bio->bi_size + nxt->bi_size > q->max_segment_size)
-                return 0;
-
-        return 1;
-}
-
-/*
- * map a request to scatterlist, return number of sg entries setup. Caller
- * must make sure sg can hold rq->nr_phys_segments entries
- */
-int blk_rq_map_sg(request_queue_t *q, struct request *rq, struct scatterlist *sg)
-{
-        struct bio_vec *bvec, *bvprv;
-        struct bio *bio;
-        int nsegs, i, cluster;
-
-        nsegs = 0;
-        cluster = q->queue_flags & (1 << QUEUE_FLAG_CLUSTER);
-
-        /*
-         * for each bio in rq
-         */
-        bvprv = NULL;
-        rq_for_each_bio(bio, rq) {
-                /*
-                 * for each segment in bio
-                 */
-                bio_for_each_segment(bvec, bio, i) {
-                        int nbytes = bvec->bv_len;
-
-                        if (bvprv && cluster) {
-                                if (sg[nsegs - 1].length + nbytes > q->max_segment_size)
-                                        goto new_segment;
-
-                                if (!BIOVEC_PHYS_MERGEABLE(bvprv, bvec))
-                                        goto new_segment;
-                                if (!BIOVEC_SEG_BOUNDARY(q, bvprv, bvec))
-                                        goto new_segment;
-
-                                sg[nsegs - 1].length += nbytes;
-                        } else {
-new_segment:
-                                memset(&sg[nsegs],0,sizeof(struct scatterlist));
-                                sg[nsegs].page = bvec->bv_page;
-                                sg[nsegs].length = nbytes;
-                                sg[nsegs].offset = bvec->bv_offset;
-
-                                nsegs++;
-                        }
-                        bvprv = bvec;
-                } /* segments in bio */
-        } /* bios in rq */
-
-        return nsegs;
-}
-
-EXPORT_SYMBOL(blk_rq_map_sg);
-
-/*
- * the standard queue merge functions, can be overridden with device
- * specific ones if so desired
- */
-
-static inline int ll_new_mergeable(request_queue_t *q,
-                                   struct request *req,
-                                   struct bio *bio)
-{
-        int nr_phys_segs = bio_phys_segments(q, bio);
-
-        if (req->nr_phys_segments + nr_phys_segs > q->max_phys_segments) {
-                req->flags |= REQ_NOMERGE;
-                if (req == q->last_merge)
-                        q->last_merge = NULL;
-                return 0;
-        }
-
-        /*
-         * A hw segment is just getting larger, bump just the phys
-         * counter.
-         */
-        req->nr_phys_segments += nr_phys_segs;
-        return 1;
-}
-
-static inline int ll_new_hw_segment(request_queue_t *q,
-                                    struct request *req,
-                                    struct bio *bio)
-{
-        int nr_hw_segs = bio_hw_segments(q, bio);
-        int nr_phys_segs = bio_phys_segments(q, bio);
-
-        if (req->nr_hw_segments + nr_hw_segs > q->max_hw_segments
-            || req->nr_phys_segments + nr_phys_segs > q->max_phys_segments) {
-                req->flags |= REQ_NOMERGE;
-                if (req == q->last_merge)
-                        q->last_merge = NULL;
-                return 0;
-        }
-
-        /*
-         * This will form the start of a new hw segment.  Bump both
-         * counters.
-         */
-        req->nr_hw_segments += nr_hw_segs;
-        req->nr_phys_segments += nr_phys_segs;
-        return 1;
-}
-
-static int ll_back_merge_fn(request_queue_t *q, struct request *req, 
-                            struct bio *bio)
-{
-        int len;
-
-        if (req->nr_sectors + bio_sectors(bio) > q->max_sectors) {
-                req->flags |= REQ_NOMERGE;
-                if (req == q->last_merge)
-                        q->last_merge = NULL;
-                return 0;
-        }
-        if (unlikely(!bio_flagged(req->biotail, BIO_SEG_VALID)))
-                blk_recount_segments(q, req->biotail);
-        if (unlikely(!bio_flagged(bio, BIO_SEG_VALID)))
-                blk_recount_segments(q, bio);
-        len = req->biotail->bi_hw_back_size + bio->bi_hw_front_size;
-        if (BIOVEC_VIRT_MERGEABLE(__BVEC_END(req->biotail), __BVEC_START(bio)) &&
-            !BIOVEC_VIRT_OVERSIZE(len)) {
-                int mergeable =  ll_new_mergeable(q, req, bio);
-
-                if (mergeable) {
-                        if (req->nr_hw_segments == 1)
-                                req->bio->bi_hw_front_size = len;
-                        if (bio->bi_hw_segments == 1)
-                                bio->bi_hw_back_size = len;
-                }
-                return mergeable;
-        }
-
-        return ll_new_hw_segment(q, req, bio);
-}
-
-static int ll_front_merge_fn(request_queue_t *q, struct request *req, 
-                             struct bio *bio)
-{
-        int len;
-
-        if (req->nr_sectors + bio_sectors(bio) > q->max_sectors) {
-                req->flags |= REQ_NOMERGE;
-                if (req == q->last_merge)
-                        q->last_merge = NULL;
-                return 0;
-        }
-        len = bio->bi_hw_back_size + req->bio->bi_hw_front_size;
-        if (unlikely(!bio_flagged(bio, BIO_SEG_VALID)))
-                blk_recount_segments(q, bio);
-        if (unlikely(!bio_flagged(req->bio, BIO_SEG_VALID)))
-                blk_recount_segments(q, req->bio);
-        if (BIOVEC_VIRT_MERGEABLE(__BVEC_END(bio), __BVEC_START(req->bio)) &&
-            !BIOVEC_VIRT_OVERSIZE(len)) {
-                int mergeable =  ll_new_mergeable(q, req, bio);
-
-                if (mergeable) {
-                        if (bio->bi_hw_segments == 1)
-                                bio->bi_hw_front_size = len;
-                        if (req->nr_hw_segments == 1)
-                                req->biotail->bi_hw_back_size = len;
-                }
-                return mergeable;
-        }
-
-        return ll_new_hw_segment(q, req, bio);
-}
-
-static int ll_merge_requests_fn(request_queue_t *q, struct request *req,
-                                struct request *next)
-{
-        int total_phys_segments;
-        int total_hw_segments;
-
-        /*
-         * First check if the either of the requests are re-queued
-         * requests.  Can't merge them if they are.
-         */
-        if (req->special || next->special)
-                return 0;
-
-        /*
-         * Will it become too large?
-         */
-        if ((req->nr_sectors + next->nr_sectors) > q->max_sectors)
-                return 0;
-
-        total_phys_segments = req->nr_phys_segments + next->nr_phys_segments;
-        if (blk_phys_contig_segment(q, req->biotail, next->bio))
-                total_phys_segments--;
-
-        if (total_phys_segments > q->max_phys_segments)
-                return 0;
-
-        total_hw_segments = req->nr_hw_segments + next->nr_hw_segments;
-        if (blk_hw_contig_segment(q, req->biotail, next->bio)) {
-                int len = req->biotail->bi_hw_back_size + next->bio->bi_hw_front_size;
-                /*
-                 * propagate the combined length to the end of the requests
-                 */
-                if (req->nr_hw_segments == 1)
-                        req->bio->bi_hw_front_size = len;
-                if (next->nr_hw_segments == 1)
-                        next->biotail->bi_hw_back_size = len;
-                total_hw_segments--;
-        }
-
-        if (total_hw_segments > q->max_hw_segments)
-                return 0;
-
-        /* Merge is OK... */
-        req->nr_phys_segments = total_phys_segments;
-        req->nr_hw_segments = total_hw_segments;
-        return 1;
-}
-
-/*
- * "plug" the device if there are no outstanding requests: this will
- * force the transfer to start only after we have put all the requests
- * on the list.
- *
- * This is called with interrupts off and no requests on the queue and
- * with the queue lock held.
- */
-void blk_plug_device(request_queue_t *q)
-{
-        WARN_ON(!irqs_disabled());
-
-        /*
-         * don't plug a stopped queue, it must be paired with blk_start_queue()
-         * which will restart the queueing
-         */
-        if (test_bit(QUEUE_FLAG_STOPPED, &q->queue_flags))
-                return;
-
-        if (!test_and_set_bit(QUEUE_FLAG_PLUGGED, &q->queue_flags))
-                mod_timer(&q->unplug_timer, jiffies + q->unplug_delay);
-}
-
-EXPORT_SYMBOL(blk_plug_device);
-
-/*
- * remove the queue from the plugged list, if present. called with
- * queue lock held and interrupts disabled.
- */
-int blk_remove_plug(request_queue_t *q)
-{
-        WARN_ON(!irqs_disabled());
-
-        if (!test_and_clear_bit(QUEUE_FLAG_PLUGGED, &q->queue_flags))
-                return 0;
-
-        del_timer(&q->unplug_timer);
-        return 1;
-}
-
-EXPORT_SYMBOL(blk_remove_plug);
-
-/*
- * remove the plug and let it rip..
- */
-void __generic_unplug_device(request_queue_t *q)
-{
-        if (unlikely(test_bit(QUEUE_FLAG_STOPPED, &q->queue_flags)))
-                return;
-
-        if (!blk_remove_plug(q))
-                return;
-
-        q->request_fn(q);
-}
-EXPORT_SYMBOL(__generic_unplug_device);
-
-/**
- * generic_unplug_device - fire a request queue
- * @q:    The &request_queue_t in question
- *
- * Description:
- *   Linux uses plugging to build bigger requests queues before letting
- *   the device have at them. If a queue is plugged, the I/O scheduler
- *   is still adding and merging requests on the queue. Once the queue
- *   gets unplugged, the request_fn defined for the queue is invoked and
- *   transfers started.
- **/
-void generic_unplug_device(request_queue_t *q)
-{
-        spin_lock_irq(q->queue_lock);
-        __generic_unplug_device(q);
-        spin_unlock_irq(q->queue_lock);
-}
-EXPORT_SYMBOL(generic_unplug_device);
-
-static void blk_backing_dev_unplug(struct backing_dev_info *bdi,
-                                   struct page *page)
-{
-        request_queue_t *q = bdi->unplug_io_data;
-
-        /*
-         * devices don't necessarily have an ->unplug_fn defined
-         */
-        if (q->unplug_fn)
-                q->unplug_fn(q);
-}
-
-static void blk_unplug_work(void *data)
-{
-        request_queue_t *q = data;
-
-        q->unplug_fn(q);
-}
-
-static void blk_unplug_timeout(unsigned long data)
-{
-        request_queue_t *q = (request_queue_t *)data;
-
-        kblockd_schedule_work(&q->unplug_work);
-}
-
-/**
- * blk_start_queue - restart a previously stopped queue
- * @q:    The &request_queue_t in question
- *
- * Description:
- *   blk_start_queue() will clear the stop flag on the queue, and call
- *   the request_fn for the queue if it was in a stopped state when
- *   entered. Also see blk_stop_queue(). Queue lock must be held.
- **/
-void blk_start_queue(request_queue_t *q)
-{
-        clear_bit(QUEUE_FLAG_STOPPED, &q->queue_flags);
-
-        /*
-         * one level of recursion is ok and is much faster than kicking
-         * the unplug handling
-         */
-        if (!test_and_set_bit(QUEUE_FLAG_REENTER, &q->queue_flags)) {
-                q->request_fn(q);
-                clear_bit(QUEUE_FLAG_REENTER, &q->queue_flags);
-        } else {
-                blk_plug_device(q);
-                kblockd_schedule_work(&q->unplug_work);
-        }
-}
-
-EXPORT_SYMBOL(blk_start_queue);
-
-/**
- * blk_stop_queue - stop a queue
- * @q:    The &request_queue_t in question
- *
- * Description:
- *   The Linux block layer assumes that a block driver will consume all
- *   entries on the request queue when the request_fn strategy is called.
- *   Often this will not happen, because of hardware limitations (queue
- *   depth settings). If a device driver gets a 'queue full' response,
- *   or if it simply chooses not to queue more I/O at one point, it can
- *   call this function to prevent the request_fn from being called until
- *   the driver has signalled it's ready to go again. This happens by calling
- *   blk_start_queue() to restart queue operations. Queue lock must be held.
- **/
-void blk_stop_queue(request_queue_t *q)
-{
-        blk_remove_plug(q);
-        set_bit(QUEUE_FLAG_STOPPED, &q->queue_flags);
-}
-EXPORT_SYMBOL(blk_stop_queue);
-
-/**
- * blk_sync_queue - cancel any pending callbacks on a queue
- * @q: the queue
- *
- * Description:
- *     The block layer may perform asynchronous callback activity
- *     on a queue, such as calling the unplug function after a timeout.
- *     A block device may call blk_sync_queue to ensure that any
- *     such activity is cancelled, thus allowing it to release resources
- *     the the callbacks might use. The caller must already have made sure
- *     that its ->make_request_fn will not re-add plugging prior to calling
- *     this function.
- *
- */
-void blk_sync_queue(struct request_queue *q)
-{
-        del_timer_sync(&q->unplug_timer);
-        kblockd_flush();
-}
-EXPORT_SYMBOL(blk_sync_queue);
-
-/**
- * blk_run_queue - run a single device queue
- * @q:  The queue to run
- */
-void blk_run_queue(struct request_queue *q)
-{
-        unsigned long flags;
-
-        spin_lock_irqsave(q->queue_lock, flags);
-        blk_remove_plug(q);
-        if (!elv_queue_empty(q))
-                q->request_fn(q);
-        spin_unlock_irqrestore(q->queue_lock, flags);
-}
-EXPORT_SYMBOL(blk_run_queue);
-
-/**
- * blk_cleanup_queue: - release a &request_queue_t when it is no longer needed
- * @q:    the request queue to be released
- *
- * Description:
- *     blk_cleanup_queue is the pair to blk_init_queue() or
- *     blk_queue_make_request().  It should be called when a request queue is
- *     being released; typically when a block device is being de-registered.
- *     Currently, its primary task it to free all the &struct request
- *     structures that were allocated to the queue and the queue itself.
- *
- * Caveat:
- *     Hopefully the low level driver will have finished any
- *     outstanding requests first...
- **/
-void blk_cleanup_queue(request_queue_t * q)
-{
-        struct request_list *rl = &q->rq;
-
-        if (!atomic_dec_and_test(&q->refcnt))
-                return;
-
-        if (q->elevator)
-                elevator_exit(q->elevator);
-
-        blk_sync_queue(q);
-
-        if (rl->rq_pool)
-                mempool_destroy(rl->rq_pool);
-
-        if (q->queue_tags)
-                __blk_queue_free_tags(q);
-
-        blk_queue_ordered(q, QUEUE_ORDERED_NONE);
-
-        kmem_cache_free(requestq_cachep, q);
-}
-
-EXPORT_SYMBOL(blk_cleanup_queue);
-
-static int blk_init_free_list(request_queue_t *q)
-{
-        struct request_list *rl = &q->rq;
-
-        rl->count[READ] = rl->count[WRITE] = 0;
-        rl->starved[READ] = rl->starved[WRITE] = 0;
-        rl->elvpriv = 0;
-        init_waitqueue_head(&rl->wait[READ]);
-        init_waitqueue_head(&rl->wait[WRITE]);
-
-        rl->rq_pool = mempool_create_node(BLKDEV_MIN_RQ, mempool_alloc_slab,
-                                mempool_free_slab, request_cachep, q->node);
-
-        if (!rl->rq_pool)
-                return -ENOMEM;
-
-        return 0;
-}
-
-static int __make_request(request_queue_t *, struct bio *);
-
-request_queue_t *blk_alloc_queue(gfp_t gfp_mask)
-{
-        return blk_alloc_queue_node(gfp_mask, -1);
-}
-EXPORT_SYMBOL(blk_alloc_queue);
-
-request_queue_t *blk_alloc_queue_node(gfp_t gfp_mask, int node_id)
-{
-        request_queue_t *q;
-
-        q = kmem_cache_alloc_node(requestq_cachep, gfp_mask, node_id);
-        if (!q)
-                return NULL;
-
-        memset(q, 0, sizeof(*q));
-        init_timer(&q->unplug_timer);
-        atomic_set(&q->refcnt, 1);
-
-        q->backing_dev_info.unplug_io_fn = blk_backing_dev_unplug;
-        q->backing_dev_info.unplug_io_data = q;
-
-        return q;
-}
-EXPORT_SYMBOL(blk_alloc_queue_node);
-
-/**
- * blk_init_queue  - prepare a request queue for use with a block device
- * @rfn:  The function to be called to process requests that have been
- *        placed on the queue.
- * @lock: Request queue spin lock
- *
- * Description:
- *    If a block device wishes to use the standard request handling procedures,
- *    which sorts requests and coalesces adjacent requests, then it must
- *    call blk_init_queue().  The function @rfn will be called when there
- *    are requests on the queue that need to be processed.  If the device
- *    supports plugging, then @rfn may not be called immediately when requests
- *    are available on the queue, but may be called at some time later instead.
- *    Plugged queues are generally unplugged when a buffer belonging to one
- *    of the requests on the queue is needed, or due to memory pressure.
- *
- *    @rfn is not required, or even expected, to remove all requests off the
- *    queue, but only as many as it can handle at a time.  If it does leave
- *    requests on the queue, it is responsible for arranging that the requests
- *    get dealt with eventually.
- *
- *    The queue spin lock must be held while manipulating the requests on the
- *    request queue.
- *
- *    Function returns a pointer to the initialized request queue, or NULL if
- *    it didn't succeed.
- *
- * Note:
- *    blk_init_queue() must be paired with a blk_cleanup_queue() call
- *    when the block device is deactivated (such as at module unload).
- **/
-
-request_queue_t *blk_init_queue(request_fn_proc *rfn, spinlock_t *lock)
-{
-        return blk_init_queue_node(rfn, lock, -1);
-}
-EXPORT_SYMBOL(blk_init_queue);
-
-request_queue_t *
-blk_init_queue_node(request_fn_proc *rfn, spinlock_t *lock, int node_id)
-{
-        request_queue_t *q = blk_alloc_queue_node(GFP_KERNEL, node_id);
-
-        if (!q)
-                return NULL;
-
-        q->node = node_id;
-        if (blk_init_free_list(q))
-                goto out_init;
-
-        /*
-         * if caller didn't supply a lock, they get per-queue locking with
-         * our embedded lock
-         */
-        if (!lock) {
-                spin_lock_init(&q->__queue_lock);
-                lock = &q->__queue_lock;
-        }
-
-        q->request_fn           = rfn;
-        q->back_merge_fn        = ll_back_merge_fn;
-        q->front_merge_fn       = ll_front_merge_fn;
-        q->merge_requests_fn    = ll_merge_requests_fn;
-        q->prep_rq_fn           = NULL;
-        q->unplug_fn            = generic_unplug_device;
-        q->queue_flags          = (1 << QUEUE_FLAG_CLUSTER);
-        q->queue_lock           = lock;
-
-        blk_queue_segment_boundary(q, 0xffffffff);
-
-        blk_queue_make_request(q, __make_request);
-        blk_queue_max_segment_size(q, MAX_SEGMENT_SIZE);
-
-        blk_queue_max_hw_segments(q, MAX_HW_SEGMENTS);
-        blk_queue_max_phys_segments(q, MAX_PHYS_SEGMENTS);
-
-        /*
-         * all done
-         */
-        if (!elevator_init(q, NULL)) {
-                blk_queue_congestion_threshold(q);
-                return q;
-        }
-
-        blk_cleanup_queue(q);
-out_init:
-        kmem_cache_free(requestq_cachep, q);
-        return NULL;
-}
-EXPORT_SYMBOL(blk_init_queue_node);
-
-int blk_get_queue(request_queue_t *q)
-{
-        if (likely(!test_bit(QUEUE_FLAG_DEAD, &q->queue_flags))) {
-                atomic_inc(&q->refcnt);
-                return 0;
-        }
-
-        return 1;
-}
-
-EXPORT_SYMBOL(blk_get_queue);
-
-static inline void blk_free_request(request_queue_t *q, struct request *rq)
-{
-        if (rq->flags & REQ_ELVPRIV)
-                elv_put_request(q, rq);
-        mempool_free(rq, q->rq.rq_pool);
-}
-
-static inline struct request *
-blk_alloc_request(request_queue_t *q, int rw, struct bio *bio,
-                  int priv, gfp_t gfp_mask)
-{
-        struct request *rq = mempool_alloc(q->rq.rq_pool, gfp_mask);
-
-        if (!rq)
-                return NULL;
-
-        /*
-         * first three bits are identical in rq->flags and bio->bi_rw,
-         * see bio.h and blkdev.h
-         */
-        rq->flags = rw;
-
-        if (priv) {
-                if (unlikely(elv_set_request(q, rq, bio, gfp_mask))) {
-                        mempool_free(rq, q->rq.rq_pool);
-                        return NULL;
-                }
-                rq->flags |= REQ_ELVPRIV;
-        }
-
-        return rq;
-}
-
-/*
- * ioc_batching returns true if the ioc is a valid batching request and
- * should be given priority access to a request.
- */
-static inline int ioc_batching(request_queue_t *q, struct io_context *ioc)
-{
-        if (!ioc)
-                return 0;
-
-        /*
-         * Make sure the process is able to allocate at least 1 request
-         * even if the batch times out, otherwise we could theoretically
-         * lose wakeups.
-         */
-        return ioc->nr_batch_requests == q->nr_batching ||
-                (ioc->nr_batch_requests > 0
-                && time_before(jiffies, ioc->last_waited + BLK_BATCH_TIME));
-}
-
-/*
- * ioc_set_batching sets ioc to be a new "batcher" if it is not one. This
- * will cause the process to be a "batcher" on all queues in the system. This
- * is the behaviour we want though - once it gets a wakeup it should be given
- * a nice run.
- */
-static void ioc_set_batching(request_queue_t *q, struct io_context *ioc)
-{
-        if (!ioc || ioc_batching(q, ioc))
-                return;
-
-        ioc->nr_batch_requests = q->nr_batching;
-        ioc->last_waited = jiffies;
-}
-
-static void __freed_request(request_queue_t *q, int rw)
-{
-        struct request_list *rl = &q->rq;
-
-        if (rl->count[rw] < queue_congestion_off_threshold(q))
-                clear_queue_congested(q, rw);
-
-        if (rl->count[rw] + 1 <= q->nr_requests) {
-                if (waitqueue_active(&rl->wait[rw]))
-                        wake_up(&rl->wait[rw]);
-
-                blk_clear_queue_full(q, rw);
-        }
-}
-
-/*
- * A request has just been released.  Account for it, update the full and
- * congestion status, wake up any waiters.   Called under q->queue_lock.
- */
-static void freed_request(request_queue_t *q, int rw, int priv)
-{
-        struct request_list *rl = &q->rq;
-
-        rl->count[rw]--;
-        if (priv)
-                rl->elvpriv--;
-
-        __freed_request(q, rw);
-
-        if (unlikely(rl->starved[rw ^ 1]))
-                __freed_request(q, rw ^ 1);
-}
-
-#define blkdev_free_rq(list) list_entry((list)->next, struct request, queuelist)
-/*
- * Get a free request, queue_lock must be held.
- * Returns NULL on failure, with queue_lock held.
- * Returns !NULL on success, with queue_lock *not held*.
- */
-static struct request *get_request(request_queue_t *q, int rw, struct bio *bio,
-                                   gfp_t gfp_mask)
-{
-        struct request *rq = NULL;
-        struct request_list *rl = &q->rq;
-        struct io_context *ioc = current_io_context(GFP_ATOMIC);
-        int priv;
-
-        if (rl->count[rw]+1 >= q->nr_requests) {
-                /*
-                 * The queue will fill after this allocation, so set it as
-                 * full, and mark this process as "batching". This process
-                 * will be allowed to complete a batch of requests, others
-                 * will be blocked.
-                 */
-                if (!blk_queue_full(q, rw)) {
-                        ioc_set_batching(q, ioc);
-                        blk_set_queue_full(q, rw);
-                }
-        }
-
-        switch (elv_may_queue(q, rw, bio)) {
-                case ELV_MQUEUE_NO:
-                        goto rq_starved;
-                case ELV_MQUEUE_MAY:
-                        break;
-                case ELV_MQUEUE_MUST:
-                        goto get_rq;
-        }
-
-        if (blk_queue_full(q, rw) && !ioc_batching(q, ioc)) {
-                /*
-                 * The queue is full and the allocating process is not a
-                 * "batcher", and not exempted by the IO scheduler
-                 */
-                goto out;
-        }
-
-get_rq:
-        /*
-         * Only allow batching queuers to allocate up to 50% over the defined
-         * limit of requests, otherwise we could have thousands of requests
-         * allocated with any setting of ->nr_requests
-         */
-        if (rl->count[rw] >= (3 * q->nr_requests / 2))
-                goto out;
-
-        rl->count[rw]++;
-        rl->starved[rw] = 0;
-        if (rl->count[rw] >= queue_congestion_on_threshold(q))
-                set_queue_congested(q, rw);
-
-        priv = !test_bit(QUEUE_FLAG_ELVSWITCH, &q->queue_flags);
-        if (priv)
-                rl->elvpriv++;
-
-        spin_unlock_irq(q->queue_lock);
-
-        rq = blk_alloc_request(q, rw, bio, priv, gfp_mask);
-        if (!rq) {
-                /*
-                 * Allocation failed presumably due to memory. Undo anything
-                 * we might have messed up.
-                 *
-                 * Allocating task should really be put onto the front of the
-                 * wait queue, but this is pretty rare.
-                 */
-                spin_lock_irq(q->queue_lock);
-                freed_request(q, rw, priv);
-
-                /*
-                 * in the very unlikely event that allocation failed and no
-                 * requests for this direction was pending, mark us starved
-                 * so that freeing of a request in the other direction will
-                 * notice us. another possible fix would be to split the
-                 * rq mempool into READ and WRITE
-                 */
-rq_starved:
-                if (unlikely(rl->count[rw] == 0))
-                        rl->starved[rw] = 1;
-
-                goto out;
-        }
-
-        if (ioc_batching(q, ioc))
-                ioc->nr_batch_requests--;
-        
-        rq_init(q, rq);
-        rq->rl = rl;
-out:
-        return rq;
-}
-
-/*
- * No available requests for this queue, unplug the device and wait for some
- * requests to become available.
- *
- * Called with q->queue_lock held, and returns with it unlocked.
- */
-static struct request *get_request_wait(request_queue_t *q, int rw,
-                                        struct bio *bio)
-{
-        struct request *rq;
-
-        rq = get_request(q, rw, bio, GFP_NOIO);
-        while (!rq) {
-                DEFINE_WAIT(wait);
-                struct request_list *rl = &q->rq;
-
-                prepare_to_wait_exclusive(&rl->wait[rw], &wait,
-                                TASK_UNINTERRUPTIBLE);
-
-                rq = get_request(q, rw, bio, GFP_NOIO);
-
-                if (!rq) {
-                        struct io_context *ioc;
-
-                        __generic_unplug_device(q);
-                        spin_unlock_irq(q->queue_lock);
-                        io_schedule();
-
-                        /*
-                         * After sleeping, we become a "batching" process and
-                         * will be able to allocate at least one request, and
-                         * up to a big batch of them for a small period time.
-                         * See ioc_batching, ioc_set_batching
-                         */
-                        ioc = current_io_context(GFP_NOIO);
-                        ioc_set_batching(q, ioc);
-
-                        spin_lock_irq(q->queue_lock);
-                }
-                finish_wait(&rl->wait[rw], &wait);
-        }
-
-        return rq;
-}
-
-struct request *blk_get_request(request_queue_t *q, int rw, gfp_t gfp_mask)
-{
-        struct request *rq;
-
-        BUG_ON(rw != READ && rw != WRITE);
-
-        spin_lock_irq(q->queue_lock);
-        if (gfp_mask & __GFP_WAIT) {
-                rq = get_request_wait(q, rw, NULL);
-        } else {
-                rq = get_request(q, rw, NULL, gfp_mask);
-                if (!rq)
-                        spin_unlock_irq(q->queue_lock);
-        }
-        /* q->queue_lock is unlocked at this point */
-
-        return rq;
-}
-EXPORT_SYMBOL(blk_get_request);
-
-/**
- * blk_requeue_request - put a request back on queue
- * @q:          request queue where request should be inserted
- * @rq:         request to be inserted
- *
- * Description:
- *    Drivers often keep queueing requests until the hardware cannot accept
- *    more, when that condition happens we need to put the request back
- *    on the queue. Must be called with queue lock held.
- */
-void blk_requeue_request(request_queue_t *q, struct request *rq)
-{
-        if (blk_rq_tagged(rq))
-                blk_queue_end_tag(q, rq);
-
-        elv_requeue_request(q, rq);
-}
-
-EXPORT_SYMBOL(blk_requeue_request);
-
-/**
- * blk_insert_request - insert a special request in to a request queue
- * @q:          request queue where request should be inserted
- * @rq:         request to be inserted
- * @at_head:    insert request at head or tail of queue
- * @data:       private data
- *
- * Description:
- *    Many block devices need to execute commands asynchronously, so they don't
- *    block the whole kernel from preemption during request execution.  This is
- *    accomplished normally by inserting aritficial requests tagged as
- *    REQ_SPECIAL in to the corresponding request queue, and letting them be
- *    scheduled for actual execution by the request queue.
- *
- *    We have the option of inserting the head or the tail of the queue.
- *    Typically we use the tail for new ioctls and so forth.  We use the head
- *    of the queue for things like a QUEUE_FULL message from a device, or a
- *    host that is unable to accept a particular command.
- */
-void blk_insert_request(request_queue_t *q, struct request *rq,
-                        int at_head, void *data)
-{
-        int where = at_head ? ELEVATOR_INSERT_FRONT : ELEVATOR_INSERT_BACK;
-        unsigned long flags;
-
-        /*
-         * tell I/O scheduler that this isn't a regular read/write (ie it
-         * must not attempt merges on this) and that it acts as a soft
-         * barrier
-         */
-        rq->flags |= REQ_SPECIAL | REQ_SOFTBARRIER;
-
-        rq->special = data;
-
-        spin_lock_irqsave(q->queue_lock, flags);
-
-        /*
-         * If command is tagged, release the tag
-         */
-        if (blk_rq_tagged(rq))
-                blk_queue_end_tag(q, rq);
-
-        drive_stat_acct(rq, rq->nr_sectors, 1);
-        __elv_add_request(q, rq, where, 0);
-
-        if (blk_queue_plugged(q))
-                __generic_unplug_device(q);
-        else
-                q->request_fn(q);
-        spin_unlock_irqrestore(q->queue_lock, flags);
-}
-
-EXPORT_SYMBOL(blk_insert_request);
-
-/**
- * blk_rq_map_user - map user data to a request, for REQ_BLOCK_PC usage
- * @q:          request queue where request should be inserted
- * @rq:         request structure to fill
- * @ubuf:       the user buffer
- * @len:        length of user data
- *
- * Description:
- *    Data will be mapped directly for zero copy io, if possible. Otherwise
- *    a kernel bounce buffer is used.
- *
- *    A matching blk_rq_unmap_user() must be issued at the end of io, while
- *    still in process context.
- *
- *    Note: The mapped bio may need to be bounced through blk_queue_bounce()
- *    before being submitted to the device, as pages mapped may be out of
- *    reach. It's the callers responsibility to make sure this happens. The
- *    original bio must be passed back in to blk_rq_unmap_user() for proper
- *    unmapping.
- */
-int blk_rq_map_user(request_queue_t *q, struct request *rq, void __user *ubuf,
-                    unsigned int len)
-{
-        unsigned long uaddr;
-        struct bio *bio;
-        int reading;
-
-        if (len > (q->max_sectors << 9))
-                return -EINVAL;
-        if (!len || !ubuf)
-                return -EINVAL;
-
-        reading = rq_data_dir(rq) == READ;
-
-        /*
-         * if alignment requirement is satisfied, map in user pages for
-         * direct dma. else, set up kernel bounce buffers
-         */
-        uaddr = (unsigned long) ubuf;
-        if (!(uaddr & queue_dma_alignment(q)) && !(len & queue_dma_alignment(q)))
-                bio = bio_map_user(q, NULL, uaddr, len, reading);
-        else
-                bio = bio_copy_user(q, uaddr, len, reading);
-
-        if (!IS_ERR(bio)) {
-                rq->bio = rq->biotail = bio;
-                blk_rq_bio_prep(q, rq, bio);
-
-                rq->buffer = rq->data = NULL;
-                rq->data_len = len;
-                return 0;
-        }
-
-        /*
-         * bio is the err-ptr
-         */
-        return PTR_ERR(bio);
-}
-
-EXPORT_SYMBOL(blk_rq_map_user);
-
-/**
- * blk_rq_map_user_iov - map user data to a request, for REQ_BLOCK_PC usage
- * @q:          request queue where request should be inserted
- * @rq:         request to map data to
- * @iov:        pointer to the iovec
- * @iov_count:  number of elements in the iovec
- *
- * Description:
- *    Data will be mapped directly for zero copy io, if possible. Otherwise
- *    a kernel bounce buffer is used.
- *
- *    A matching blk_rq_unmap_user() must be issued at the end of io, while
- *    still in process context.
- *
- *    Note: The mapped bio may need to be bounced through blk_queue_bounce()
- *    before being submitted to the device, as pages mapped may be out of
- *    reach. It's the callers responsibility to make sure this happens. The
- *    original bio must be passed back in to blk_rq_unmap_user() for proper
- *    unmapping.
- */
-int blk_rq_map_user_iov(request_queue_t *q, struct request *rq,
-                        struct sg_iovec *iov, int iov_count)
-{
-        struct bio *bio;
-
-        if (!iov || iov_count <= 0)
-                return -EINVAL;
-
-        /* we don't allow misaligned data like bio_map_user() does.  If the
-         * user is using sg, they're expected to know the alignment constraints
-         * and respect them accordingly */
-        bio = bio_map_user_iov(q, NULL, iov, iov_count, rq_data_dir(rq)== READ);
-        if (IS_ERR(bio))
-                return PTR_ERR(bio);
-
-        rq->bio = rq->biotail = bio;
-        blk_rq_bio_prep(q, rq, bio);
-        rq->buffer = rq->data = NULL;
-        rq->data_len = bio->bi_size;
-        return 0;
-}
-
-EXPORT_SYMBOL(blk_rq_map_user_iov);
-
-/**
- * blk_rq_unmap_user - unmap a request with user data
- * @bio:        bio to be unmapped
- * @ulen:       length of user buffer
- *
- * Description:
- *    Unmap a bio previously mapped by blk_rq_map_user().
- */
-int blk_rq_unmap_user(struct bio *bio, unsigned int ulen)
-{
-        int ret = 0;
-
-        if (bio) {
-                if (bio_flagged(bio, BIO_USER_MAPPED))
-                        bio_unmap_user(bio);
-                else
-                        ret = bio_uncopy_user(bio);
-        }
-
-        return 0;
-}
-
-EXPORT_SYMBOL(blk_rq_unmap_user);
-
-/**
- * blk_rq_map_kern - map kernel data to a request, for REQ_BLOCK_PC usage
- * @q:          request queue where request should be inserted
- * @rq:         request to fill
- * @kbuf:       the kernel buffer
- * @len:        length of user data
- * @gfp_mask:   memory allocation flags
- */
-int blk_rq_map_kern(request_queue_t *q, struct request *rq, void *kbuf,
-                    unsigned int len, gfp_t gfp_mask)
-{
-        struct bio *bio;
-
-        if (len > (q->max_sectors << 9))
-                return -EINVAL;
-        if (!len || !kbuf)
-                return -EINVAL;
-
-        bio = bio_map_kern(q, kbuf, len, gfp_mask);
-        if (IS_ERR(bio))
-                return PTR_ERR(bio);
-
-        if (rq_data_dir(rq) == WRITE)
-                bio->bi_rw |= (1 << BIO_RW);
-
-        rq->bio = rq->biotail = bio;
-        blk_rq_bio_prep(q, rq, bio);
-
-        rq->buffer = rq->data = NULL;
-        rq->data_len = len;
-        return 0;
-}
-
-EXPORT_SYMBOL(blk_rq_map_kern);
-
-/**
- * blk_execute_rq_nowait - insert a request into queue for execution
- * @q:          queue to insert the request in
- * @bd_disk:    matching gendisk
- * @rq:         request to insert
- * @at_head:    insert request at head or tail of queue
- * @done:       I/O completion handler
- *
- * Description:
- *    Insert a fully prepared request at the back of the io scheduler queue
- *    for execution.  Don't wait for completion.
- */
-void blk_execute_rq_nowait(request_queue_t *q, struct gendisk *bd_disk,
-                           struct request *rq, int at_head,
-                           void (*done)(struct request *))
-{
-        int where = at_head ? ELEVATOR_INSERT_FRONT : ELEVATOR_INSERT_BACK;
-
-        rq->rq_disk = bd_disk;
-        rq->flags |= REQ_NOMERGE;
-        rq->end_io = done;
-        elv_add_request(q, rq, where, 1);
-        generic_unplug_device(q);
-}
-
-/**
- * blk_execute_rq - insert a request into queue for execution
- * @q:          queue to insert the request in
- * @bd_disk:    matching gendisk
- * @rq:         request to insert
- * @at_head:    insert request at head or tail of queue
- *
- * Description:
- *    Insert a fully prepared request at the back of the io scheduler queue
- *    for execution and wait for completion.
- */
-int blk_execute_rq(request_queue_t *q, struct gendisk *bd_disk,
-                   struct request *rq, int at_head)
-{
-        DECLARE_COMPLETION(wait);
-        char sense[SCSI_SENSE_BUFFERSIZE];
-        int err = 0;
-
-        /*
-         * we need an extra reference to the request, so we can look at
-         * it after io completion
-         */
-        rq->ref_count++;
-
-        if (!rq->sense) {
-                memset(sense, 0, sizeof(sense));
-                rq->sense = sense;
-                rq->sense_len = 0;
-        }
-
-        rq->waiting = &wait;
-        blk_execute_rq_nowait(q, bd_disk, rq, at_head, blk_end_sync_rq);
-        wait_for_completion(&wait);
-        rq->waiting = NULL;
-
-        if (rq->errors)
-                err = -EIO;
-
-        return err;
-}
-
-EXPORT_SYMBOL(blk_execute_rq);
-
-/**
- * blkdev_issue_flush - queue a flush
- * @bdev:       blockdev to issue flush for
- * @error_sector:       error sector
- *
- * Description:
- *    Issue a flush for the block device in question. Caller can supply
- *    room for storing the error offset in case of a flush error, if they
- *    wish to.  Caller must run wait_for_completion() on its own.
- */
-int blkdev_issue_flush(struct block_device *bdev, sector_t *error_sector)
-{
-        request_queue_t *q;
-
-        if (bdev->bd_disk == NULL)
-                return -ENXIO;
-
-        q = bdev_get_queue(bdev);
-        if (!q)
-                return -ENXIO;
-        if (!q->issue_flush_fn)
-                return -EOPNOTSUPP;
-
-        return q->issue_flush_fn(q, bdev->bd_disk, error_sector);
-}
-
-EXPORT_SYMBOL(blkdev_issue_flush);
-
-static void drive_stat_acct(struct request *rq, int nr_sectors, int new_io)
-{
-        int rw = rq_data_dir(rq);
-
-        if (!blk_fs_request(rq) || !rq->rq_disk)
-                return;
-
-        if (!new_io) {
-                __disk_stat_inc(rq->rq_disk, merges[rw]);
-        } else {
-                disk_round_stats(rq->rq_disk);
-                rq->rq_disk->in_flight++;
-        }
-}
-
-/*
- * add-request adds a request to the linked list.
- * queue lock is held and interrupts disabled, as we muck with the
- * request queue list.
- */
-static inline void add_request(request_queue_t * q, struct request * req)
-{
-        drive_stat_acct(req, req->nr_sectors, 1);
-
-        if (q->activity_fn)
-                q->activity_fn(q->activity_data, rq_data_dir(req));
-
-        /*
-         * elevator indicated where it wants this request to be
-         * inserted at elevator_merge time
-         */
-        __elv_add_request(q, req, ELEVATOR_INSERT_SORT, 0);
-}
- 
-/*
- * disk_round_stats()   - Round off the performance stats on a struct
- * disk_stats.
- *
- * The average IO queue length and utilisation statistics are maintained
- * by observing the current state of the queue length and the amount of
- * time it has been in this state for.
- *
- * Normally, that accounting is done on IO completion, but that can result
- * in more than a second's worth of IO being accounted for within any one
- * second, leading to >100% utilisation.  To deal with that, we call this
- * function to do a round-off before returning the results when reading
- * /proc/diskstats.  This accounts immediately for all queue usage up to
- * the current jiffies and restarts the counters again.
- */
-void disk_round_stats(struct gendisk *disk)
-{
-        unsigned long now = jiffies;
-
-        if (now == disk->stamp)
-                return;
-
-        if (disk->in_flight) {
-                __disk_stat_add(disk, time_in_queue,
-                                disk->in_flight * (now - disk->stamp));
-                __disk_stat_add(disk, io_ticks, (now - disk->stamp));
-        }
-        disk->stamp = now;
-}
-
-/*
- * queue lock must be held
- */
-static void __blk_put_request(request_queue_t *q, struct request *req)
-{
-        struct request_list *rl = req->rl;
-
-        if (unlikely(!q))
-                return;
-        if (unlikely(--req->ref_count))
-                return;
-
-        elv_completed_request(q, req);
-
-        req->rq_status = RQ_INACTIVE;
-        req->rl = NULL;
-
-        /*
-         * Request may not have originated from ll_rw_blk. if not,
-         * it didn't come out of our reserved rq pools
-         */
-        if (rl) {
-                int rw = rq_data_dir(req);
-                int priv = req->flags & REQ_ELVPRIV;
-
-                BUG_ON(!list_empty(&req->queuelist));
-
-                blk_free_request(q, req);
-                freed_request(q, rw, priv);
-        }
-}
-
-void blk_put_request(struct request *req)
-{
-        unsigned long flags;
-        request_queue_t *q = req->q;
-
-        /*
-         * Gee, IDE calls in w/ NULL q.  Fix IDE and remove the
-         * following if (q) test.
-         */
-        if (q) {
-                spin_lock_irqsave(q->queue_lock, flags);
-                __blk_put_request(q, req);
-                spin_unlock_irqrestore(q->queue_lock, flags);
-        }
-}
-
-EXPORT_SYMBOL(blk_put_request);
-
-/**
- * blk_end_sync_rq - executes a completion event on a request
- * @rq: request to complete
- */
-void blk_end_sync_rq(struct request *rq)
-{
-        struct completion *waiting = rq->waiting;
-
-        rq->waiting = NULL;
-        __blk_put_request(rq->q, rq);
-
-        /*
-         * complete last, if this is a stack request the process (and thus
-         * the rq pointer) could be invalid right after this complete()
-         */
-        complete(waiting);
-}
-EXPORT_SYMBOL(blk_end_sync_rq);
-
-/**
- * blk_congestion_wait - wait for a queue to become uncongested
- * @rw: READ or WRITE
- * @timeout: timeout in jiffies
- *
- * Waits for up to @timeout jiffies for a queue (any queue) to exit congestion.
- * If no queues are congested then just wait for the next request to be
- * returned.
- */
-long blk_congestion_wait(int rw, long timeout)
-{
-        long ret;
-        DEFINE_WAIT(wait);
-        wait_queue_head_t *wqh = &congestion_wqh[rw];
-
-        prepare_to_wait(wqh, &wait, TASK_UNINTERRUPTIBLE);
-        ret = io_schedule_timeout(timeout);
-        finish_wait(wqh, &wait);
-        return ret;
-}
-
-EXPORT_SYMBOL(blk_congestion_wait);
-
-/*
- * Has to be called with the request spinlock acquired
- */
-static int attempt_merge(request_queue_t *q, struct request *req,
-                          struct request *next)
-{
-        if (!rq_mergeable(req) || !rq_mergeable(next))
-                return 0;
-
-        /*
-         * not contigious
-         */
-        if (req->sector + req->nr_sectors != next->sector)
-                return 0;
-
-        if (rq_data_dir(req) != rq_data_dir(next)
-            || req->rq_disk != next->rq_disk
-            || next->waiting || next->special)
-                return 0;
-
-        /*
-         * If we are allowed to merge, then append bio list
-         * from next to rq and release next. merge_requests_fn
-         * will have updated segment counts, update sector
-         * counts here.
-         */
-        if (!q->merge_requests_fn(q, req, next))
-                return 0;
-
-        /*
-         * At this point we have either done a back merge
-         * or front merge. We need the smaller start_time of
-         * the merged requests to be the current request
-         * for accounting purposes.
-         */
-        if (time_after(req->start_time, next->start_time))
-                req->start_time = next->start_time;
-
-        req->biotail->bi_next = next->bio;
-        req->biotail = next->biotail;
-
-        req->nr_sectors = req->hard_nr_sectors += next->hard_nr_sectors;
-
-        elv_merge_requests(q, req, next);
-
-        if (req->rq_disk) {
-                disk_round_stats(req->rq_disk);
-                req->rq_disk->in_flight--;
-        }
-
-        req->ioprio = ioprio_best(req->ioprio, next->ioprio);
-
-        __blk_put_request(q, next);
-        return 1;
-}
-
-static inline int attempt_back_merge(request_queue_t *q, struct request *rq)
-{
-        struct request *next = elv_latter_request(q, rq);
-
-        if (next)
-                return attempt_merge(q, rq, next);
-
-        return 0;
-}
-
-static inline int attempt_front_merge(request_queue_t *q, struct request *rq)
-{
-        struct request *prev = elv_former_request(q, rq);
-
-        if (prev)
-                return attempt_merge(q, prev, rq);
-
-        return 0;
-}
-
-/**
- * blk_attempt_remerge  - attempt to remerge active head with next request
- * @q:    The &request_queue_t belonging to the device
- * @rq:   The head request (usually)
- *
- * Description:
- *    For head-active devices, the queue can easily be unplugged so quickly
- *    that proper merging is not done on the front request. This may hurt
- *    performance greatly for some devices. The block layer cannot safely
- *    do merging on that first request for these queues, but the driver can
- *    call this function and make it happen any way. Only the driver knows
- *    when it is safe to do so.
- **/
-void blk_attempt_remerge(request_queue_t *q, struct request *rq)
-{
-        unsigned long flags;
-
-        spin_lock_irqsave(q->queue_lock, flags);
-        attempt_back_merge(q, rq);
-        spin_unlock_irqrestore(q->queue_lock, flags);
-}
-
-EXPORT_SYMBOL(blk_attempt_remerge);
-
-static int __make_request(request_queue_t *q, struct bio *bio)
-{
-        struct request *req;
-        int el_ret, rw, nr_sectors, cur_nr_sectors, barrier, err, sync;
-        unsigned short prio;
-        sector_t sector;
-
-        sector = bio->bi_sector;
-        nr_sectors = bio_sectors(bio);
-        cur_nr_sectors = bio_cur_sectors(bio);
-        prio = bio_prio(bio);
-
-        rw = bio_data_dir(bio);
-        sync = bio_sync(bio);
-
-        /*
-         * low level driver can indicate that it wants pages above a
-         * certain limit bounced to low memory (ie for highmem, or even
-         * ISA dma in theory)
-         */
-        blk_queue_bounce(q, &bio);
-
-        spin_lock_prefetch(q->queue_lock);
-
-        barrier = bio_barrier(bio);
-        if (unlikely(barrier) && (q->ordered == QUEUE_ORDERED_NONE)) {
-                err = -EOPNOTSUPP;
-                goto end_io;
-        }
-
-        spin_lock_irq(q->queue_lock);
-
-        if (unlikely(barrier) || elv_queue_empty(q))
-                goto get_rq;
-
-        el_ret = elv_merge(q, &req, bio);
-        switch (el_ret) {
-                case ELEVATOR_BACK_MERGE:
-                        BUG_ON(!rq_mergeable(req));
-
-                        if (!q->back_merge_fn(q, req, bio))
-                                break;
-
-                        req->biotail->bi_next = bio;
-                        req->biotail = bio;
-                        req->nr_sectors = req->hard_nr_sectors += nr_sectors;
-                        req->ioprio = ioprio_best(req->ioprio, prio);
-                        drive_stat_acct(req, nr_sectors, 0);
-                        if (!attempt_back_merge(q, req))
-                                elv_merged_request(q, req);
-                        goto out;
-
-                case ELEVATOR_FRONT_MERGE:
-                        BUG_ON(!rq_mergeable(req));
-
-                        if (!q->front_merge_fn(q, req, bio))
-                                break;
-
-                        bio->bi_next = req->bio;
-                        req->bio = bio;
-
-                        /*
-                         * may not be valid. if the low level driver said
-                         * it didn't need a bounce buffer then it better
-                         * not touch req->buffer either...
-                         */
-                        req->buffer = bio_data(bio);
-                        req->current_nr_sectors = cur_nr_sectors;
-                        req->hard_cur_sectors = cur_nr_sectors;
-                        req->sector = req->hard_sector = sector;
-                        req->nr_sectors = req->hard_nr_sectors += nr_sectors;
-                        req->ioprio = ioprio_best(req->ioprio, prio);
-                        drive_stat_acct(req, nr_sectors, 0);
-                        if (!attempt_front_merge(q, req))
-                                elv_merged_request(q, req);
-                        goto out;
-
-                /* ELV_NO_MERGE: elevator says don't/can't merge. */
-                default:
-                        ;
-        }
-
-get_rq:
-        /*
-         * Grab a free request. This is might sleep but can not fail.
-         * Returns with the queue unlocked.
-         */
-        req = get_request_wait(q, rw, bio);
-
-        /*
-         * After dropping the lock and possibly sleeping here, our request
-         * may now be mergeable after it had proven unmergeable (above).
-         * We don't worry about that case for efficiency. It won't happen
-         * often, and the elevators are able to handle it.
-         */
-
-        req->flags |= REQ_CMD;
-
-        /*
-         * inherit FAILFAST from bio (for read-ahead, and explicit FAILFAST)
-         */
-        if (bio_rw_ahead(bio) || bio_failfast(bio))
-                req->flags |= REQ_FAILFAST;
-
-        /*
-         * REQ_BARRIER implies no merging, but lets make it explicit
-         */
-        if (unlikely(barrier))
-                req->flags |= (REQ_HARDBARRIER | REQ_NOMERGE);
-
-        req->errors = 0;
-        req->hard_sector = req->sector = sector;
-        req->hard_nr_sectors = req->nr_sectors = nr_sectors;
-        req->current_nr_sectors = req->hard_cur_sectors = cur_nr_sectors;
-        req->nr_phys_segments = bio_phys_segments(q, bio);
-        req->nr_hw_segments = bio_hw_segments(q, bio);
-        req->buffer = bio_data(bio);    /* see ->buffer comment above */
-        req->waiting = NULL;
-        req->bio = req->biotail = bio;
-        req->ioprio = prio;
-        req->rq_disk = bio->bi_bdev->bd_disk;
-        req->start_time = jiffies;
-
-        spin_lock_irq(q->queue_lock);
-        if (elv_queue_empty(q))
-                blk_plug_device(q);
-        add_request(q, req);
-out:
-        if (sync)
-                __generic_unplug_device(q);
-
-        spin_unlock_irq(q->queue_lock);
-        return 0;
-
-end_io:
-        bio_endio(bio, nr_sectors << 9, err);
-        return 0;
-}
-
-/*
- * If bio->bi_dev is a partition, remap the location
- */
-static inline void blk_partition_remap(struct bio *bio)
-{
-        struct block_device *bdev = bio->bi_bdev;
-
-        if (bdev != bdev->bd_contains) {
-                struct hd_struct *p = bdev->bd_part;
-                const int rw = bio_data_dir(bio);
-
-                p->sectors[rw] += bio_sectors(bio);
-                p->ios[rw]++;
-
-                bio->bi_sector += p->start_sect;
-                bio->bi_bdev = bdev->bd_contains;
-        }
-}
-
-static void handle_bad_sector(struct bio *bio)
-{
-        char b[BDEVNAME_SIZE];
-
-        printk(KERN_INFO "attempt to access beyond end of device\n");
-        printk(KERN_INFO "%s: rw=%ld, want=%Lu, limit=%Lu\n",
-                        bdevname(bio->bi_bdev, b),
-                        bio->bi_rw,
-                        (unsigned long long)bio->bi_sector + bio_sectors(bio),
-                        (long long)(bio->bi_bdev->bd_inode->i_size >> 9));
-
-        set_bit(BIO_EOF, &bio->bi_flags);
-}
-
-/**
- * generic_make_request: hand a buffer to its device driver for I/O
- * @bio:  The bio describing the location in memory and on the device.
- *
- * generic_make_request() is used to make I/O requests of block
- * devices. It is passed a &struct bio, which describes the I/O that needs
- * to be done.
- *
- * generic_make_request() does not return any status.  The
- * success/failure status of the request, along with notification of
- * completion, is delivered asynchronously through the bio->bi_end_io
- * function described (one day) else where.
- *
- * The caller of generic_make_request must make sure that bi_io_vec
- * are set to describe the memory buffer, and that bi_dev and bi_sector are
- * set to describe the device address, and the
- * bi_end_io and optionally bi_private are set to describe how
- * completion notification should be signaled.
- *
- * generic_make_request and the drivers it calls may use bi_next if this
- * bio happens to be merged with someone else, and may change bi_dev and
- * bi_sector for remaps as it sees fit.  So the values of these fields
- * should NOT be depended on after the call to generic_make_request.
- */
-void generic_make_request(struct bio *bio)
-{
-        request_queue_t *q;
-        sector_t maxsector;
-        int ret, nr_sectors = bio_sectors(bio);
-
-        might_sleep();
-        /* Test device or partition size, when known. */
-        maxsector = bio->bi_bdev->bd_inode->i_size >> 9;
-        if (maxsector) {
-                sector_t sector = bio->bi_sector;
-
-                if (maxsector < nr_sectors || maxsector - nr_sectors < sector) {
-                        /*
-                         * This may well happen - the kernel calls bread()
-                         * without checking the size of the device, e.g., when
-                         * mounting a device.
-                         */
-                        handle_bad_sector(bio);
-                        goto end_io;
-                }
-        }
-
-        /*
-         * Resolve the mapping until finished. (drivers are
-         * still free to implement/resolve their own stacking
-         * by explicitly returning 0)
-         *
-         * NOTE: we don't repeat the blk_size check for each new device.
-         * Stacking drivers are expected to know what they are doing.
-         */
-        do {
-                char b[BDEVNAME_SIZE];
-
-                q = bdev_get_queue(bio->bi_bdev);
-                if (!q) {
-                        printk(KERN_ERR
-                               "generic_make_request: Trying to access "
-                                "nonexistent block-device %s (%Lu)\n",
-                                bdevname(bio->bi_bdev, b),
-                                (long long) bio->bi_sector);
-end_io:
-                        bio_endio(bio, bio->bi_size, -EIO);
-                        break;
-                }
-
-                if (unlikely(bio_sectors(bio) > q->max_hw_sectors)) {
-                        printk("bio too big device %s (%u > %u)\n", 
-                                bdevname(bio->bi_bdev, b),
-                                bio_sectors(bio),
-                                q->max_hw_sectors);
-                        goto end_io;
-                }
-
-                if (unlikely(test_bit(QUEUE_FLAG_DEAD, &q->queue_flags)))
-                        goto end_io;
-
-                /*
-                 * If this device has partitions, remap block n
-                 * of partition p to block n+start(p) of the disk.
-                 */
-                blk_partition_remap(bio);
-
-                ret = q->make_request_fn(q, bio);
-        } while (ret);
-}
-
-EXPORT_SYMBOL(generic_make_request);
-
-/**
- * submit_bio: submit a bio to the block device layer for I/O
- * @rw: whether to %READ or %WRITE, or maybe to %READA (read ahead)
- * @bio: The &struct bio which describes the I/O
- *
- * submit_bio() is very similar in purpose to generic_make_request(), and
- * uses that function to do most of the work. Both are fairly rough
- * interfaces, @bio must be presetup and ready for I/O.
- *
- */
-void submit_bio(int rw, struct bio *bio)
-{
-        int count = bio_sectors(bio);
-
-        BIO_BUG_ON(!bio->bi_size);
-        BIO_BUG_ON(!bio->bi_io_vec);
-        bio->bi_rw |= rw;
-        if (rw & WRITE)
-                mod_page_state(pgpgout, count);
-        else
-                mod_page_state(pgpgin, count);
-
-        if (unlikely(block_dump)) {
-                char b[BDEVNAME_SIZE];
-                printk(KERN_DEBUG "%s(%d): %s block %Lu on %s\n",
-                        current->comm, current->pid,
-                        (rw & WRITE) ? "WRITE" : "READ",
-                        (unsigned long long)bio->bi_sector,
-                        bdevname(bio->bi_bdev,b));
-        }
-
-        generic_make_request(bio);
-}
-
-EXPORT_SYMBOL(submit_bio);
-
-static void blk_recalc_rq_segments(struct request *rq)
-{
-        struct bio *bio, *prevbio = NULL;
-        int nr_phys_segs, nr_hw_segs;
-        unsigned int phys_size, hw_size;
-        request_queue_t *q = rq->q;
-
-        if (!rq->bio)
-                return;
-
-        phys_size = hw_size = nr_phys_segs = nr_hw_segs = 0;
-        rq_for_each_bio(bio, rq) {
-                /* Force bio hw/phys segs to be recalculated. */
-                bio->bi_flags &= ~(1 << BIO_SEG_VALID);
-
-                nr_phys_segs += bio_phys_segments(q, bio);
-                nr_hw_segs += bio_hw_segments(q, bio);
-                if (prevbio) {
-                        int pseg = phys_size + prevbio->bi_size + bio->bi_size;
-                        int hseg = hw_size + prevbio->bi_size + bio->bi_size;
-
-                        if (blk_phys_contig_segment(q, prevbio, bio) &&
-                            pseg <= q->max_segment_size) {
-                                nr_phys_segs--;
-                                phys_size += prevbio->bi_size + bio->bi_size;
-                        } else
-                                phys_size = 0;
-
-                        if (blk_hw_contig_segment(q, prevbio, bio) &&
-                            hseg <= q->max_segment_size) {
-                                nr_hw_segs--;
-                                hw_size += prevbio->bi_size + bio->bi_size;
-                        } else
-                                hw_size = 0;
-                }
-                prevbio = bio;
-        }
-
-        rq->nr_phys_segments = nr_phys_segs;
-        rq->nr_hw_segments = nr_hw_segs;
-}
-
-static void blk_recalc_rq_sectors(struct request *rq, int nsect)
-{
-        if (blk_fs_request(rq)) {
-                rq->hard_sector += nsect;
-                rq->hard_nr_sectors -= nsect;
-
-                /*
-                 * Move the I/O submission pointers ahead if required.
-                 */
-                if ((rq->nr_sectors >= rq->hard_nr_sectors) &&
-                    (rq->sector <= rq->hard_sector)) {
-                        rq->sector = rq->hard_sector;
-                        rq->nr_sectors = rq->hard_nr_sectors;
-                        rq->hard_cur_sectors = bio_cur_sectors(rq->bio);
-                        rq->current_nr_sectors = rq->hard_cur_sectors;
-                        rq->buffer = bio_data(rq->bio);
-                }
-
-                /*
-                 * if total number of sectors is less than the first segment
-                 * size, something has gone terribly wrong
-                 */
-                if (rq->nr_sectors < rq->current_nr_sectors) {
-                        printk("blk: request botched\n");
-                        rq->nr_sectors = rq->current_nr_sectors;
-                }
-        }
-}
-
-static int __end_that_request_first(struct request *req, int uptodate,
-                                    int nr_bytes)
-{
-        int total_bytes, bio_nbytes, error, next_idx = 0;
-        struct bio *bio;
-
-        /*
-         * extend uptodate bool to allow < 0 value to be direct io error
-         */
-        error = 0;
-        if (end_io_error(uptodate))
-                error = !uptodate ? -EIO : uptodate;
-
-        /*
-         * for a REQ_BLOCK_PC request, we want to carry any eventual
-         * sense key with us all the way through
-         */
-        if (!blk_pc_request(req))
-                req->errors = 0;
-
-        if (!uptodate) {
-                if (blk_fs_request(req) && !(req->flags & REQ_QUIET))
-                        printk("end_request: I/O error, dev %s, sector %llu\n",
-                                req->rq_disk ? req->rq_disk->disk_name : "?",
-                                (unsigned long long)req->sector);
-        }
-
-        if (blk_fs_request(req) && req->rq_disk) {
-                const int rw = rq_data_dir(req);
-
-                __disk_stat_add(req->rq_disk, sectors[rw], nr_bytes >> 9);
-        }
-
-        total_bytes = bio_nbytes = 0;
-        while ((bio = req->bio) != NULL) {
-                int nbytes;
-
-                if (nr_bytes >= bio->bi_size) {
-                        req->bio = bio->bi_next;
-                        nbytes = bio->bi_size;
-                        bio_endio(bio, nbytes, error);
-                        next_idx = 0;
-                        bio_nbytes = 0;
-                } else {
-                        int idx = bio->bi_idx + next_idx;
-
-                        if (unlikely(bio->bi_idx >= bio->bi_vcnt)) {
-                                blk_dump_rq_flags(req, "__end_that");
-                                printk("%s: bio idx %d >= vcnt %d\n",
-                                                __FUNCTION__,
-                                                bio->bi_idx, bio->bi_vcnt);
-                                break;
-                        }
-
-                        nbytes = bio_iovec_idx(bio, idx)->bv_len;
-                        BIO_BUG_ON(nbytes > bio->bi_size);
-
-                        /*
-                         * not a complete bvec done
-                         */
-                        if (unlikely(nbytes > nr_bytes)) {
-                                bio_nbytes += nr_bytes;
-                                total_bytes += nr_bytes;
-                                break;
-                        }
-
-                        /*
-                         * advance to the next vector
-                         */
-                        next_idx++;
-                        bio_nbytes += nbytes;
-                }
-
-                total_bytes += nbytes;
-                nr_bytes -= nbytes;
-
-                if ((bio = req->bio)) {
-                        /*
-                         * end more in this run, or just return 'not-done'
-                         */
-                        if (unlikely(nr_bytes <= 0))
-                                break;
-                }
-        }
-
-        /*
-         * completely done
-         */
-        if (!req->bio)
-                return 0;
-
-        /*
-         * if the request wasn't completed, update state
-         */
-        if (bio_nbytes) {
-                bio_endio(bio, bio_nbytes, error);
-                bio->bi_idx += next_idx;
-                bio_iovec(bio)->bv_offset += nr_bytes;
-                bio_iovec(bio)->bv_len -= nr_bytes;
-        }
-
-        blk_recalc_rq_sectors(req, total_bytes >> 9);
-        blk_recalc_rq_segments(req);
-        return 1;
-}
-
-/**
- * end_that_request_first - end I/O on a request
- * @req:      the request being processed
- * @uptodate: 1 for success, 0 for I/O error, < 0 for specific error
- * @nr_sectors: number of sectors to end I/O on
- *
- * Description:
- *     Ends I/O on a number of sectors attached to @req, and sets it up
- *     for the next range of segments (if any) in the cluster.
- *
- * Return:
- *     0 - we are done with this request, call end_that_request_last()
- *     1 - still buffers pending for this request
- **/
-int end_that_request_first(struct request *req, int uptodate, int nr_sectors)
-{
-        return __end_that_request_first(req, uptodate, nr_sectors << 9);
-}
-
-EXPORT_SYMBOL(end_that_request_first);
-
-/**
- * end_that_request_chunk - end I/O on a request
- * @req:      the request being processed
- * @uptodate: 1 for success, 0 for I/O error, < 0 for specific error
- * @nr_bytes: number of bytes to complete
- *
- * Description:
- *     Ends I/O on a number of bytes attached to @req, and sets it up
- *     for the next range of segments (if any). Like end_that_request_first(),
- *     but deals with bytes instead of sectors.
- *
- * Return:
- *     0 - we are done with this request, call end_that_request_last()
- *     1 - still buffers pending for this request
- **/
-int end_that_request_chunk(struct request *req, int uptodate, int nr_bytes)
-{
-        return __end_that_request_first(req, uptodate, nr_bytes);
-}
-
-EXPORT_SYMBOL(end_that_request_chunk);
-
-/*
- * queue lock must be held
- */
-void end_that_request_last(struct request *req)
-{
-        struct gendisk *disk = req->rq_disk;
-
-        if (unlikely(laptop_mode) && blk_fs_request(req))
-                laptop_io_completion();
-
-        if (disk && blk_fs_request(req)) {
-                unsigned long duration = jiffies - req->start_time;
-                const int rw = rq_data_dir(req);
-
-                __disk_stat_inc(disk, ios[rw]);
-                __disk_stat_add(disk, ticks[rw], duration);
-                disk_round_stats(disk);
-                disk->in_flight--;
-        }
-        if (req->end_io)
-                req->end_io(req);
-        else
-                __blk_put_request(req->q, req);
-}
-
-EXPORT_SYMBOL(end_that_request_last);
-
-void end_request(struct request *req, int uptodate)
-{
-        if (!end_that_request_first(req, uptodate, req->hard_cur_sectors)) {
-                add_disk_randomness(req->rq_disk);
-                blkdev_dequeue_request(req);
-                end_that_request_last(req);
-        }
-}
-
-EXPORT_SYMBOL(end_request);
-
-void blk_rq_bio_prep(request_queue_t *q, struct request *rq, struct bio *bio)
-{
-        /* first three bits are identical in rq->flags and bio->bi_rw */
-        rq->flags |= (bio->bi_rw & 7);
-
-        rq->nr_phys_segments = bio_phys_segments(q, bio);
-        rq->nr_hw_segments = bio_hw_segments(q, bio);
-        rq->current_nr_sectors = bio_cur_sectors(bio);
-        rq->hard_cur_sectors = rq->current_nr_sectors;
-        rq->hard_nr_sectors = rq->nr_sectors = bio_sectors(bio);
-        rq->buffer = bio_data(bio);
-
-        rq->bio = rq->biotail = bio;
-}
-
-EXPORT_SYMBOL(blk_rq_bio_prep);
-
-int kblockd_schedule_work(struct work_struct *work)
-{
-        return queue_work(kblockd_workqueue, work);
-}
-
-EXPORT_SYMBOL(kblockd_schedule_work);
-
-void kblockd_flush(void)
-{
-        flush_workqueue(kblockd_workqueue);
-}
-EXPORT_SYMBOL(kblockd_flush);
-
-int __init blk_dev_init(void)
-{
-        kblockd_workqueue = create_workqueue("kblockd");
-        if (!kblockd_workqueue)
-                panic("Failed to create kblockd\n");
-
-        request_cachep = kmem_cache_create("blkdev_requests",
-                        sizeof(struct request), 0, SLAB_PANIC, NULL, NULL);
-
-        requestq_cachep = kmem_cache_create("blkdev_queue",
-                        sizeof(request_queue_t), 0, SLAB_PANIC, NULL, NULL);
-
-        iocontext_cachep = kmem_cache_create("blkdev_ioc",
-                        sizeof(struct io_context), 0, SLAB_PANIC, NULL, NULL);
-
-        blk_max_low_pfn = max_low_pfn;
-        blk_max_pfn = max_pfn;
-
-        return 0;
-}
-
-/*
- * IO Context helper functions
- */
-void put_io_context(struct io_context *ioc)
-{
-        if (ioc == NULL)
-                return;
-
-        BUG_ON(atomic_read(&ioc->refcount) == 0);
-
-        if (atomic_dec_and_test(&ioc->refcount)) {
-                if (ioc->aic && ioc->aic->dtor)
-                        ioc->aic->dtor(ioc->aic);
-                if (ioc->cic && ioc->cic->dtor)
-                        ioc->cic->dtor(ioc->cic);
-
-                kmem_cache_free(iocontext_cachep, ioc);
-        }
-}
-EXPORT_SYMBOL(put_io_context);
-
-/* Called by the exitting task */
-void exit_io_context(void)
-{
-        unsigned long flags;
-        struct io_context *ioc;
-
-        local_irq_save(flags);
-        task_lock(current);
-        ioc = current->io_context;
-        current->io_context = NULL;
-        ioc->task = NULL;
-        task_unlock(current);
-        local_irq_restore(flags);
-
-        if (ioc->aic && ioc->aic->exit)
-                ioc->aic->exit(ioc->aic);
-        if (ioc->cic && ioc->cic->exit)
-                ioc->cic->exit(ioc->cic);
-
-        put_io_context(ioc);
-}
-
-/*
- * If the current task has no IO context then create one and initialise it.
- * Otherwise, return its existing IO context.
- *
- * This returned IO context doesn't have a specifically elevated refcount,
- * but since the current task itself holds a reference, the context can be
- * used in general code, so long as it stays within `current` context.
- */
-struct io_context *current_io_context(gfp_t gfp_flags)
-{
-        struct task_struct *tsk = current;
-        struct io_context *ret;
-
-        ret = tsk->io_context;
-        if (likely(ret))
-                return ret;
-
-        ret = kmem_cache_alloc(iocontext_cachep, gfp_flags);
-        if (ret) {
-                atomic_set(&ret->refcount, 1);
-                ret->task = current;
-                ret->set_ioprio = NULL;
-                ret->last_waited = jiffies; /* doesn't matter... */
-                ret->nr_batch_requests = 0; /* because this is 0 */
-                ret->aic = NULL;
-                ret->cic = NULL;
-                tsk->io_context = ret;
-        }
-
-        return ret;
-}
-EXPORT_SYMBOL(current_io_context);
-
-/*
- * If the current task has no IO context then create one and initialise it.
- * If it does have a context, take a ref on it.
- *
- * This is always called in the context of the task which submitted the I/O.
- */
-struct io_context *get_io_context(gfp_t gfp_flags)
-{
-        struct io_context *ret;
-        ret = current_io_context(gfp_flags);
-        if (likely(ret))
-                atomic_inc(&ret->refcount);
-        return ret;
-}
-EXPORT_SYMBOL(get_io_context);
-
-void copy_io_context(struct io_context **pdst, struct io_context **psrc)
-{
-        struct io_context *src = *psrc;
-        struct io_context *dst = *pdst;
-
-        if (src) {
-                BUG_ON(atomic_read(&src->refcount) == 0);
-                atomic_inc(&src->refcount);
-                put_io_context(dst);
-                *pdst = src;
-        }
-}
-EXPORT_SYMBOL(copy_io_context);
-
-void swap_io_context(struct io_context **ioc1, struct io_context **ioc2)
-{
-        struct io_context *temp;
-        temp = *ioc1;
-        *ioc1 = *ioc2;
-        *ioc2 = temp;
-}
-EXPORT_SYMBOL(swap_io_context);
-
-/*
- * sysfs parts below
- */
-struct queue_sysfs_entry {
-        struct attribute attr;
-        ssize_t (*show)(struct request_queue *, char *);
-        ssize_t (*store)(struct request_queue *, const char *, size_t);
-};
-
-static ssize_t
-queue_var_show(unsigned int var, char *page)
-{
-        return sprintf(page, "%d\n", var);
-}
-
-static ssize_t
-queue_var_store(unsigned long *var, const char *page, size_t count)
-{
-        char *p = (char *) page;
-
-        *var = simple_strtoul(p, &p, 10);
-        return count;
-}
-
-static ssize_t queue_requests_show(struct request_queue *q, char *page)
-{
-        return queue_var_show(q->nr_requests, (page));
-}
-
-static ssize_t
-queue_requests_store(struct request_queue *q, const char *page, size_t count)
-{
-        struct request_list *rl = &q->rq;
-
-        int ret = queue_var_store(&q->nr_requests, page, count);
-        if (q->nr_requests < BLKDEV_MIN_RQ)
-                q->nr_requests = BLKDEV_MIN_RQ;
-        blk_queue_congestion_threshold(q);
-
-        if (rl->count[READ] >= queue_congestion_on_threshold(q))
-                set_queue_congested(q, READ);
-        else if (rl->count[READ] < queue_congestion_off_threshold(q))
-                clear_queue_congested(q, READ);
-
-        if (rl->count[WRITE] >= queue_congestion_on_threshold(q))
-                set_queue_congested(q, WRITE);
-        else if (rl->count[WRITE] < queue_congestion_off_threshold(q))
-                clear_queue_congested(q, WRITE);
-
-        if (rl->count[READ] >= q->nr_requests) {
-                blk_set_queue_full(q, READ);
-        } else if (rl->count[READ]+1 <= q->nr_requests) {
-                blk_clear_queue_full(q, READ);
-                wake_up(&rl->wait[READ]);
-        }
-
-        if (rl->count[WRITE] >= q->nr_requests) {
-                blk_set_queue_full(q, WRITE);
-        } else if (rl->count[WRITE]+1 <= q->nr_requests) {
-                blk_clear_queue_full(q, WRITE);
-                wake_up(&rl->wait[WRITE]);
-        }
-        return ret;
-}
-
-static ssize_t queue_ra_show(struct request_queue *q, char *page)
-{
-        int ra_kb = q->backing_dev_info.ra_pages << (PAGE_CACHE_SHIFT - 10);
-
-        return queue_var_show(ra_kb, (page));
-}
-
-static ssize_t
-queue_ra_store(struct request_queue *q, const char *page, size_t count)
-{
-        unsigned long ra_kb;
-        ssize_t ret = queue_var_store(&ra_kb, page, count);
-
-        spin_lock_irq(q->queue_lock);
-        if (ra_kb > (q->max_sectors >> 1))
-                ra_kb = (q->max_sectors >> 1);
-
-        q->backing_dev_info.ra_pages = ra_kb >> (PAGE_CACHE_SHIFT - 10);
-        spin_unlock_irq(q->queue_lock);
-
-        return ret;
-}
-
-static ssize_t queue_max_sectors_show(struct request_queue *q, char *page)
-{
-        int max_sectors_kb = q->max_sectors >> 1;
-
-        return queue_var_show(max_sectors_kb, (page));
-}
-
-static ssize_t
-queue_max_sectors_store(struct request_queue *q, const char *page, size_t count)
-{
-        unsigned long max_sectors_kb,
-                        max_hw_sectors_kb = q->max_hw_sectors >> 1,
-                        page_kb = 1 << (PAGE_CACHE_SHIFT - 10);
-        ssize_t ret = queue_var_store(&max_sectors_kb, page, count);
-        int ra_kb;
-
-        if (max_sectors_kb > max_hw_sectors_kb || max_sectors_kb < page_kb)
-                return -EINVAL;
-        /*
-         * Take the queue lock to update the readahead and max_sectors
-         * values synchronously:
-         */
-        spin_lock_irq(q->queue_lock);
-        /*
-         * Trim readahead window as well, if necessary:
-         */
-        ra_kb = q->backing_dev_info.ra_pages << (PAGE_CACHE_SHIFT - 10);
-        if (ra_kb > max_sectors_kb)
-                q->backing_dev_info.ra_pages =
-                                max_sectors_kb >> (PAGE_CACHE_SHIFT - 10);
-
-        q->max_sectors = max_sectors_kb << 1;
-        spin_unlock_irq(q->queue_lock);
-
-        return ret;
-}
-
-static ssize_t queue_max_hw_sectors_show(struct request_queue *q, char *page)
-{
-        int max_hw_sectors_kb = q->max_hw_sectors >> 1;
-
-        return queue_var_show(max_hw_sectors_kb, (page));
-}
-
-
-static struct queue_sysfs_entry queue_requests_entry = {
-        .attr = {.name = "nr_requests", .mode = S_IRUGO | S_IWUSR },
-        .show = queue_requests_show,
-        .store = queue_requests_store,
-};
-
-static struct queue_sysfs_entry queue_ra_entry = {
-        .attr = {.name = "read_ahead_kb", .mode = S_IRUGO | S_IWUSR },
-        .show = queue_ra_show,
-        .store = queue_ra_store,
-};
-
-static struct queue_sysfs_entry queue_max_sectors_entry = {
-        .attr = {.name = "max_sectors_kb", .mode = S_IRUGO | S_IWUSR },
-        .show = queue_max_sectors_show,
-        .store = queue_max_sectors_store,
-};
-
-static struct queue_sysfs_entry queue_max_hw_sectors_entry = {
-        .attr = {.name = "max_hw_sectors_kb", .mode = S_IRUGO },
-        .show = queue_max_hw_sectors_show,
-};
-
-static struct queue_sysfs_entry queue_iosched_entry = {
-        .attr = {.name = "scheduler", .mode = S_IRUGO | S_IWUSR },
-        .show = elv_iosched_show,
-        .store = elv_iosched_store,
-};
-
-static struct attribute *default_attrs[] = {
-        &queue_requests_entry.attr,
-        &queue_ra_entry.attr,
-        &queue_max_hw_sectors_entry.attr,
-        &queue_max_sectors_entry.attr,
-        &queue_iosched_entry.attr,
-        NULL,
-};
-
-#define to_queue(atr) container_of((atr), struct queue_sysfs_entry, attr)
-
-static ssize_t
-queue_attr_show(struct kobject *kobj, struct attribute *attr, char *page)
-{
-        struct queue_sysfs_entry *entry = to_queue(attr);
-        struct request_queue *q;
-
-        q = container_of(kobj, struct request_queue, kobj);
-        if (!entry->show)
-                return -EIO;
-
-        return entry->show(q, page);
-}
-
-static ssize_t
-queue_attr_store(struct kobject *kobj, struct attribute *attr,
-                    const char *page, size_t length)
-{
-        struct queue_sysfs_entry *entry = to_queue(attr);
-        struct request_queue *q;
-
-        q = container_of(kobj, struct request_queue, kobj);
-        if (!entry->store)
-                return -EIO;
-
-        return entry->store(q, page, length);
-}
-
-static struct sysfs_ops queue_sysfs_ops = {
-        .show   = queue_attr_show,
-        .store  = queue_attr_store,
-};
-
-static struct kobj_type queue_ktype = {
-        .sysfs_ops      = &queue_sysfs_ops,
-        .default_attrs  = default_attrs,
-};
-
-int blk_register_queue(struct gendisk *disk)
-{
-        int ret;
-
-        request_queue_t *q = disk->queue;
-
-        if (!q || !q->request_fn)
-                return -ENXIO;
-
-        q->kobj.parent = kobject_get(&disk->kobj);
-        if (!q->kobj.parent)
-                return -EBUSY;
-
-        snprintf(q->kobj.name, KOBJ_NAME_LEN, "%s", "queue");
-        q->kobj.ktype = &queue_ktype;
-
-        ret = kobject_register(&q->kobj);
-        if (ret < 0)
-                return ret;
-
-        ret = elv_register_queue(q);
-        if (ret) {
-                kobject_unregister(&q->kobj);
-                return ret;
-        }
-
-        return 0;
-}
-
-void blk_unregister_queue(struct gendisk *disk)
-{
-        request_queue_t *q = disk->queue;
-
-        if (q && q->request_fn) {
-                elv_unregister_queue(q);
-
-                kobject_unregister(&q->kobj);
-                kobject_put(&disk->kobj);
-        }
-}
diff --git a/drivers/block/noop-iosched.c b/drivers/block/noop-iosched.c
deleted file mode 100644
index e54f006e7e60..000000000000
--- a/drivers/block/noop-iosched.c
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * elevator noop
- */
-#include <linux/blkdev.h>
-#include <linux/elevator.h>
-#include <linux/bio.h>
-#include <linux/module.h>
-#include <linux/init.h>
-
-static void elevator_noop_add_request(request_queue_t *q, struct request *rq)
-{
-        rq->flags |= REQ_NOMERGE;
-        elv_dispatch_add_tail(q, rq);
-}
-
-static int elevator_noop_dispatch(request_queue_t *q, int force)
-{
-        return 0;
-}
-
-static struct elevator_type elevator_noop = {
-        .ops = {
-                .elevator_dispatch_fn           = elevator_noop_dispatch,
-                .elevator_add_req_fn            = elevator_noop_add_request,
-        },
-        .elevator_name = "noop",
-        .elevator_owner = THIS_MODULE,
-};
-
-static int __init noop_init(void)
-{
-        return elv_register(&elevator_noop);
-}
-
-static void __exit noop_exit(void)
-{
-        elv_unregister(&elevator_noop);
-}
-
-module_init(noop_init);
-module_exit(noop_exit);
-
-
-MODULE_AUTHOR("Jens Axboe");
-MODULE_LICENSE("GPL");
-MODULE_DESCRIPTION("No-op IO scheduler");
diff --git a/drivers/block/scsi_ioctl.c b/drivers/block/scsi_ioctl.c
deleted file mode 100644
index 382dea7b224c..000000000000
--- a/drivers/block/scsi_ioctl.c
+++ /dev/null
@@ -1,589 +0,0 @@
-/*
- * Copyright (C) 2001 Jens Axboe <axboe@suse.de>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- *
- * 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 Licens
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-
- *
- */
-#include <linux/kernel.h>
-#include <linux/errno.h>
-#include <linux/string.h>
-#include <linux/module.h>
-#include <linux/blkdev.h>
-#include <linux/completion.h>
-#include <linux/cdrom.h>
-#include <linux/slab.h>
-#include <linux/times.h>
-#include <asm/uaccess.h>
-
-#include <scsi/scsi.h>
-#include <scsi/scsi_ioctl.h>
-#include <scsi/scsi_cmnd.h>
-
-/* Command group 3 is reserved and should never be used.  */
-const unsigned char scsi_command_size[8] =
-{
-        6, 10, 10, 12,
-        16, 12, 10, 10
-};
-
-EXPORT_SYMBOL(scsi_command_size);
-
-#define BLK_DEFAULT_TIMEOUT     (60 * HZ)
-
-#include <scsi/sg.h>
-
-static int sg_get_version(int __user *p)
-{
-        static int sg_version_num = 30527;
-        return put_user(sg_version_num, p);
-}
-
-static int scsi_get_idlun(request_queue_t *q, int __user *p)
-{
-        return put_user(0, p);
-}
-
-static int scsi_get_bus(request_queue_t *q, int __user *p)
-{
-        return put_user(0, p);
-}
-
-static int sg_get_timeout(request_queue_t *q)
-{
-        return q->sg_timeout / (HZ / USER_HZ);
-}
-
-static int sg_set_timeout(request_queue_t *q, int __user *p)
-{
-        int timeout, err = get_user(timeout, p);
-
-        if (!err)
-                q->sg_timeout = timeout * (HZ / USER_HZ);
-
-        return err;
-}
-
-static int sg_get_reserved_size(request_queue_t *q, int __user *p)
-{
-        return put_user(q->sg_reserved_size, p);
-}
-
-static int sg_set_reserved_size(request_queue_t *q, int __user *p)
-{
-        int size, err = get_user(size, p);
-
-        if (err)
-                return err;
-
-        if (size < 0)
-                return -EINVAL;
-        if (size > (q->max_sectors << 9))
-                size = q->max_sectors << 9;
-
-        q->sg_reserved_size = size;
-        return 0;
-}
-
-/*
- * will always return that we are ATAPI even for a real SCSI drive, I'm not
- * so sure this is worth doing anything about (why would you care??)
- */
-static int sg_emulated_host(request_queue_t *q, int __user *p)
-{
-        return put_user(1, p);
-}
-
-#define CMD_READ_SAFE   0x01
-#define CMD_WRITE_SAFE  0x02
-#define CMD_WARNED      0x04
-#define safe_for_read(cmd)      [cmd] = CMD_READ_SAFE
-#define safe_for_write(cmd)     [cmd] = CMD_WRITE_SAFE
-
-static int verify_command(struct file *file, unsigned char *cmd)
-{
-        static unsigned char cmd_type[256] = {
-
-                /* Basic read-only commands */
-                safe_for_read(TEST_UNIT_READY),
-                safe_for_read(REQUEST_SENSE),
-                safe_for_read(READ_6),
-                safe_for_read(READ_10),
-                safe_for_read(READ_12),
-                safe_for_read(READ_16),
-                safe_for_read(READ_BUFFER),
-                safe_for_read(READ_DEFECT_DATA),
-                safe_for_read(READ_LONG),
-                safe_for_read(INQUIRY),
-                safe_for_read(MODE_SENSE),
-                safe_for_read(MODE_SENSE_10),
-                safe_for_read(LOG_SENSE),
-                safe_for_read(START_STOP),
-                safe_for_read(GPCMD_VERIFY_10),
-                safe_for_read(VERIFY_16),
-
-                /* Audio CD commands */
-                safe_for_read(GPCMD_PLAY_CD),
-                safe_for_read(GPCMD_PLAY_AUDIO_10),
-                safe_for_read(GPCMD_PLAY_AUDIO_MSF),
-                safe_for_read(GPCMD_PLAY_AUDIO_TI),
-                safe_for_read(GPCMD_PAUSE_RESUME),
-
-                /* CD/DVD data reading */
-                safe_for_read(GPCMD_READ_BUFFER_CAPACITY),
-                safe_for_read(GPCMD_READ_CD),
-                safe_for_read(GPCMD_READ_CD_MSF),
-                safe_for_read(GPCMD_READ_DISC_INFO),
-                safe_for_read(GPCMD_READ_CDVD_CAPACITY),
-                safe_for_read(GPCMD_READ_DVD_STRUCTURE),
-                safe_for_read(GPCMD_READ_HEADER),
-                safe_for_read(GPCMD_READ_TRACK_RZONE_INFO),
-                safe_for_read(GPCMD_READ_SUBCHANNEL),
-                safe_for_read(GPCMD_READ_TOC_PMA_ATIP),
-                safe_for_read(GPCMD_REPORT_KEY),
-                safe_for_read(GPCMD_SCAN),
-                safe_for_read(GPCMD_GET_CONFIGURATION),
-                safe_for_read(GPCMD_READ_FORMAT_CAPACITIES),
-                safe_for_read(GPCMD_GET_EVENT_STATUS_NOTIFICATION),
-                safe_for_read(GPCMD_GET_PERFORMANCE),
-                safe_for_read(GPCMD_SEEK),
-                safe_for_read(GPCMD_STOP_PLAY_SCAN),
-
-                /* Basic writing commands */
-                safe_for_write(WRITE_6),
-                safe_for_write(WRITE_10),
-                safe_for_write(WRITE_VERIFY),
-                safe_for_write(WRITE_12),
-                safe_for_write(WRITE_VERIFY_12),
-                safe_for_write(WRITE_16),
-                safe_for_write(WRITE_LONG),
-                safe_for_write(WRITE_LONG_2),
-                safe_for_write(ERASE),
-                safe_for_write(GPCMD_MODE_SELECT_10),
-                safe_for_write(MODE_SELECT),
-                safe_for_write(LOG_SELECT),
-                safe_for_write(GPCMD_BLANK),
-                safe_for_write(GPCMD_CLOSE_TRACK),
-                safe_for_write(GPCMD_FLUSH_CACHE),
-                safe_for_write(GPCMD_FORMAT_UNIT),
-                safe_for_write(GPCMD_REPAIR_RZONE_TRACK),
-                safe_for_write(GPCMD_RESERVE_RZONE_TRACK),
-                safe_for_write(GPCMD_SEND_DVD_STRUCTURE),
-                safe_for_write(GPCMD_SEND_EVENT),
-                safe_for_write(GPCMD_SEND_KEY),
-                safe_for_write(GPCMD_SEND_OPC),
-                safe_for_write(GPCMD_SEND_CUE_SHEET),
-                safe_for_write(GPCMD_SET_SPEED),
-                safe_for_write(GPCMD_PREVENT_ALLOW_MEDIUM_REMOVAL),
-                safe_for_write(GPCMD_LOAD_UNLOAD),
-                safe_for_write(GPCMD_SET_STREAMING),
-        };
-        unsigned char type = cmd_type[cmd[0]];
-
-        /* Anybody who can open the device can do a read-safe command */
-        if (type & CMD_READ_SAFE)
-                return 0;
-
-        /* Write-safe commands just require a writable open.. */
-        if (type & CMD_WRITE_SAFE) {
-                if (file->f_mode & FMODE_WRITE)
-                        return 0;
-        }
-
-        /* And root can do any command.. */
-        if (capable(CAP_SYS_RAWIO))
-                return 0;
-
-        if (!type) {
-                cmd_type[cmd[0]] = CMD_WARNED;
-                printk(KERN_WARNING "scsi: unknown opcode 0x%02x\n", cmd[0]);
-        }
-
-        /* Otherwise fail it with an "Operation not permitted" */
-        return -EPERM;
-}
-
-static int sg_io(struct file *file, request_queue_t *q,
-                struct gendisk *bd_disk, struct sg_io_hdr *hdr)
-{
-        unsigned long start_time;
-        int writing = 0, ret = 0;
-        struct request *rq;
-        struct bio *bio;
-        char sense[SCSI_SENSE_BUFFERSIZE];
-        unsigned char cmd[BLK_MAX_CDB];
-
-        if (hdr->interface_id != 'S')
-                return -EINVAL;
-        if (hdr->cmd_len > BLK_MAX_CDB)
-                return -EINVAL;
-        if (copy_from_user(cmd, hdr->cmdp, hdr->cmd_len))
-                return -EFAULT;
-        if (verify_command(file, cmd))
-                return -EPERM;
-
-        if (hdr->dxfer_len > (q->max_sectors << 9))
-                return -EIO;
-
-        if (hdr->dxfer_len)
-                switch (hdr->dxfer_direction) {
-                default:
-                        return -EINVAL;
-                case SG_DXFER_TO_FROM_DEV:
-                case SG_DXFER_TO_DEV:
-                        writing = 1;
-                        break;
-                case SG_DXFER_FROM_DEV:
-                        break;
-                }
-
-        rq = blk_get_request(q, writing ? WRITE : READ, GFP_KERNEL);
-        if (!rq)
-                return -ENOMEM;
-
-        if (hdr->iovec_count) {
-                const int size = sizeof(struct sg_iovec) * hdr->iovec_count;
-                struct sg_iovec *iov;
-
-                iov = kmalloc(size, GFP_KERNEL);
-                if (!iov) {
-                        ret = -ENOMEM;
-                        goto out;
-                }
-
-                if (copy_from_user(iov, hdr->dxferp, size)) {
-                        kfree(iov);
-                        ret = -EFAULT;
-                        goto out;
-                }
-
-                ret = blk_rq_map_user_iov(q, rq, iov, hdr->iovec_count);
-                kfree(iov);
-        } else if (hdr->dxfer_len)
-                ret = blk_rq_map_user(q, rq, hdr->dxferp, hdr->dxfer_len);
-
-        if (ret)
-                goto out;
-
-        /*
-         * fill in request structure
-         */
-        rq->cmd_len = hdr->cmd_len;
-        memcpy(rq->cmd, cmd, hdr->cmd_len);
-        if (sizeof(rq->cmd) != hdr->cmd_len)
-                memset(rq->cmd + hdr->cmd_len, 0, sizeof(rq->cmd) - hdr->cmd_len);
-
-        memset(sense, 0, sizeof(sense));
-        rq->sense = sense;
-        rq->sense_len = 0;
-
-        rq->flags |= REQ_BLOCK_PC;
-        bio = rq->bio;
-
-        /*
-         * bounce this after holding a reference to the original bio, it's
-         * needed for proper unmapping
-         */
-        if (rq->bio)
-                blk_queue_bounce(q, &rq->bio);
-
-        rq->timeout = (hdr->timeout * HZ) / 1000;
-        if (!rq->timeout)
-                rq->timeout = q->sg_timeout;
-        if (!rq->timeout)
-                rq->timeout = BLK_DEFAULT_TIMEOUT;
-
-        start_time = jiffies;
-
-        /* ignore return value. All information is passed back to caller
-         * (if he doesn't check that is his problem).
-         * N.B. a non-zero SCSI status is _not_ necessarily an error.
-         */
-        blk_execute_rq(q, bd_disk, rq, 0);
-
-        /* write to all output members */
-        hdr->status = 0xff & rq->errors;
-        hdr->masked_status = status_byte(rq->errors);
-        hdr->msg_status = msg_byte(rq->errors);
-        hdr->host_status = host_byte(rq->errors);
-        hdr->driver_status = driver_byte(rq->errors);
-        hdr->info = 0;
-        if (hdr->masked_status || hdr->host_status || hdr->driver_status)
-                hdr->info |= SG_INFO_CHECK;
-        hdr->resid = rq->data_len;
-        hdr->duration = ((jiffies - start_time) * 1000) / HZ;
-        hdr->sb_len_wr = 0;
-
-        if (rq->sense_len && hdr->sbp) {
-                int len = min((unsigned int) hdr->mx_sb_len, rq->sense_len);
-
-                if (!copy_to_user(hdr->sbp, rq->sense, len))
-                        hdr->sb_len_wr = len;
-        }
-
-        if (blk_rq_unmap_user(bio, hdr->dxfer_len))
-                ret = -EFAULT;
-
-        /* may not have succeeded, but output values written to control
-         * structure (struct sg_io_hdr).  */
-out:
-        blk_put_request(rq);
-        return ret;
-}
-
-#define OMAX_SB_LEN 16          /* For backward compatibility */
-
-static int sg_scsi_ioctl(struct file *file, request_queue_t *q,
-                         struct gendisk *bd_disk, Scsi_Ioctl_Command __user *sic)
-{
-        struct request *rq;
-        int err;
-        unsigned int in_len, out_len, bytes, opcode, cmdlen;
-        char *buffer = NULL, sense[SCSI_SENSE_BUFFERSIZE];
-
-        /*
-         * get in an out lengths, verify they don't exceed a page worth of data
-         */
-        if (get_user(in_len, &sic->inlen))
-                return -EFAULT;
-        if (get_user(out_len, &sic->outlen))
-                return -EFAULT;
-        if (in_len > PAGE_SIZE || out_len > PAGE_SIZE)
-                return -EINVAL;
-        if (get_user(opcode, sic->data))
-                return -EFAULT;
-
-        bytes = max(in_len, out_len);
-        if (bytes) {
-                buffer = kmalloc(bytes, q->bounce_gfp | GFP_USER| __GFP_NOWARN);
-                if (!buffer)
-                        return -ENOMEM;
-
-                memset(buffer, 0, bytes);
-        }
-
-        rq = blk_get_request(q, in_len ? WRITE : READ, __GFP_WAIT);
-
-        cmdlen = COMMAND_SIZE(opcode);
-
-        /*
-         * get command and data to send to device, if any
-         */
-        err = -EFAULT;
-        rq->cmd_len = cmdlen;
-        if (copy_from_user(rq->cmd, sic->data, cmdlen))
-                goto error;
-
-        if (copy_from_user(buffer, sic->data + cmdlen, in_len))
-                goto error;
-
-        err = verify_command(file, rq->cmd);
-        if (err)
-                goto error;
-
-        switch (opcode) {
-                case SEND_DIAGNOSTIC:
-                case FORMAT_UNIT:
-                        rq->timeout = FORMAT_UNIT_TIMEOUT;
-                        break;
-                case START_STOP:
-                        rq->timeout = START_STOP_TIMEOUT;
-                        break;
-                case MOVE_MEDIUM:
-                        rq->timeout = MOVE_MEDIUM_TIMEOUT;
-                        break;
-                case READ_ELEMENT_STATUS:
-                        rq->timeout = READ_ELEMENT_STATUS_TIMEOUT;
-                        break;
-                case READ_DEFECT_DATA:
-                        rq->timeout = READ_DEFECT_DATA_TIMEOUT;
-                        break;
-                default:
-                        rq->timeout = BLK_DEFAULT_TIMEOUT;
-                        break;
-        }
-
-        memset(sense, 0, sizeof(sense));
-        rq->sense = sense;
-        rq->sense_len = 0;
-
-        rq->data = buffer;
-        rq->data_len = bytes;
-        rq->flags |= REQ_BLOCK_PC;
-
-        blk_execute_rq(q, bd_disk, rq, 0);
-        err = rq->errors & 0xff;        /* only 8 bit SCSI status */
-        if (err) {
-                if (rq->sense_len && rq->sense) {
-                        bytes = (OMAX_SB_LEN > rq->sense_len) ?
-                                rq->sense_len : OMAX_SB_LEN;
-                        if (copy_to_user(sic->data, rq->sense, bytes))
-                                err = -EFAULT;
-                }
-        } else {
-                if (copy_to_user(sic->data, buffer, out_len))
-                        err = -EFAULT;
-        }
-        
-error:
-        kfree(buffer);
-        blk_put_request(rq);
-        return err;
-}
-
-int scsi_cmd_ioctl(struct file *file, struct gendisk *bd_disk, unsigned int cmd, void __user *arg)
-{
-        request_queue_t *q;
-        struct request *rq;
-        int close = 0, err;
-
-        q = bd_disk->queue;
-        if (!q)
-                return -ENXIO;
-
-        if (blk_get_queue(q))
-                return -ENXIO;
-
-        switch (cmd) {
-                /*
-                 * new sgv3 interface
-                 */
-                case SG_GET_VERSION_NUM:
-                        err = sg_get_version(arg);
-                        break;
-                case SCSI_IOCTL_GET_IDLUN:
-                        err = scsi_get_idlun(q, arg);
-                        break;
-                case SCSI_IOCTL_GET_BUS_NUMBER:
-                        err = scsi_get_bus(q, arg);
-                        break;
-                case SG_SET_TIMEOUT:
-                        err = sg_set_timeout(q, arg);
-                        break;
-                case SG_GET_TIMEOUT:
-                        err = sg_get_timeout(q);
-                        break;
-                case SG_GET_RESERVED_SIZE:
-                        err = sg_get_reserved_size(q, arg);
-                        break;
-                case SG_SET_RESERVED_SIZE:
-                        err = sg_set_reserved_size(q, arg);
-                        break;
-                case SG_EMULATED_HOST:
-                        err = sg_emulated_host(q, arg);
-                        break;
-                case SG_IO: {
-                        struct sg_io_hdr hdr;
-
-                        err = -EFAULT;
-                        if (copy_from_user(&hdr, arg, sizeof(hdr)))
-                                break;
-                        err = sg_io(file, q, bd_disk, &hdr);
-                        if (err == -EFAULT)
-                                break;
-
-                        if (copy_to_user(arg, &hdr, sizeof(hdr)))
-                                err = -EFAULT;
-                        break;
-                }
-                case CDROM_SEND_PACKET: {
-                        struct cdrom_generic_command cgc;
-                        struct sg_io_hdr hdr;
-
-                        err = -EFAULT;
-                        if (copy_from_user(&cgc, arg, sizeof(cgc)))
-                                break;
-                        cgc.timeout = clock_t_to_jiffies(cgc.timeout);
-                        memset(&hdr, 0, sizeof(hdr));
-                        hdr.interface_id = 'S';
-                        hdr.cmd_len = sizeof(cgc.cmd);
-                        hdr.dxfer_len = cgc.buflen;
-                        err = 0;
-                        switch (cgc.data_direction) {
-                                case CGC_DATA_UNKNOWN:
-                                        hdr.dxfer_direction = SG_DXFER_UNKNOWN;
-                                        break;
-                                case CGC_DATA_WRITE:
-                                        hdr.dxfer_direction = SG_DXFER_TO_DEV;
-                                        break;
-                                case CGC_DATA_READ:
-                                        hdr.dxfer_direction = SG_DXFER_FROM_DEV;
-                                        break;
-                                case CGC_DATA_NONE:
-                                        hdr.dxfer_direction = SG_DXFER_NONE;
-                                        break;
-                                default:
-                                        err = -EINVAL;
-                        }
-                        if (err)
-                                break;
-
-                        hdr.dxferp = cgc.buffer;
-                        hdr.sbp = cgc.sense;
-                        if (hdr.sbp)
-                                hdr.mx_sb_len = sizeof(struct request_sense);
-                        hdr.timeout = cgc.timeout;
-                        hdr.cmdp = ((struct cdrom_generic_command __user*) arg)->cmd;
-                        hdr.cmd_len = sizeof(cgc.cmd);
-
-                        err = sg_io(file, q, bd_disk, &hdr);
-                        if (err == -EFAULT)
-                                break;
-
-                        if (hdr.status)
-                                err = -EIO;
-
-                        cgc.stat = err;
-                        cgc.buflen = hdr.resid;
-                        if (copy_to_user(arg, &cgc, sizeof(cgc)))
-                                err = -EFAULT;
-
-                        break;
-                }
-
-                /*
-                 * old junk scsi send command ioctl
-                 */
-                case SCSI_IOCTL_SEND_COMMAND:
-                        printk(KERN_WARNING "program %s is using a deprecated SCSI ioctl, please convert it to SG_IO\n", current->comm);
-                        err = -EINVAL;
-                        if (!arg)
-                                break;
-
-                        err = sg_scsi_ioctl(file, q, bd_disk, arg);
-                        break;
-                case CDROMCLOSETRAY:
-                        close = 1;
-                case CDROMEJECT:
-                        rq = blk_get_request(q, WRITE, __GFP_WAIT);
-                        rq->flags |= REQ_BLOCK_PC;
-                        rq->data = NULL;
-                        rq->data_len = 0;
-                        rq->timeout = BLK_DEFAULT_TIMEOUT;
-                        memset(rq->cmd, 0, sizeof(rq->cmd));
-                        rq->cmd[0] = GPCMD_START_STOP_UNIT;
-                        rq->cmd[4] = 0x02 + (close != 0);
-                        rq->cmd_len = 6;
-                        err = blk_execute_rq(q, bd_disk, rq, 0);
-                        blk_put_request(rq);
-                        break;
-                default:
-                        err = -ENOTTY;
-        }
-
-        blk_put_queue(q);
-        return err;
-}
-
-EXPORT_SYMBOL(scsi_cmd_ioctl);
diff --git a/drivers/block/swim3.c b/drivers/block/swim3.c
index e425ad3eebba..af7cb2bfd670 100644
--- a/drivers/block/swim3.c
+++ b/drivers/block/swim3.c
@@ -28,6 +28,7 @@
 #include <linux/devfs_fs_kernel.h>
 #include <linux/interrupt.h>
 #include <linux/module.h>
+#include <linux/spinlock.h>
 #include <asm/io.h>
 #include <asm/dbdma.h>
 #include <asm/prom.h>
@@ -176,6 +177,7 @@ struct swim3 {
 
 struct floppy_state {
         enum swim_state state;
+        spinlock_t lock;
         struct swim3 __iomem *swim3;    /* hardware registers */
         struct dbdma_regs __iomem *dma; /* DMA controller registers */
         int     swim3_intr;     /* interrupt number for SWIM3 */
@@ -304,7 +306,6 @@ static void do_fd_request(request_queue_t * q)
 #endif /* CONFIG_PMAC_MEDIABAY */
                 start_request(&floppy_states[i]);
         }
-        sti();
 }
 
 static void start_request(struct floppy_state *fs)
@@ -370,7 +371,7 @@ static void set_timeout(struct floppy_state *fs, int nticks,
 {
         unsigned long flags;
 
-        save_flags(flags); cli();
+        spin_lock_irqsave(&fs->lock, flags);
         if (fs->timeout_pending)
                 del_timer(&fs->timeout);
         fs->timeout.expires = jiffies + nticks;
@@ -378,7 +379,7 @@ static void set_timeout(struct floppy_state *fs, int nticks,
         fs->timeout.data = (unsigned long) fs;
         add_timer(&fs->timeout);
         fs->timeout_pending = 1;
-        restore_flags(flags);
+        spin_unlock_irqrestore(&fs->lock, flags);
 }
 
 static inline void scan_track(struct floppy_state *fs)
@@ -790,14 +791,13 @@ static int grab_drive(struct floppy_state *fs, enum swim_state state,
 {
         unsigned long flags;
 
-        save_flags(flags);
-        cli();
+        spin_lock_irqsave(&fs->lock, flags);
         if (fs->state != idle) {
                 ++fs->wanted;
                 while (fs->state != available) {
                         if (interruptible && signal_pending(current)) {
                                 --fs->wanted;
-                                restore_flags(flags);
+                                spin_unlock_irqrestore(&fs->lock, flags);
                                 return -EINTR;
                         }
                         interruptible_sleep_on(&fs->wait);
@@ -805,7 +805,7 @@ static int grab_drive(struct floppy_state *fs, enum swim_state state,
                 --fs->wanted;
         }
         fs->state = state;
-        restore_flags(flags);
+        spin_unlock_irqrestore(&fs->lock, flags);
         return 0;
 }
 
@@ -813,11 +813,10 @@ static void release_drive(struct floppy_state *fs)
 {
         unsigned long flags;
 
-        save_flags(flags);
-        cli();
+        spin_lock_irqsave(&fs->lock, flags);
         fs->state = idle;
         start_request(fs);
-        restore_flags(flags);
+        spin_unlock_irqrestore(&fs->lock, flags);
 }
 
 static int fd_eject(struct floppy_state *fs)
@@ -1109,6 +1108,7 @@ static int swim3_add_device(struct device_node *swim)
                 pmac_call_feature(PMAC_FTR_SWIM3_ENABLE, swim, 0, 1);
         
         memset(fs, 0, sizeof(*fs));
+        spin_lock_init(&fs->lock);
         fs->state = idle;
         fs->swim3 = (struct swim3 __iomem *)
                 ioremap(swim->addrs[0].address, 0x200);
diff --git a/drivers/bluetooth/bcm203x.c b/drivers/bluetooth/bcm203x.c
index 5fd3e4cb7525..8e7fb3551775 100644
--- a/drivers/bluetooth/bcm203x.c
+++ b/drivers/bluetooth/bcm203x.c
@@ -179,14 +179,12 @@ static int bcm203x_probe(struct usb_interface *intf, const struct usb_device_id
         if (ignore || (intf->cur_altsetting->desc.bInterfaceNumber != 0))
                 return -ENODEV;
 
-        data = kmalloc(sizeof(*data), GFP_KERNEL);
+        data = kzalloc(sizeof(*data), GFP_KERNEL);
         if (!data) {
                 BT_ERR("Can't allocate memory for data structure");
                 return -ENOMEM;
         }
 
-        memset(data, 0, sizeof(*data));
-
         data->udev  = udev;
         data->state = BCM203X_LOAD_MINIDRV;
 
diff --git a/drivers/bluetooth/bfusb.c b/drivers/bluetooth/bfusb.c
index 1e9db0156ea7..067e27893e4a 100644
--- a/drivers/bluetooth/bfusb.c
+++ b/drivers/bluetooth/bfusb.c
@@ -673,13 +673,11 @@ static int bfusb_probe(struct usb_interface *intf, const struct usb_device_id *i
         }
 
         /* Initialize control structure and load firmware */
-        if (!(bfusb = kmalloc(sizeof(struct bfusb), GFP_KERNEL))) {
+        if (!(bfusb = kzalloc(sizeof(struct bfusb), GFP_KERNEL))) {
                 BT_ERR("Can't allocate memory for control structure");
                 goto done;
         }
 
-        memset(bfusb, 0, sizeof(struct bfusb));
-
         bfusb->udev = udev;
         bfusb->bulk_in_ep    = bulk_in_ep->desc.bEndpointAddress;
         bfusb->bulk_out_ep   = bulk_out_ep->desc.bEndpointAddress;
diff --git a/drivers/bluetooth/bluecard_cs.c b/drivers/bluetooth/bluecard_cs.c
index 26fe9c0e1d20..f36c563d72c4 100644
--- a/drivers/bluetooth/bluecard_cs.c
+++ b/drivers/bluetooth/bluecard_cs.c
@@ -870,10 +870,9 @@ static dev_link_t *bluecard_attach(void)
         int ret;
 
         /* Create new info device */
-        info = kmalloc(sizeof(*info), GFP_KERNEL);
+        info = kzalloc(sizeof(*info), GFP_KERNEL);
         if (!info)
                 return NULL;
-        memset(info, 0, sizeof(*info));
 
         link = &info->link;
         link->priv = info;
diff --git a/drivers/bluetooth/bpa10x.c b/drivers/bluetooth/bpa10x.c
index 0db0400519c9..ecbeb7eaba8e 100644
--- a/drivers/bluetooth/bpa10x.c
+++ b/drivers/bluetooth/bpa10x.c
@@ -553,14 +553,12 @@ static int bpa10x_probe(struct usb_interface *intf, const struct usb_device_id *
         if (intf->cur_altsetting->desc.bInterfaceNumber > 0)
                 return -ENODEV;
 
-        data = kmalloc(sizeof(*data), GFP_KERNEL);
+        data = kzalloc(sizeof(*data), GFP_KERNEL);
         if (!data) {
                 BT_ERR("Can't allocate data structure");
                 return -ENOMEM;
         }
 
-        memset(data, 0, sizeof(*data));
-
         data->udev = udev;
 
         rwlock_init(&data->lock);
diff --git a/drivers/bluetooth/bt3c_cs.c b/drivers/bluetooth/bt3c_cs.c
index 2e0338d80f32..d2a0add19cc8 100644
--- a/drivers/bluetooth/bt3c_cs.c
+++ b/drivers/bluetooth/bt3c_cs.c
@@ -671,10 +671,9 @@ static dev_link_t *bt3c_attach(void)
         int ret;
 
         /* Create new info device */
-        info = kmalloc(sizeof(*info), GFP_KERNEL);
+        info = kzalloc(sizeof(*info), GFP_KERNEL);
         if (!info)
                 return NULL;
-        memset(info, 0, sizeof(*info));
 
         link = &info->link;
         link->priv = info;
diff --git a/drivers/bluetooth/btuart_cs.c b/drivers/bluetooth/btuart_cs.c
index 89486ea7a021..529a28a3209d 100644
--- a/drivers/bluetooth/btuart_cs.c
+++ b/drivers/bluetooth/btuart_cs.c
@@ -590,10 +590,9 @@ static dev_link_t *btuart_attach(void)
         int ret;
 
         /* Create new info device */
-        info = kmalloc(sizeof(*info), GFP_KERNEL);
+        info = kzalloc(sizeof(*info), GFP_KERNEL);
         if (!info)
                 return NULL;
-        memset(info, 0, sizeof(*info));
 
         link = &info->link;
         link->priv = info;
diff --git a/drivers/bluetooth/dtl1_cs.c b/drivers/bluetooth/dtl1_cs.c
index 84c1f8839422..dec5980a1cd6 100644
--- a/drivers/bluetooth/dtl1_cs.c
+++ b/drivers/bluetooth/dtl1_cs.c
@@ -569,10 +569,9 @@ static dev_link_t *dtl1_attach(void)
         int ret;
 
         /* Create new info device */
-        info = kmalloc(sizeof(*info), GFP_KERNEL);
+        info = kzalloc(sizeof(*info), GFP_KERNEL);
         if (!info)
                 return NULL;
-        memset(info, 0, sizeof(*info));
 
         link = &info->link;
         link->priv = info;
diff --git a/drivers/bluetooth/hci_bcsp.c b/drivers/bluetooth/hci_bcsp.c
index 0a4761415ac3..8fddfdfd0fbd 100644
--- a/drivers/bluetooth/hci_bcsp.c
+++ b/drivers/bluetooth/hci_bcsp.c
@@ -715,10 +715,9 @@ static int bcsp_open(struct hci_uart *hu)
 
         BT_DBG("hu %p", hu);
 
-        bcsp = kmalloc(sizeof(*bcsp), GFP_ATOMIC);
+        bcsp = kzalloc(sizeof(*bcsp), GFP_ATOMIC);
         if (!bcsp)
                 return -ENOMEM;
-        memset(bcsp, 0, sizeof(*bcsp));
 
         hu->priv = bcsp;
         skb_queue_head_init(&bcsp->unack);
diff --git a/drivers/bluetooth/hci_h4.c b/drivers/bluetooth/hci_h4.c
index 12e369a66fc2..4804d474dc87 100644
--- a/drivers/bluetooth/hci_h4.c
+++ b/drivers/bluetooth/hci_h4.c
@@ -76,12 +76,10 @@ static int h4_open(struct hci_uart *hu)
 
         BT_DBG("hu %p", hu);
 
-        h4 = kmalloc(sizeof(*h4), GFP_ATOMIC);
+        h4 = kzalloc(sizeof(*h4), GFP_ATOMIC);
         if (!h4)
                 return -ENOMEM;
 
-        memset(h4, 0, sizeof(*h4));
-
         skb_queue_head_init(&h4->txq);
 
         hu->priv = h4;
diff --git a/drivers/bluetooth/hci_ldisc.c b/drivers/bluetooth/hci_ldisc.c
index 4a775f6ea390..573ff6c1be5f 100644
--- a/drivers/bluetooth/hci_ldisc.c
+++ b/drivers/bluetooth/hci_ldisc.c
@@ -272,13 +272,11 @@ static int hci_uart_tty_open(struct tty_struct *tty)
         if (hu)
                 return -EEXIST;
 
-        if (!(hu = kmalloc(sizeof(struct hci_uart), GFP_KERNEL))) {
+        if (!(hu = kzalloc(sizeof(struct hci_uart), GFP_KERNEL))) {
                 BT_ERR("Can't allocate controll structure");
                 return -ENFILE;
         }
 
-        memset(hu, 0, sizeof(struct hci_uart));
-
         tty->disc_data = hu;
         hu->tty = tty;
 
diff --git a/drivers/bluetooth/hci_usb.c b/drivers/bluetooth/hci_usb.c
index 6756cb20b753..f510b25b2c59 100644
--- a/drivers/bluetooth/hci_usb.c
+++ b/drivers/bluetooth/hci_usb.c
@@ -875,13 +875,11 @@ static int hci_usb_probe(struct usb_interface *intf, const struct usb_device_id
                 goto done;
         }
 
-        if (!(husb = kmalloc(sizeof(struct hci_usb), GFP_KERNEL))) {
+        if (!(husb = kzalloc(sizeof(struct hci_usb), GFP_KERNEL))) {
                 BT_ERR("Can't allocate: control structure");
                 goto done;
         }
 
-        memset(husb, 0, sizeof(struct hci_usb));
-
         husb->udev = udev;
         husb->bulk_out_ep = bulk_out_ep;
         husb->bulk_in_ep  = bulk_in_ep;
diff --git a/drivers/bluetooth/hci_vhci.c b/drivers/bluetooth/hci_vhci.c
index 52cbd45c308f..85738223ff0c 100644
--- a/drivers/bluetooth/hci_vhci.c
+++ b/drivers/bluetooth/hci_vhci.c
@@ -261,12 +261,10 @@ static int vhci_open(struct inode *inode, struct file *file)
         struct vhci_data *vhci;
         struct hci_dev *hdev;
 
-        vhci = kmalloc(sizeof(struct vhci_data), GFP_KERNEL);
+        vhci = kzalloc(sizeof(struct vhci_data), GFP_KERNEL);
         if (!vhci)
                 return -ENOMEM;
 
-        memset(vhci, 0, sizeof(struct vhci_data));
-
         skb_queue_head_init(&vhci->readq);
         init_waitqueue_head(&vhci->read_wait);
 
diff --git a/drivers/cdrom/mcdx.c b/drivers/cdrom/mcdx.c
index b89420e6d704..a0b580c22d80 100644
--- a/drivers/cdrom/mcdx.c
+++ b/drivers/cdrom/mcdx.c
@@ -1085,7 +1085,7 @@ static int __init mcdx_init_drive(int drive)
 
         xtrace(INIT, "kmalloc space for stuffpt's\n");
         xtrace(MALLOC, "init() malloc %d bytes\n", size);
-        if (!(stuffp = kmalloc(size, GFP_KERNEL))) {
+        if (!(stuffp = kzalloc(size, GFP_KERNEL))) {
                 xwarn("init() malloc failed\n");
                 return 1;
         }
@@ -1101,8 +1101,6 @@ static int __init mcdx_init_drive(int drive)
                sizeof(*stuffp), stuffp);
 
         /* set default values */
-        memset(stuffp, 0, sizeof(*stuffp));
-
         stuffp->present = 0;    /* this should be 0 already */
         stuffp->toc = NULL;     /* this should be NULL already */
 
diff --git a/drivers/char/agp/ali-agp.c b/drivers/char/agp/ali-agp.c
index b02fc2267159..ba54b5872578 100644
--- a/drivers/char/agp/ali-agp.c
+++ b/drivers/char/agp/ali-agp.c
@@ -389,6 +389,7 @@ static struct pci_device_id agp_ali_pci_table[] = {
 MODULE_DEVICE_TABLE(pci, agp_ali_pci_table);
 
 static struct pci_driver agp_ali_pci_driver = {
+        .owner          = THIS_MODULE,
         .name           = "agpgart-ali",
         .id_table       = agp_ali_pci_table,
         .probe          = agp_ali_probe,
diff --git a/drivers/char/agp/amd-k7-agp.c b/drivers/char/agp/amd-k7-agp.c
index 3a41672e4d66..40fcd88b2cea 100644
--- a/drivers/char/agp/amd-k7-agp.c
+++ b/drivers/char/agp/amd-k7-agp.c
@@ -94,19 +94,16 @@ static int amd_create_gatt_pages(int nr_tables)
         int retval = 0;
         int i;
 
-        tables = kmalloc((nr_tables + 1) * sizeof(struct amd_page_map *),
-                         GFP_KERNEL);
+        tables = kzalloc((nr_tables + 1) * sizeof(struct amd_page_map *),GFP_KERNEL);
         if (tables == NULL)
                 return -ENOMEM;
 
-        memset (tables, 0, sizeof(struct amd_page_map *) * (nr_tables + 1));
         for (i = 0; i < nr_tables; i++) {
-                entry = kmalloc(sizeof(struct amd_page_map), GFP_KERNEL);
+                entry = kzalloc(sizeof(struct amd_page_map), GFP_KERNEL);
                 if (entry == NULL) {
                         retval = -ENOMEM;
                         break;
                 }
-                memset (entry, 0, sizeof(struct amd_page_map));
                 tables[i] = entry;
                 retval = amd_create_page_map(entry);
                 if (retval != 0)
@@ -518,6 +515,7 @@ static struct pci_device_id agp_amdk7_pci_table[] = {
 MODULE_DEVICE_TABLE(pci, agp_amdk7_pci_table);
 
 static struct pci_driver agp_amdk7_pci_driver = {
+        .owner          = THIS_MODULE,
         .name           = "agpgart-amdk7",
         .id_table       = agp_amdk7_pci_table,
         .probe          = agp_amdk7_probe,
diff --git a/drivers/char/agp/amd64-agp.c b/drivers/char/agp/amd64-agp.c
index 0e6c3a31d344..8f748fddca94 100644
--- a/drivers/char/agp/amd64-agp.c
+++ b/drivers/char/agp/amd64-agp.c
@@ -13,6 +13,7 @@
 #include <linux/pci.h>
 #include <linux/init.h>
 #include <linux/agp_backend.h>
+#include <linux/mmzone.h>
 #include <asm/page.h>           /* PAGE_SIZE */
 #include "agp.h"
 
@@ -702,6 +703,7 @@ static struct pci_device_id agp_amd64_pci_table[] = {
 MODULE_DEVICE_TABLE(pci, agp_amd64_pci_table);
 
 static struct pci_driver agp_amd64_pci_driver = {
+        .owner          = THIS_MODULE,
         .name           = "agpgart-amd64",
         .id_table       = agp_amd64_pci_table,
         .probe          = agp_amd64_probe,
diff --git a/drivers/char/agp/ati-agp.c b/drivers/char/agp/ati-agp.c
index 0b6e72642d6e..fbd415565463 100644
--- a/drivers/char/agp/ati-agp.c
+++ b/drivers/char/agp/ati-agp.c
@@ -118,14 +118,12 @@ static int ati_create_gatt_pages(int nr_tables)
         int retval = 0;
         int i;
 
-        tables = kmalloc((nr_tables + 1) * sizeof(ati_page_map *),
-                         GFP_KERNEL);
+        tables = kzalloc((nr_tables + 1) * sizeof(ati_page_map *),GFP_KERNEL);
         if (tables == NULL)
                 return -ENOMEM;
 
-        memset(tables, 0, sizeof(ati_page_map *) * (nr_tables + 1));
         for (i = 0; i < nr_tables; i++) {
-                entry = kmalloc(sizeof(ati_page_map), GFP_KERNEL);
+                entry = kzalloc(sizeof(ati_page_map), GFP_KERNEL);
                 if (entry == NULL) {
                         while (i>0) {
                                 kfree (tables[i-1]);
@@ -136,7 +134,6 @@ static int ati_create_gatt_pages(int nr_tables)
                         retval = -ENOMEM;
                         break;
                 }
-                memset(entry, 0, sizeof(ati_page_map));
                 tables[i] = entry;
                 retval = ati_create_page_map(entry);
                 if (retval != 0) break;
@@ -524,6 +521,7 @@ static struct pci_device_id agp_ati_pci_table[] = {
 MODULE_DEVICE_TABLE(pci, agp_ati_pci_table);
 
 static struct pci_driver agp_ati_pci_driver = {
+        .owner          = THIS_MODULE,
         .name           = "agpgart-ati",
         .id_table       = agp_ati_pci_table,
         .probe          = agp_ati_probe,
diff --git a/drivers/char/agp/backend.c b/drivers/char/agp/backend.c
index 82b43c541c8d..73f333f491bd 100644
--- a/drivers/char/agp/backend.c
+++ b/drivers/char/agp/backend.c
@@ -222,12 +222,12 @@ static void agp_backend_cleanup(struct agp_bridge_data *bridge)
 
 struct agp_bridge_data *agp_alloc_bridge(void)
 {
-        struct agp_bridge_data *bridge = kmalloc(sizeof(*bridge), GFP_KERNEL);
-
+        struct agp_bridge_data *bridge;
+        
+        bridge = kzalloc(sizeof(*bridge), GFP_KERNEL);
         if (!bridge)
                 return NULL;
 
-        memset(bridge, 0, sizeof(*bridge));
         atomic_set(&bridge->agp_in_use, 0);
         atomic_set(&bridge->current_memory_agp, 0);
 
diff --git a/drivers/char/agp/efficeon-agp.c b/drivers/char/agp/efficeon-agp.c
index ac19fdcd21c1..d41e0a62e32e 100644
--- a/drivers/char/agp/efficeon-agp.c
+++ b/drivers/char/agp/efficeon-agp.c
@@ -219,7 +219,7 @@ static int efficeon_create_gatt_table(struct agp_bridge_data *bridge)
 
                 efficeon_private.l1_table[index] = page;
 
-                value = virt_to_gart(page) | pati | present | index;
+                value = virt_to_gart((unsigned long *)page) | pati | present | index;
 
                 pci_write_config_dword(agp_bridge->dev,
                         EFFICEON_ATTPAGE, value);
@@ -429,6 +429,7 @@ static struct pci_device_id agp_efficeon_pci_table[] = {
 MODULE_DEVICE_TABLE(pci, agp_efficeon_pci_table);
 
 static struct pci_driver agp_efficeon_pci_driver = {
+        .owner          = THIS_MODULE,
         .name           = "agpgart-efficeon",
         .id_table       = agp_efficeon_pci_table,
         .probe          = agp_efficeon_probe,
diff --git a/drivers/char/agp/frontend.c b/drivers/char/agp/frontend.c
index 3dfb6648547b..17f520c9d471 100644
--- a/drivers/char/agp/frontend.c
+++ b/drivers/char/agp/frontend.c
@@ -189,13 +189,12 @@ static int agp_create_segment(struct agp_client *client, struct agp_region *regi
         struct agp_segment *user_seg;
         size_t i;
 
-        seg = kmalloc((sizeof(struct agp_segment_priv) * region->seg_count), GFP_KERNEL);
+        seg = kzalloc((sizeof(struct agp_segment_priv) * region->seg_count), GFP_KERNEL);
         if (seg == NULL) {
                 kfree(region->seg_list);
                 region->seg_list = NULL;
                 return -ENOMEM;
         }
-        memset(seg, 0, (sizeof(struct agp_segment_priv) * region->seg_count));
         user_seg = region->seg_list;
 
         for (i = 0; i < region->seg_count; i++) {
@@ -332,14 +331,11 @@ static struct agp_controller *agp_create_controller(pid_t id)
 {
         struct agp_controller *controller;
 
-        controller = kmalloc(sizeof(struct agp_controller), GFP_KERNEL);
-
+        controller = kzalloc(sizeof(struct agp_controller), GFP_KERNEL);
         if (controller == NULL)
                 return NULL;
 
-        memset(controller, 0, sizeof(struct agp_controller));
         controller->pid = id;
-
         return controller;
 }
 
@@ -540,12 +536,10 @@ static struct agp_client *agp_create_client(pid_t id)
 {
         struct agp_client *new_client;
 
-        new_client = kmalloc(sizeof(struct agp_client), GFP_KERNEL);
-
+        new_client = kzalloc(sizeof(struct agp_client), GFP_KERNEL);
         if (new_client == NULL)
                 return NULL;
 
-        memset(new_client, 0, sizeof(struct agp_client));
         new_client->pid = id;
         agp_insert_client(new_client);
         return new_client;
@@ -709,11 +703,10 @@ static int agp_open(struct inode *inode, struct file *file)
         if (minor != AGPGART_MINOR)
                 goto err_out;
 
-        priv = kmalloc(sizeof(struct agp_file_private), GFP_KERNEL);
+        priv = kzalloc(sizeof(struct agp_file_private), GFP_KERNEL);
         if (priv == NULL)
                 goto err_out_nomem;
 
-        memset(priv, 0, sizeof(struct agp_file_private));
         set_bit(AGP_FF_ALLOW_CLIENT, &priv->access_flags);
         priv->my_pid = current->pid;
 
diff --git a/drivers/char/agp/generic.c b/drivers/char/agp/generic.c
index ac9da0ca36b7..c4a38715c6f9 100644
--- a/drivers/char/agp/generic.c
+++ b/drivers/char/agp/generic.c
@@ -105,12 +105,10 @@ struct agp_memory *agp_create_memory(int scratch_pages)
 {
         struct agp_memory *new;
 
-        new = kmalloc(sizeof(struct agp_memory), GFP_KERNEL);
-
+        new = kzalloc(sizeof(struct agp_memory), GFP_KERNEL);
         if (new == NULL)
                 return NULL;
 
-        memset(new, 0, sizeof(struct agp_memory));
         new->key = agp_get_key();
 
         if (new->key < 0) {
@@ -414,7 +412,8 @@ static void agp_v2_parse_one(u32 *requested_mode, u32 *bridge_agpstat, u32 *vga_
         u32 tmp;
 
         if (*requested_mode & AGP2_RESERVED_MASK) {
-                printk(KERN_INFO PFX "reserved bits set in mode 0x%x. Fixed.\n", *requested_mode);
+                printk(KERN_INFO PFX "reserved bits set (%x) in mode 0x%x. Fixed.\n",
+                        *requested_mode & AGP2_RESERVED_MASK, *requested_mode);
                 *requested_mode &= ~AGP2_RESERVED_MASK;
         }
 
@@ -492,7 +491,8 @@ static void agp_v3_parse_one(u32 *requested_mode, u32 *bridge_agpstat, u32 *vga_
         u32 tmp;
 
         if (*requested_mode & AGP3_RESERVED_MASK) {
-                printk(KERN_INFO PFX "reserved bits set in mode 0x%x. Fixed.\n", *requested_mode);
+                printk(KERN_INFO PFX "reserved bits set (%x) in mode 0x%x. Fixed.\n",
+                        *requested_mode & AGP3_RESERVED_MASK, *requested_mode);
                 *requested_mode &= ~AGP3_RESERVED_MASK;
         }
 
diff --git a/drivers/char/agp/i460-agp.c b/drivers/char/agp/i460-agp.c
index a2d9e5e48bbe..58944cd271ea 100644
--- a/drivers/char/agp/i460-agp.c
+++ b/drivers/char/agp/i460-agp.c
@@ -227,10 +227,9 @@ static int i460_configure (void)
          */
         if (I460_IO_PAGE_SHIFT > PAGE_SHIFT) {
                 size = current_size->num_entries * sizeof(i460.lp_desc[0]);
-                i460.lp_desc = kmalloc(size, GFP_KERNEL);
+                i460.lp_desc = kzalloc(size, GFP_KERNEL);
                 if (!i460.lp_desc)
                         return -ENOMEM;
-                memset(i460.lp_desc, 0, size);
         }
         return 0;
 }
@@ -366,13 +365,12 @@ static int i460_alloc_large_page (struct lp_desc *lp)
         }
 
         map_size = ((I460_KPAGES_PER_IOPAGE + BITS_PER_LONG - 1) & -BITS_PER_LONG)/8;
-        lp->alloced_map = kmalloc(map_size, GFP_KERNEL);
+        lp->alloced_map = kzalloc(map_size, GFP_KERNEL);
         if (!lp->alloced_map) {
                 free_pages((unsigned long) lpage, order);
                 printk(KERN_ERR PFX "Out of memory, we're in trouble...\n");
                 return -ENOMEM;
         }
-        memset(lp->alloced_map, 0, map_size);
 
         lp->paddr = virt_to_gart(lpage);
         lp->refcount = 0;
@@ -619,6 +617,7 @@ static struct pci_device_id agp_intel_i460_pci_table[] = {
 MODULE_DEVICE_TABLE(pci, agp_intel_i460_pci_table);
 
 static struct pci_driver agp_intel_i460_pci_driver = {
+        .owner          = THIS_MODULE,
         .name           = "agpgart-intel-i460",
         .id_table       = agp_intel_i460_pci_table,
         .probe          = agp_intel_i460_probe,
diff --git a/drivers/char/agp/intel-agp.c b/drivers/char/agp/intel-agp.c
index 1f7d415f432c..bf4cc9ffd5b1 100644
--- a/drivers/char/agp/intel-agp.c
+++ b/drivers/char/agp/intel-agp.c
@@ -1824,6 +1824,7 @@ static struct pci_device_id agp_intel_pci_table[] = {
 MODULE_DEVICE_TABLE(pci, agp_intel_pci_table);
 
 static struct pci_driver agp_intel_pci_driver = {
+        .owner          = THIS_MODULE,
         .name           = "agpgart-intel",
         .id_table       = agp_intel_pci_table,
         .probe          = agp_intel_probe,
diff --git a/drivers/char/agp/nvidia-agp.c b/drivers/char/agp/nvidia-agp.c
index 80dafa3030bd..3aed0c5e2f92 100644
--- a/drivers/char/agp/nvidia-agp.c
+++ b/drivers/char/agp/nvidia-agp.c
@@ -398,6 +398,7 @@ static struct pci_device_id agp_nvidia_pci_table[] = {
 MODULE_DEVICE_TABLE(pci, agp_nvidia_pci_table);
 
 static struct pci_driver agp_nvidia_pci_driver = {
+        .owner          = THIS_MODULE,
         .name           = "agpgart-nvidia",
         .id_table       = agp_nvidia_pci_table,
         .probe          = agp_nvidia_probe,
diff --git a/drivers/char/agp/sgi-agp.c b/drivers/char/agp/sgi-agp.c
index 7957fc91f6ad..4df7734b51c2 100644
--- a/drivers/char/agp/sgi-agp.c
+++ b/drivers/char/agp/sgi-agp.c
@@ -289,6 +289,8 @@ static int __devinit agp_sgi_init(void)
         j = 0;
         list_for_each_entry(info, &tioca_list, ca_list) {
                 struct list_head *tmp;
+                if (list_empty(info->ca_devices))
+                        continue;
                 list_for_each(tmp, info->ca_devices) {
                         u8 cap_ptr;
                         pdev = pci_dev_b(tmp);
diff --git a/drivers/char/agp/sis-agp.c b/drivers/char/agp/sis-agp.c
index ebc05554045c..a701361a8890 100644
--- a/drivers/char/agp/sis-agp.c
+++ b/drivers/char/agp/sis-agp.c
@@ -332,6 +332,7 @@ static struct pci_device_id agp_sis_pci_table[] = {
 MODULE_DEVICE_TABLE(pci, agp_sis_pci_table);
 
 static struct pci_driver agp_sis_pci_driver = {
+        .owner          = THIS_MODULE,
         .name           = "agpgart-sis",
         .id_table       = agp_sis_pci_table,
         .probe          = agp_sis_probe,
diff --git a/drivers/char/agp/sworks-agp.c b/drivers/char/agp/sworks-agp.c
index 71ea59a1dbeb..5a5392dd1254 100644
--- a/drivers/char/agp/sworks-agp.c
+++ b/drivers/char/agp/sworks-agp.c
@@ -102,19 +102,17 @@ static int serverworks_create_gatt_pages(int nr_tables)
         int retval = 0;
         int i;
 
-        tables = kmalloc((nr_tables + 1) * sizeof(struct serverworks_page_map *), 
+        tables = kzalloc((nr_tables + 1) * sizeof(struct serverworks_page_map *), 
                          GFP_KERNEL);
-        if (tables == NULL) {
+        if (tables == NULL)
                 return -ENOMEM;
-        }
-        memset(tables, 0, sizeof(struct serverworks_page_map *) * (nr_tables + 1));
+
         for (i = 0; i < nr_tables; i++) {
-                entry = kmalloc(sizeof(struct serverworks_page_map), GFP_KERNEL);
+                entry = kzalloc(sizeof(struct serverworks_page_map), GFP_KERNEL);
                 if (entry == NULL) {
                         retval = -ENOMEM;
                         break;
                 }
-                memset(entry, 0, sizeof(struct serverworks_page_map));
                 tables[i] = entry;
                 retval = serverworks_create_page_map(entry);
                 if (retval != 0) break;
@@ -244,13 +242,27 @@ static int serverworks_fetch_size(void)
  */
 static void serverworks_tlbflush(struct agp_memory *temp)
 {
+        unsigned long timeout;
+
         writeb(1, serverworks_private.registers+SVWRKS_POSTFLUSH);
-        while (readb(serverworks_private.registers+SVWRKS_POSTFLUSH) == 1)
+        timeout = jiffies + 3*HZ;
+        while (readb(serverworks_private.registers+SVWRKS_POSTFLUSH) == 1) {
                 cpu_relax();
+                if (time_after(jiffies, timeout)) {
+                        printk(KERN_ERR PFX "TLB post flush took more than 3 seconds\n");
+                        break;
+                }
+        }
 
         writel(1, serverworks_private.registers+SVWRKS_DIRFLUSH);
-        while(readl(serverworks_private.registers+SVWRKS_DIRFLUSH) == 1)
+        timeout = jiffies + 3*HZ;
+        while (readl(serverworks_private.registers+SVWRKS_DIRFLUSH) == 1) {
                 cpu_relax();
+                if (time_after(jiffies, timeout)) {
+                        printk(KERN_ERR PFX "TLB Dir flush took more than 3 seconds\n");
+                        break;
+                }
+        }
 }
 
 static int serverworks_configure(void)
@@ -533,6 +545,7 @@ static struct pci_device_id agp_serverworks_pci_table[] = {
 MODULE_DEVICE_TABLE(pci, agp_serverworks_pci_table);
 
 static struct pci_driver agp_serverworks_pci_driver = {
+        .owner          = THIS_MODULE,
         .name           = "agpgart-serverworks",
         .id_table       = agp_serverworks_pci_table,
         .probe          = agp_serverworks_probe,
diff --git a/drivers/char/agp/uninorth-agp.c b/drivers/char/agp/uninorth-agp.c
index c8255312b8c1..183c50acab27 100644
--- a/drivers/char/agp/uninorth-agp.c
+++ b/drivers/char/agp/uninorth-agp.c
@@ -658,6 +658,7 @@ static struct pci_device_id agp_uninorth_pci_table[] = {
 MODULE_DEVICE_TABLE(pci, agp_uninorth_pci_table);
 
 static struct pci_driver agp_uninorth_pci_driver = {
+        .owner          = THIS_MODULE,
         .name           = "agpgart-uninorth",
         .id_table       = agp_uninorth_pci_table,
         .probe          = agp_uninorth_probe,
diff --git a/drivers/char/agp/via-agp.c b/drivers/char/agp/via-agp.c
index c847df575cf5..5d9a13700074 100644
--- a/drivers/char/agp/via-agp.c
+++ b/drivers/char/agp/via-agp.c
@@ -518,6 +518,7 @@ MODULE_DEVICE_TABLE(pci, agp_via_pci_table);
 
 
 static struct pci_driver agp_via_pci_driver = {
+        .owner          = THIS_MODULE,
         .name           = "agpgart-via",
         .id_table       = agp_via_pci_table,
         .probe          = agp_via_probe,
diff --git a/drivers/char/consolemap.c b/drivers/char/consolemap.c
index 406dea914635..c85a4fa60da7 100644
--- a/drivers/char/consolemap.c
+++ b/drivers/char/consolemap.c
@@ -345,17 +345,15 @@ static void con_release_unimap(struct uni_pagedir *p)
         for (i = 0; i < 32; i++) {
                 if ((p1 = p->uni_pgdir[i]) != NULL) {
                         for (j = 0; j < 32; j++)
-                                if (p1[j])
-                                        kfree(p1[j]);
+                                kfree(p1[j]);
                         kfree(p1);
                 }
                 p->uni_pgdir[i] = NULL;
         }
-        for (i = 0; i < 4; i++)
-                if (p->inverse_translations[i]) {
-                        kfree(p->inverse_translations[i]);
-                        p->inverse_translations[i] = NULL;
-                }
+        for (i = 0; i < 4; i++) {
+                kfree(p->inverse_translations[i]);
+                p->inverse_translations[i] = NULL;
+        }
 }
 
 void con_free_unimap(struct vc_data *vc)
diff --git a/drivers/char/drm/ffb_context.c b/drivers/char/drm/ffb_context.c
index 8a6cc2751bc9..1383727b443a 100644
--- a/drivers/char/drm/ffb_context.c
+++ b/drivers/char/drm/ffb_context.c
@@ -526,10 +526,8 @@ int ffb_driver_rmctx(struct inode *inode, struct file *filp, unsigned int cmd,
         if (idx < 0 || idx >= FFB_MAX_CTXS)
                 return -EINVAL;
 
-        if (fpriv->hw_state[idx] != NULL) {
-                kfree(fpriv->hw_state[idx]);
-                fpriv->hw_state[idx] = NULL;
-        }
+        kfree(fpriv->hw_state[idx]);
+        fpriv->hw_state[idx] = NULL;
         return 0;
 }
 
diff --git a/drivers/char/drm/ffb_drv.c b/drivers/char/drm/ffb_drv.c
index 5c121d6df9f2..c13f9abb41e9 100644
--- a/drivers/char/drm/ffb_drv.c
+++ b/drivers/char/drm/ffb_drv.c
@@ -245,14 +245,12 @@ static void ffb_driver_release(drm_device_t * dev, struct file *filp)
 
 static void ffb_driver_pretakedown(drm_device_t * dev)
 {
-        if (dev->dev_private)
-                kfree(dev->dev_private);
+        kfree(dev->dev_private);
 }
 
 static int ffb_driver_postcleanup(drm_device_t * dev)
 {
-        if (ffb_position != NULL)
-                kfree(ffb_position);
+        kfree(ffb_position);
         return 0;
 }
 
diff --git a/drivers/char/ip2/i2ellis.c b/drivers/char/ip2/i2ellis.c
index f834d05ccc97..dd761a1e4f08 100644
--- a/drivers/char/ip2/i2ellis.c
+++ b/drivers/char/ip2/i2ellis.c
@@ -106,9 +106,7 @@ iiEllisInit(void)
 static void
 iiEllisCleanup(void)
 {
-        if ( pDelayTimer != NULL ) {
-                kfree ( pDelayTimer );
-        }
+        kfree(pDelayTimer);
 }
 
 //******************************************************************************
diff --git a/drivers/char/ipmi/ipmi_bt_sm.c b/drivers/char/ipmi/ipmi_bt_sm.c
index 33862670e285..58dcdee1cd71 100644
--- a/drivers/char/ipmi/ipmi_bt_sm.c
+++ b/drivers/char/ipmi/ipmi_bt_sm.c
@@ -28,6 +28,8 @@
 
 #include <linux/kernel.h> /* For printk. */
 #include <linux/string.h>
+#include <linux/module.h>
+#include <linux/moduleparam.h>
 #include <linux/ipmi_msgdefs.h>         /* for completion codes */
 #include "ipmi_si_sm.h"
 
@@ -36,6 +38,8 @@ static int bt_debug = 0x00;	/* Production value 0, see following flags */
 #define BT_DEBUG_ENABLE 1
 #define BT_DEBUG_MSG    2
 #define BT_DEBUG_STATES 4
+module_param(bt_debug, int, 0644);
+MODULE_PARM_DESC(bt_debug, "debug bitmask, 1=enable, 2=messages, 4=states");
 
 /* Typical "Get BT Capabilities" values are 2-3 retries, 5-10 seconds,
    and 64 byte buffers.  However, one HP implementation wants 255 bytes of
@@ -43,7 +47,7 @@ static int bt_debug = 0x00;	/* Production value 0, see following flags */
    Since the Open IPMI architecture is single-message oriented at this
    stage, the queue depth of BT is of no concern. */
 
-#define BT_NORMAL_TIMEOUT       2000000 /* seconds in microseconds */
+#define BT_NORMAL_TIMEOUT       5000000 /* seconds in microseconds */
 #define BT_RETRY_LIMIT          2
 #define BT_RESET_DELAY          6000000 /* 6 seconds after warm reset */
 
@@ -202,7 +206,7 @@ static int bt_get_result(struct si_sm_data *bt,
         msg_len = bt->read_count - 2;           /* account for length & seq */
         /* Always NetFn, Cmd, cCode */
         if (msg_len < 3 || msg_len > IPMI_MAX_MSG_LENGTH) {
-                printk(KERN_WARNING "BT results: bad msg_len = %d\n", msg_len);
+                printk(KERN_DEBUG "BT results: bad msg_len = %d\n", msg_len);
                 data[0] = bt->write_data[1] | 0x4;      /* Kludge a response */
                 data[1] = bt->write_data[3];
                 data[2] = IPMI_ERR_UNSPECIFIED;
@@ -240,7 +244,7 @@ static void reset_flags(struct si_sm_data *bt)
                BT_CONTROL(BT_B_BUSY);
         BT_CONTROL(BT_CLR_WR_PTR);
         BT_CONTROL(BT_SMS_ATN);
-#ifdef DEVELOPMENT_ONLY_NOT_FOR_PRODUCTION
+
         if (BT_STATUS & BT_B2H_ATN) {
                 int i;
                 BT_CONTROL(BT_H_BUSY);
@@ -250,7 +254,6 @@ static void reset_flags(struct si_sm_data *bt)
                        BMC2HOST;
                 BT_CONTROL(BT_H_BUSY);
         }
-#endif
 }
 
 static inline void write_all_bytes(struct si_sm_data *bt)
@@ -295,7 +298,7 @@ static inline int read_all_bytes(struct si_sm_data *bt)
                 printk ("\n");
         }
         if (bt->seq != bt->write_data[2])       /* idiot check */
-                printk(KERN_WARNING "BT: internal error: sequence mismatch\n");
+                printk(KERN_DEBUG "BT: internal error: sequence mismatch\n");
 
         /* per the spec, the (NetFn, Seq, Cmd) tuples should match */
         if ((bt->read_data[3] == bt->write_data[3]) &&          /* Cmd */
@@ -321,18 +324,17 @@ static void error_recovery(struct si_sm_data *bt, char *reason)
         bt->timeout = BT_NORMAL_TIMEOUT; /* various places want to retry */
 
         status = BT_STATUS;
-        printk(KERN_WARNING "BT: %s in %s %s ", reason, STATE2TXT,
+        printk(KERN_DEBUG "BT: %s in %s %s\n", reason, STATE2TXT,
                STATUS2TXT(buf));
 
         (bt->error_retries)++;
         if (bt->error_retries > BT_RETRY_LIMIT) {
-                printk("retry limit (%d) exceeded\n", BT_RETRY_LIMIT);
+                printk(KERN_DEBUG "retry limit (%d) exceeded\n", BT_RETRY_LIMIT);
                 bt->state = BT_STATE_HOSED;
                 if (!bt->nonzero_status)
                         printk(KERN_ERR "IPMI: BT stuck, try power cycle\n");
-                else if (bt->seq == FIRST_SEQ + BT_RETRY_LIMIT) {
-                        /* most likely during insmod */
-                        printk(KERN_WARNING "IPMI: BT reset (takes 5 secs)\n");
+                else if (bt->error_retries <= BT_RETRY_LIMIT + 1) {
+                        printk(KERN_DEBUG "IPMI: BT reset (takes 5 secs)\n");
                         bt->state = BT_STATE_RESET1;
                 }
         return;
@@ -340,11 +342,11 @@ static void error_recovery(struct si_sm_data *bt, char *reason)
 
         /* Sometimes the BMC queues get in an "off-by-one" state...*/
         if ((bt->state == BT_STATE_B2H_WAIT) && (status & BT_B2H_ATN)) {
-                printk("retry B2H_WAIT\n");
+                printk(KERN_DEBUG "retry B2H_WAIT\n");
                 return;
         }
 
-        printk("restart command\n");
+        printk(KERN_DEBUG "restart command\n");
         bt->state = BT_STATE_RESTART;
 }
 
@@ -372,17 +374,6 @@ static enum si_sm_result bt_event(struct si_sm_data *bt, long time)
                return SI_SM_HOSED;
 
         if (bt->state != BT_STATE_IDLE) {       /* do timeout test */
-
-                /* Certain states, on error conditions, can lock up a CPU
-                   because they are effectively in an infinite loop with
-                   CALL_WITHOUT_DELAY (right back here with time == 0).
-                   Prevent infinite lockup by ALWAYS decrementing timeout. */
-
-        /* FIXME: bt_event is sometimes called with time > BT_NORMAL_TIMEOUT
-              (noticed in ipmi_smic_sm.c January 2004) */
-
-                if ((time <= 0) || (time >= BT_NORMAL_TIMEOUT))
-                       time = 100;
                 bt->timeout -= time;
                 if ((bt->timeout < 0) && (bt->state < BT_STATE_RESET1)) {
                         error_recovery(bt, "timed out");
@@ -483,6 +474,7 @@ static enum si_sm_result bt_event(struct si_sm_data *bt, long time)
                 break;
 
         case BT_STATE_RESTART:          /* don't reset retries! */
+                reset_flags(bt);
                 bt->write_data[2] = ++bt->seq;
                 bt->read_count = 0;
                 bt->nonzero_status = 0;
diff --git a/drivers/char/ipmi/ipmi_kcs_sm.c b/drivers/char/ipmi/ipmi_kcs_sm.c
index d21853a594a3..da1554194d3d 100644
--- a/drivers/char/ipmi/ipmi_kcs_sm.c
+++ b/drivers/char/ipmi/ipmi_kcs_sm.c
@@ -38,16 +38,25 @@
  */
 
 #include <linux/kernel.h> /* For printk. */
+#include <linux/module.h>
+#include <linux/moduleparam.h>
 #include <linux/string.h>
+#include <linux/jiffies.h>
 #include <linux/ipmi_msgdefs.h>         /* for completion codes */
 #include "ipmi_si_sm.h"
 
-/* Set this if you want a printout of why the state machine was hosed
-   when it gets hosed. */
-#define DEBUG_HOSED_REASON
+/* kcs_debug is a bit-field
+ *      KCS_DEBUG_ENABLE -      turned on for now
+ *      KCS_DEBUG_MSG    -      commands and their responses
+ *      KCS_DEBUG_STATES -      state machine
+ */
+#define KCS_DEBUG_STATES        4
+#define KCS_DEBUG_MSG           2
+#define KCS_DEBUG_ENABLE        1
 
-/* Print the state machine state on entry every time. */
-#undef DEBUG_STATE
+static int kcs_debug;
+module_param(kcs_debug, int, 0644);
+MODULE_PARM_DESC(kcs_debug, "debug bitmask, 1=enable, 2=messages, 4=states");
 
 /* The states the KCS driver may be in. */
 enum kcs_states {
@@ -91,6 +100,7 @@ enum kcs_states {
 #define IBF_RETRY_TIMEOUT 1000000
 #define OBF_RETRY_TIMEOUT 1000000
 #define MAX_ERROR_RETRIES 10
+#define ERROR0_OBF_WAIT_JIFFIES (2*HZ)
 
 struct si_sm_data
 {
@@ -107,6 +117,7 @@ struct si_sm_data
         unsigned int  error_retries;
         long          ibf_timeout;
         long          obf_timeout;
+        unsigned long  error0_timeout;
 };
 
 static unsigned int init_kcs_data(struct si_sm_data *kcs,
@@ -175,11 +186,11 @@ static inline void start_error_recovery(struct si_sm_data *kcs, char *reason)
 {
         (kcs->error_retries)++;
         if (kcs->error_retries > MAX_ERROR_RETRIES) {
-#ifdef DEBUG_HOSED_REASON
-                printk("ipmi_kcs_sm: kcs hosed: %s\n", reason);
-#endif
+                if (kcs_debug & KCS_DEBUG_ENABLE)
+                        printk(KERN_DEBUG "ipmi_kcs_sm: kcs hosed: %s\n", reason);
                 kcs->state = KCS_HOSED;
         } else {
+                kcs->error0_timeout = jiffies + ERROR0_OBF_WAIT_JIFFIES;
                 kcs->state = KCS_ERROR0;
         }
 }
@@ -248,14 +259,21 @@ static void restart_kcs_transaction(struct si_sm_data *kcs)
 static int start_kcs_transaction(struct si_sm_data *kcs, unsigned char *data,
                                  unsigned int size)
 {
+        unsigned int i;
+
         if ((size < 2) || (size > MAX_KCS_WRITE_SIZE)) {
                 return -1;
         }
-
         if ((kcs->state != KCS_IDLE) && (kcs->state != KCS_HOSED)) {
                 return -2;
         }
-
+        if (kcs_debug & KCS_DEBUG_MSG) {
+                printk(KERN_DEBUG "start_kcs_transaction -");
+                for (i = 0; i < size; i ++) {
+                        printk(" %02x", (unsigned char) (data [i]));
+                }
+                printk ("\n");
+        }
         kcs->error_retries = 0;
         memcpy(kcs->write_data, data, size);
         kcs->write_count = size;
@@ -305,9 +323,9 @@ static enum si_sm_result kcs_event(struct si_sm_data *kcs, long time)
 
         status = read_status(kcs);
 
-#ifdef DEBUG_STATE
-        printk("  State = %d, %x\n", kcs->state, status);
-#endif
+        if (kcs_debug & KCS_DEBUG_STATES)
+                printk(KERN_DEBUG "KCS: State = %d, %x\n", kcs->state, status);
+
         /* All states wait for ibf, so just do it here. */
         if (!check_ibf(kcs, status, time))
                 return SI_SM_CALL_WITH_DELAY;
@@ -409,6 +427,10 @@ static enum si_sm_result kcs_event(struct si_sm_data *kcs, long time)
 
         case KCS_ERROR0:
                 clear_obf(kcs, status);
+                status = read_status(kcs);
+                if  (GET_STATUS_OBF(status)) /* controller isn't responding */
+                        if (time_before(jiffies, kcs->error0_timeout))
+                                return SI_SM_CALL_WITH_TICK_DELAY;
                 write_cmd(kcs, KCS_GET_STATUS_ABORT);
                 kcs->state = KCS_ERROR1;
                 break;
diff --git a/drivers/char/ipmi/ipmi_msghandler.c b/drivers/char/ipmi/ipmi_msghandler.c
index 32fa82c78c73..c1d06ba449b6 100644
--- a/drivers/char/ipmi/ipmi_msghandler.c
+++ b/drivers/char/ipmi/ipmi_msghandler.c
@@ -38,13 +38,13 @@
 #include <linux/sched.h>
 #include <linux/poll.h>
 #include <linux/spinlock.h>
-#include <linux/rwsem.h>
 #include <linux/slab.h>
 #include <linux/ipmi.h>
 #include <linux/ipmi_smi.h>
 #include <linux/notifier.h>
 #include <linux/init.h>
 #include <linux/proc_fs.h>
+#include <linux/rcupdate.h>
 
 #define PFX "IPMI message handler: "
 
@@ -65,10 +65,19 @@ struct proc_dir_entry *proc_ipmi_root = NULL;
    the max message timer.  This is in milliseconds. */
 #define MAX_MSG_TIMEOUT         60000
 
+
+/*
+ * The main "user" data structure.
+ */
 struct ipmi_user
 {
         struct list_head link;
 
+        /* Set to "0" when the user is destroyed. */
+        int valid;
+
+        struct kref refcount;
+
         /* The upper layer that handles receive messages. */
         struct ipmi_user_hndl *handler;
         void             *handler_data;
@@ -87,6 +96,15 @@ struct cmd_rcvr
         ipmi_user_t   user;
         unsigned char netfn;
         unsigned char cmd;
+
+        /*
+         * This is used to form a linked lised during mass deletion.
+         * Since this is in an RCU list, we cannot use the link above
+         * or change any data until the RCU period completes.  So we
+         * use this next variable during mass deletion so we can have
+         * a list and don't have to wait and restart the search on
+         * every individual deletion of a command. */
+        struct cmd_rcvr *next;
 };
 
 struct seq_table
@@ -150,13 +168,11 @@ struct ipmi_smi
         /* What interface number are we? */
         int intf_num;
 
-        /* The list of upper layers that are using me.  We read-lock
-           this when delivering messages to the upper layer to keep
-           the user from going away while we are processing the
-           message.  This means that you cannot add or delete a user
-           from the receive callback. */
-        rwlock_t                users_lock;
-        struct list_head        users;
+        struct kref refcount;
+
+        /* The list of upper layers that are using me.  seq_lock
+         * protects this. */
+        struct list_head users;
 
         /* Used for wake ups at startup. */
         wait_queue_head_t waitq;
@@ -193,7 +209,7 @@ struct ipmi_smi
 
         /* The list of command receivers that are registered for commands
            on this interface. */
-        rwlock_t         cmd_rcvr_lock;
+        struct semaphore cmd_rcvrs_lock;
         struct list_head cmd_rcvrs;
 
         /* Events that were queues because no one was there to receive
@@ -296,16 +312,17 @@ struct ipmi_smi
         unsigned int events;
 };
 
+/* Used to mark an interface entry that cannot be used but is not a
+ * free entry, either, primarily used at creation and deletion time so
+ * a slot doesn't get reused too quickly. */
+#define IPMI_INVALID_INTERFACE_ENTRY ((ipmi_smi_t) ((long) 1))
+#define IPMI_INVALID_INTERFACE(i) (((i) == NULL) \
+                                   || (i == IPMI_INVALID_INTERFACE_ENTRY))
+
 #define MAX_IPMI_INTERFACES 4
 static ipmi_smi_t ipmi_interfaces[MAX_IPMI_INTERFACES];
 
-/* Used to keep interfaces from going away while operations are
-   operating on interfaces.  Grab read if you are not modifying the
-   interfaces, write if you are. */
-static DECLARE_RWSEM(interfaces_sem);
-
-/* Directly protects the ipmi_interfaces data structure.  This is
-   claimed in the timer interrupt. */
+/* Directly protects the ipmi_interfaces data structure. */
 static DEFINE_SPINLOCK(interfaces_lock);
 
 /* List of watchers that want to know when smi's are added and
@@ -313,20 +330,72 @@ static DEFINE_SPINLOCK(interfaces_lock);
 static struct list_head smi_watchers = LIST_HEAD_INIT(smi_watchers);
 static DECLARE_RWSEM(smi_watchers_sem);
 
+
+static void free_recv_msg_list(struct list_head *q)
+{
+        struct ipmi_recv_msg *msg, *msg2;
+
+        list_for_each_entry_safe(msg, msg2, q, link) {
+                list_del(&msg->link);
+                ipmi_free_recv_msg(msg);
+        }
+}
+
+static void clean_up_interface_data(ipmi_smi_t intf)
+{
+        int              i;
+        struct cmd_rcvr  *rcvr, *rcvr2;
+        struct list_head list;
+
+        free_recv_msg_list(&intf->waiting_msgs);
+        free_recv_msg_list(&intf->waiting_events);
+
+        /* Wholesale remove all the entries from the list in the
+         * interface and wait for RCU to know that none are in use. */
+        down(&intf->cmd_rcvrs_lock);
+        list_add_rcu(&list, &intf->cmd_rcvrs);
+        list_del_rcu(&intf->cmd_rcvrs);
+        up(&intf->cmd_rcvrs_lock);
+        synchronize_rcu();
+
+        list_for_each_entry_safe(rcvr, rcvr2, &list, link)
+                kfree(rcvr);
+
+        for (i = 0; i < IPMI_IPMB_NUM_SEQ; i++) {
+                if ((intf->seq_table[i].inuse)
+                    && (intf->seq_table[i].recv_msg))
+                {
+                        ipmi_free_recv_msg(intf->seq_table[i].recv_msg);
+                }
+        }
+}
+
+static void intf_free(struct kref *ref)
+{
+        ipmi_smi_t intf = container_of(ref, struct ipmi_smi, refcount);
+
+        clean_up_interface_data(intf);
+        kfree(intf);
+}
+
 int ipmi_smi_watcher_register(struct ipmi_smi_watcher *watcher)
 {
-        int i;
+        int           i;
+        unsigned long flags;
 
-        down_read(&interfaces_sem);
         down_write(&smi_watchers_sem);
         list_add(&(watcher->link), &smi_watchers);
+        up_write(&smi_watchers_sem);
+        spin_lock_irqsave(&interfaces_lock, flags);
         for (i = 0; i < MAX_IPMI_INTERFACES; i++) {
-                if (ipmi_interfaces[i] != NULL) {
-                        watcher->new_smi(i);
-                }
+                ipmi_smi_t intf = ipmi_interfaces[i];
+                if (IPMI_INVALID_INTERFACE(intf))
+                        continue;
+                spin_unlock_irqrestore(&interfaces_lock, flags);
+                watcher->new_smi(i);
+                spin_lock_irqsave(&interfaces_lock, flags);
         }
-        up_write(&smi_watchers_sem);
-        up_read(&interfaces_sem);
+        spin_unlock_irqrestore(&interfaces_lock, flags);
         return 0;
 }
 
@@ -471,8 +540,8 @@ static void deliver_response(struct ipmi_recv_msg *msg)
                 }
                 ipmi_free_recv_msg(msg);
         } else {
-                msg->user->handler->ipmi_recv_hndl(msg,
-                                                   msg->user->handler_data);
+                ipmi_user_t user = msg->user;
+                user->handler->ipmi_recv_hndl(msg, user->handler_data);
         }
 }
 
@@ -662,15 +731,18 @@ int ipmi_create_user(unsigned int          if_num,
         if (! new_user)
                 return -ENOMEM;
 
-        down_read(&interfaces_sem);
-        if ((if_num >= MAX_IPMI_INTERFACES) || ipmi_interfaces[if_num] == NULL)
-        {
-                rv = -EINVAL;
-                goto out_unlock;
+        spin_lock_irqsave(&interfaces_lock, flags);
+        intf = ipmi_interfaces[if_num];
+        if ((if_num >= MAX_IPMI_INTERFACES) || IPMI_INVALID_INTERFACE(intf)) {
+                spin_unlock_irqrestore(&interfaces_lock, flags);
+                return -EINVAL;
         }
 
-        intf = ipmi_interfaces[if_num];
+        /* Note that each existing user holds a refcount to the interface. */
+        kref_get(&intf->refcount);
+        spin_unlock_irqrestore(&interfaces_lock, flags);
 
+        kref_init(&new_user->refcount);
         new_user->handler = handler;
         new_user->handler_data = handler_data;
         new_user->intf = intf;
@@ -678,98 +750,92 @@ int ipmi_create_user(unsigned int          if_num,
 
         if (!try_module_get(intf->handlers->owner)) {
                 rv = -ENODEV;
-                goto out_unlock;
+                goto out_err;
         }
 
         if (intf->handlers->inc_usecount) {
                 rv = intf->handlers->inc_usecount(intf->send_info);
                 if (rv) {
                         module_put(intf->handlers->owner);
-                        goto out_unlock;
+                        goto out_err;
                 }
         }
 
-        write_lock_irqsave(&intf->users_lock, flags);
-        list_add_tail(&new_user->link, &intf->users);
-        write_unlock_irqrestore(&intf->users_lock, flags);
-
- out_unlock:    
-        if (rv) {
-                kfree(new_user);
-        } else {
-                *user = new_user;
-        }
+        new_user->valid = 1;
+        spin_lock_irqsave(&intf->seq_lock, flags);
+        list_add_rcu(&new_user->link, &intf->users);
+        spin_unlock_irqrestore(&intf->seq_lock, flags);
+        *user = new_user;
+        return 0;
 
-        up_read(&interfaces_sem);
+ out_err:
+        kfree(new_user);
+        kref_put(&intf->refcount, intf_free);
         return rv;
 }
 
-static int ipmi_destroy_user_nolock(ipmi_user_t user)
+static void free_user(struct kref *ref)
+{
+        ipmi_user_t user = container_of(ref, struct ipmi_user, refcount);
+        kfree(user);
+}
+
+int ipmi_destroy_user(ipmi_user_t user)
 {
         int              rv = -ENODEV;
-        ipmi_user_t      t_user;
-        struct cmd_rcvr  *rcvr, *rcvr2;
+        ipmi_smi_t       intf = user->intf;
         int              i;
         unsigned long    flags;
+        struct cmd_rcvr  *rcvr;
+        struct list_head *entry1, *entry2;
+        struct cmd_rcvr  *rcvrs = NULL;
 
-        /* Find the user and delete them from the list. */
-        list_for_each_entry(t_user, &(user->intf->users), link) {
-                if (t_user == user) {
-                        list_del(&t_user->link);
-                        rv = 0;
-                        break;
-                }
-        }
+        user->valid = 1;
 
-        if (rv) {
-                goto out_unlock;
-        }
+        /* Remove the user from the interface's sequence table. */
+        spin_lock_irqsave(&intf->seq_lock, flags);
+        list_del_rcu(&user->link);
 
-        /* Remove the user from the interfaces sequence table. */
-        spin_lock_irqsave(&(user->intf->seq_lock), flags);
         for (i = 0; i < IPMI_IPMB_NUM_SEQ; i++) {
-                if (user->intf->seq_table[i].inuse
-                    && (user->intf->seq_table[i].recv_msg->user == user))
+                if (intf->seq_table[i].inuse
+                    && (intf->seq_table[i].recv_msg->user == user))
                 {
-                        user->intf->seq_table[i].inuse = 0;
+                        intf->seq_table[i].inuse = 0;
                 }
         }
-        spin_unlock_irqrestore(&(user->intf->seq_lock), flags);
-
-        /* Remove the user from the command receiver's table. */
-        write_lock_irqsave(&(user->intf->cmd_rcvr_lock), flags);
-        list_for_each_entry_safe(rcvr, rcvr2, &(user->intf->cmd_rcvrs), link) {
+        spin_unlock_irqrestore(&intf->seq_lock, flags);
+
+        /*
+         * Remove the user from the command receiver's table.  First
+         * we build a list of everything (not using the standard link,
+         * since other things may be using it till we do
+         * synchronize_rcu()) then free everything in that list.
+         */
+        down(&intf->cmd_rcvrs_lock);
+        list_for_each_safe_rcu(entry1, entry2, &intf->cmd_rcvrs) {
+                rcvr = list_entry(entry1, struct cmd_rcvr, link);
                 if (rcvr->user == user) {
-                        list_del(&rcvr->link);
-                        kfree(rcvr);
+                        list_del_rcu(&rcvr->link);
+                        rcvr->next = rcvrs;
+                        rcvrs = rcvr;
                 }
         }
-        write_unlock_irqrestore(&(user->intf->cmd_rcvr_lock), flags);
+        up(&intf->cmd_rcvrs_lock);
+        synchronize_rcu();
+        while (rcvrs) {
+                rcvr = rcvrs;
+                rcvrs = rcvr->next;
+                kfree(rcvr);
+        }
 
-        kfree(user);
+        module_put(intf->handlers->owner);
+        if (intf->handlers->dec_usecount)
+                intf->handlers->dec_usecount(intf->send_info);
 
- out_unlock:
+        kref_put(&intf->refcount, intf_free);
 
-        return rv;
-}
-
-int ipmi_destroy_user(ipmi_user_t user)
-{
-        int           rv;
-        ipmi_smi_t    intf = user->intf;
-        unsigned long flags;
+        kref_put(&user->refcount, free_user);
 
-        down_read(&interfaces_sem);
-        write_lock_irqsave(&intf->users_lock, flags);
-        rv = ipmi_destroy_user_nolock(user);
-        if (!rv) {
-                module_put(intf->handlers->owner);
-                if (intf->handlers->dec_usecount)
-                        intf->handlers->dec_usecount(intf->send_info);
-        }
-                
-        write_unlock_irqrestore(&intf->users_lock, flags);
-        up_read(&interfaces_sem);
         return rv;
 }
 
@@ -823,62 +889,78 @@ int ipmi_get_my_LUN(ipmi_user_t   user,
 
 int ipmi_set_gets_events(ipmi_user_t user, int val)
 {
-        unsigned long         flags;
-        struct ipmi_recv_msg  *msg, *msg2;
+        unsigned long        flags;
+        ipmi_smi_t           intf = user->intf;
+        struct ipmi_recv_msg *msg, *msg2;
+        struct list_head     msgs;
 
-        read_lock(&(user->intf->users_lock));
-        spin_lock_irqsave(&(user->intf->events_lock), flags);
+        INIT_LIST_HEAD(&msgs);
+
+        spin_lock_irqsave(&intf->events_lock, flags);
         user->gets_events = val;
 
         if (val) {
                 /* Deliver any queued events. */
-                list_for_each_entry_safe(msg, msg2, &(user->intf->waiting_events), link) {
+                list_for_each_entry_safe(msg, msg2, &intf->waiting_events, link) {
                         list_del(&msg->link);
-                        msg->user = user;
-                        deliver_response(msg);
+                        list_add_tail(&msg->link, &msgs);
                 }
         }
-        
-        spin_unlock_irqrestore(&(user->intf->events_lock), flags);
-        read_unlock(&(user->intf->users_lock));
+
+        /* Hold the events lock while doing this to preserve order. */
+        list_for_each_entry_safe(msg, msg2, &msgs, link) {
+                msg->user = user;
+                kref_get(&user->refcount);
+                deliver_response(msg);
+        }
+
+        spin_unlock_irqrestore(&intf->events_lock, flags);
 
         return 0;
 }
 
+static struct cmd_rcvr *find_cmd_rcvr(ipmi_smi_t    intf,
+                                      unsigned char netfn,
+                                      unsigned char cmd)
+{
+        struct cmd_rcvr *rcvr;
+
+        list_for_each_entry_rcu(rcvr, &intf->cmd_rcvrs, link) {
+                if ((rcvr->netfn == netfn) && (rcvr->cmd == cmd))
+                        return rcvr;
+        }
+        return NULL;
+}
+
 int ipmi_register_for_cmd(ipmi_user_t   user,
                           unsigned char netfn,
                           unsigned char cmd)
 {
-        struct cmd_rcvr  *cmp;
-        unsigned long    flags;
-        struct cmd_rcvr  *rcvr;
-        int              rv = 0;
+        ipmi_smi_t      intf = user->intf;
+        struct cmd_rcvr *rcvr;
+        struct cmd_rcvr *entry;
+        int             rv = 0;
 
 
         rcvr = kmalloc(sizeof(*rcvr), GFP_KERNEL);
         if (! rcvr)
                 return -ENOMEM;
+        rcvr->cmd = cmd;
+        rcvr->netfn = netfn;
+        rcvr->user = user;
 
-        read_lock(&(user->intf->users_lock));
-        write_lock_irqsave(&(user->intf->cmd_rcvr_lock), flags);
+        down(&intf->cmd_rcvrs_lock);
         /* Make sure the command/netfn is not already registered. */
-        list_for_each_entry(cmp, &(user->intf->cmd_rcvrs), link) {
-                if ((cmp->netfn == netfn) && (cmp->cmd == cmd)) {
-                        rv = -EBUSY;
-                        break;
-                }
-        }
-
-        if (! rv) {
-                rcvr->cmd = cmd;
-                rcvr->netfn = netfn;
-                rcvr->user = user;
-                list_add_tail(&(rcvr->link), &(user->intf->cmd_rcvrs));
+        entry = find_cmd_rcvr(intf, netfn, cmd);
+        if (entry) {
+                rv = -EBUSY;
+                goto out_unlock;
         }
 
-        write_unlock_irqrestore(&(user->intf->cmd_rcvr_lock), flags);
-        read_unlock(&(user->intf->users_lock));
+        list_add_rcu(&rcvr->link, &intf->cmd_rcvrs);
 
+ out_unlock:
+        up(&intf->cmd_rcvrs_lock);
         if (rv)
                 kfree(rcvr);
 
@@ -889,31 +971,28 @@ int ipmi_unregister_for_cmd(ipmi_user_t   user,
                             unsigned char netfn,
                             unsigned char cmd)
 {
-        unsigned long    flags;
-        struct cmd_rcvr  *rcvr;
-        int              rv = -ENOENT;
+        ipmi_smi_t      intf = user->intf;
+        struct cmd_rcvr *rcvr;
 
-        read_lock(&(user->intf->users_lock));
-        write_lock_irqsave(&(user->intf->cmd_rcvr_lock), flags);
+        down(&intf->cmd_rcvrs_lock);
         /* Make sure the command/netfn is not already registered. */
-        list_for_each_entry(rcvr, &(user->intf->cmd_rcvrs), link) {
-                if ((rcvr->netfn == netfn) && (rcvr->cmd == cmd)) {
-                        rv = 0;
-                        list_del(&rcvr->link);
-                        kfree(rcvr);
-                        break;
-                }
+        rcvr = find_cmd_rcvr(intf, netfn, cmd);
+        if ((rcvr) && (rcvr->user == user)) {
+                list_del_rcu(&rcvr->link);
+                up(&intf->cmd_rcvrs_lock);
+                synchronize_rcu();
+                kfree(rcvr);
+                return 0;
+        } else {
+                up(&intf->cmd_rcvrs_lock);
+                return -ENOENT;
         }
-        write_unlock_irqrestore(&(user->intf->cmd_rcvr_lock), flags);
-        read_unlock(&(user->intf->users_lock));
-
-        return rv;
 }
 
 void ipmi_user_set_run_to_completion(ipmi_user_t user, int val)
 {
-        user->intf->handlers->set_run_to_completion(user->intf->send_info,
-                                                    val);
+        ipmi_smi_t intf = user->intf;
+        intf->handlers->set_run_to_completion(intf->send_info, val);
 }
 
 static unsigned char
@@ -1010,19 +1089,19 @@ static inline void format_lan_msg(struct ipmi_smi_msg   *smi_msg,
    supplied in certain circumstances (mainly at panic time).  If
    messages are supplied, they will be freed, even if an error
    occurs. */
-static inline int i_ipmi_request(ipmi_user_t          user,
-                                 ipmi_smi_t           intf,
-                                 struct ipmi_addr     *addr,
-                                 long                 msgid,
-                                 struct kernel_ipmi_msg *msg,
-                                 void                 *user_msg_data,
-                                 void                 *supplied_smi,
-                                 struct ipmi_recv_msg *supplied_recv,
-                                 int                  priority,
-                                 unsigned char        source_address,
-                                 unsigned char        source_lun,
-                                 int                  retries,
-                                 unsigned int         retry_time_ms)
+static int i_ipmi_request(ipmi_user_t          user,
+                          ipmi_smi_t           intf,
+                          struct ipmi_addr     *addr,
+                          long                 msgid,
+                          struct kernel_ipmi_msg *msg,
+                          void                 *user_msg_data,
+                          void                 *supplied_smi,
+                          struct ipmi_recv_msg *supplied_recv,
+                          int                  priority,
+                          unsigned char        source_address,
+                          unsigned char        source_lun,
+                          int                  retries,
+                          unsigned int         retry_time_ms)
 {
         int                  rv = 0;
         struct ipmi_smi_msg  *smi_msg;
@@ -1051,6 +1130,8 @@ static inline int i_ipmi_request(ipmi_user_t          user,
         }
 
         recv_msg->user = user;
+        if (user)
+                kref_get(&user->refcount);
         recv_msg->msgid = msgid;
         /* Store the message to send in the receive message so timeout
            responses can get the proper response data. */
@@ -1725,11 +1806,11 @@ int ipmi_register_smi(struct ipmi_smi_handlers *handlers,
                       unsigned char            version_major,
                       unsigned char            version_minor,
                       unsigned char            slave_addr,
-                      ipmi_smi_t               *intf)
+                      ipmi_smi_t               *new_intf)
 {
         int              i, j;
         int              rv;
-        ipmi_smi_t       new_intf;
+        ipmi_smi_t       intf;
         unsigned long    flags;
 
 
@@ -1745,189 +1826,142 @@ int ipmi_register_smi(struct ipmi_smi_handlers *handlers,
                         return -ENODEV;
         }
 
-        new_intf = kmalloc(sizeof(*new_intf), GFP_KERNEL);
-        if (!new_intf)
+        intf = kmalloc(sizeof(*intf), GFP_KERNEL);
+        if (!intf)
                 return -ENOMEM;
-        memset(new_intf, 0, sizeof(*new_intf));
-
-        new_intf->proc_dir = NULL;
+        memset(intf, 0, sizeof(*intf));
+        intf->intf_num = -1;
+        kref_init(&intf->refcount);
+        intf->version_major = version_major;
+        intf->version_minor = version_minor;
+        for (j = 0; j < IPMI_MAX_CHANNELS; j++) {
+                intf->channels[j].address = IPMI_BMC_SLAVE_ADDR;
+                intf->channels[j].lun = 2;
+        }
+        if (slave_addr != 0)
+                intf->channels[0].address = slave_addr;
+        INIT_LIST_HEAD(&intf->users);
+        intf->handlers = handlers;
+        intf->send_info = send_info;
+        spin_lock_init(&intf->seq_lock);
+        for (j = 0; j < IPMI_IPMB_NUM_SEQ; j++) {
+                intf->seq_table[j].inuse = 0;
+                intf->seq_table[j].seqid = 0;
+        }
+        intf->curr_seq = 0;
+#ifdef CONFIG_PROC_FS
+        spin_lock_init(&intf->proc_entry_lock);
+#endif
+        spin_lock_init(&intf->waiting_msgs_lock);
+        INIT_LIST_HEAD(&intf->waiting_msgs);
+        spin_lock_init(&intf->events_lock);
+        INIT_LIST_HEAD(&intf->waiting_events);
+        intf->waiting_events_count = 0;
+        init_MUTEX(&intf->cmd_rcvrs_lock);
+        INIT_LIST_HEAD(&intf->cmd_rcvrs);
+        init_waitqueue_head(&intf->waitq);
+
+        spin_lock_init(&intf->counter_lock);
+        intf->proc_dir = NULL;
 
         rv = -ENOMEM;
-
-        down_write(&interfaces_sem);
+        spin_lock_irqsave(&interfaces_lock, flags);
         for (i = 0; i < MAX_IPMI_INTERFACES; i++) {
                 if (ipmi_interfaces[i] == NULL) {
-                        new_intf->intf_num = i;
-                        new_intf->version_major = version_major;
-                        new_intf->version_minor = version_minor;
-                        for (j = 0; j < IPMI_MAX_CHANNELS; j++) {
-                                new_intf->channels[j].address
-                                        = IPMI_BMC_SLAVE_ADDR;
-                                new_intf->channels[j].lun = 2;
-                        }
-                        if (slave_addr != 0)
-                                new_intf->channels[0].address = slave_addr;
-                        rwlock_init(&(new_intf->users_lock));
-                        INIT_LIST_HEAD(&(new_intf->users));
-                        new_intf->handlers = handlers;
-                        new_intf->send_info = send_info;
-                        spin_lock_init(&(new_intf->seq_lock));
-                        for (j = 0; j < IPMI_IPMB_NUM_SEQ; j++) {
-                                new_intf->seq_table[j].inuse = 0;
-                                new_intf->seq_table[j].seqid = 0;
-                        }
-                        new_intf->curr_seq = 0;
-#ifdef CONFIG_PROC_FS
-                        spin_lock_init(&(new_intf->proc_entry_lock));
-#endif
-                        spin_lock_init(&(new_intf->waiting_msgs_lock));
-                        INIT_LIST_HEAD(&(new_intf->waiting_msgs));
-                        spin_lock_init(&(new_intf->events_lock));
-                        INIT_LIST_HEAD(&(new_intf->waiting_events));
-                        new_intf->waiting_events_count = 0;
-                        rwlock_init(&(new_intf->cmd_rcvr_lock));
-                        init_waitqueue_head(&new_intf->waitq);
-                        INIT_LIST_HEAD(&(new_intf->cmd_rcvrs));
-
-                        spin_lock_init(&(new_intf->counter_lock));
-
-                        spin_lock_irqsave(&interfaces_lock, flags);
-                        ipmi_interfaces[i] = new_intf;
-                        spin_unlock_irqrestore(&interfaces_lock, flags);
-
+                        intf->intf_num = i;
+                        /* Reserve the entry till we are done. */
+                        ipmi_interfaces[i] = IPMI_INVALID_INTERFACE_ENTRY;
                         rv = 0;
-                        *intf = new_intf;
                         break;
                 }
         }
+        spin_unlock_irqrestore(&interfaces_lock, flags);
+        if (rv)
+                goto out;
 
-        downgrade_write(&interfaces_sem);
-
-        if (rv == 0)
-                rv = add_proc_entries(*intf, i);
-
-        if (rv == 0) {
-                if ((version_major > 1)
-                    || ((version_major == 1) && (version_minor >= 5)))
-                {
-                        /* Start scanning the channels to see what is
-                           available. */
-                        (*intf)->null_user_handler = channel_handler;
-                        (*intf)->curr_channel = 0;
-                        rv = send_channel_info_cmd(*intf, 0);
-                        if (rv)
-                                goto out;
+        /* FIXME - this is an ugly kludge, this sets the intf for the
+           caller before sending any messages with it. */
+        *new_intf = intf;
 
-                        /* Wait for the channel info to be read. */
-                        up_read(&interfaces_sem);
-                        wait_event((*intf)->waitq,
-                                   ((*intf)->curr_channel>=IPMI_MAX_CHANNELS));
-                        down_read(&interfaces_sem);
+        if ((version_major > 1)
+            || ((version_major == 1) && (version_minor >= 5)))
+        {
+                /* Start scanning the channels to see what is
+                   available. */
+                intf->null_user_handler = channel_handler;
+                intf->curr_channel = 0;
+                rv = send_channel_info_cmd(intf, 0);
+                if (rv)
+                        goto out;
 
-                        if (ipmi_interfaces[i] != new_intf)
-                                /* Well, it went away.  Just return. */
-                                goto out;
-                } else {
-                        /* Assume a single IPMB channel at zero. */
-                        (*intf)->channels[0].medium = IPMI_CHANNEL_MEDIUM_IPMB;
-                        (*intf)->channels[0].protocol
-                                = IPMI_CHANNEL_PROTOCOL_IPMB;
-                }
-
-                /* Call all the watcher interfaces to tell
-                   them that a new interface is available. */
-                call_smi_watchers(i);
+                /* Wait for the channel info to be read. */
+                wait_event(intf->waitq,
+                           intf->curr_channel >= IPMI_MAX_CHANNELS);
+        } else {
+                /* Assume a single IPMB channel at zero. */
+                intf->channels[0].medium = IPMI_CHANNEL_MEDIUM_IPMB;
+                intf->channels[0].protocol = IPMI_CHANNEL_PROTOCOL_IPMB;
         }
 
- out:
-        up_read(&interfaces_sem);
+        if (rv == 0)
+                rv = add_proc_entries(intf, i);
 
+ out:
         if (rv) {
-                if (new_intf->proc_dir)
-                        remove_proc_entries(new_intf);
-                kfree(new_intf);
+                if (intf->proc_dir)
+                        remove_proc_entries(intf);
+                kref_put(&intf->refcount, intf_free);
+                if (i < MAX_IPMI_INTERFACES) {
+                        spin_lock_irqsave(&interfaces_lock, flags);
+                        ipmi_interfaces[i] = NULL;
+                        spin_unlock_irqrestore(&interfaces_lock, flags);
+                }
+        } else {
+                spin_lock_irqsave(&interfaces_lock, flags);
+                ipmi_interfaces[i] = intf;
+                spin_unlock_irqrestore(&interfaces_lock, flags);
+                call_smi_watchers(i);
         }
 
         return rv;
 }
 
-static void free_recv_msg_list(struct list_head *q)
-{
-        struct ipmi_recv_msg *msg, *msg2;
-
-        list_for_each_entry_safe(msg, msg2, q, link) {
-                list_del(&msg->link);
-                ipmi_free_recv_msg(msg);
-        }
-}
-
-static void free_cmd_rcvr_list(struct list_head *q)
-{
-        struct cmd_rcvr  *rcvr, *rcvr2;
-
-        list_for_each_entry_safe(rcvr, rcvr2, q, link) {
-                list_del(&rcvr->link);
-                kfree(rcvr);
-        }
-}
-
-static void clean_up_interface_data(ipmi_smi_t intf)
-{
-        int i;
-
-        free_recv_msg_list(&(intf->waiting_msgs));
-        free_recv_msg_list(&(intf->waiting_events));
-        free_cmd_rcvr_list(&(intf->cmd_rcvrs));
-
-        for (i = 0; i < IPMI_IPMB_NUM_SEQ; i++) {
-                if ((intf->seq_table[i].inuse)
-                    && (intf->seq_table[i].recv_msg))
-                {
-                        ipmi_free_recv_msg(intf->seq_table[i].recv_msg);
-                }       
-        }
-}
-
 int ipmi_unregister_smi(ipmi_smi_t intf)
 {
-        int                     rv = -ENODEV;
         int                     i;
         struct ipmi_smi_watcher *w;
         unsigned long           flags;
 
-        down_write(&interfaces_sem);
-        if (list_empty(&(intf->users)))
-        {
-                for (i = 0; i < MAX_IPMI_INTERFACES; i++) {
-                        if (ipmi_interfaces[i] == intf) {
-                                remove_proc_entries(intf);
-                                spin_lock_irqsave(&interfaces_lock, flags);
-                                ipmi_interfaces[i] = NULL;
-                                clean_up_interface_data(intf);
-                                spin_unlock_irqrestore(&interfaces_lock,flags);
-                                kfree(intf);
-                                rv = 0;
-                                goto out_call_watcher;
-                        }
+        spin_lock_irqsave(&interfaces_lock, flags);
+        for (i = 0; i < MAX_IPMI_INTERFACES; i++) {
+                if (ipmi_interfaces[i] == intf) {
+                        /* Set the interface number reserved until we
+                         * are done. */
+                        ipmi_interfaces[i] = IPMI_INVALID_INTERFACE_ENTRY;
+                        intf->intf_num = -1;
+                        break;
                 }
-        } else {
-                rv = -EBUSY;
         }
-        up_write(&interfaces_sem);
+        spin_unlock_irqrestore(&interfaces_lock,flags);
 
-        return rv;
+        if (i == MAX_IPMI_INTERFACES)
+                return -ENODEV;
 
- out_call_watcher:
-        downgrade_write(&interfaces_sem);
+        remove_proc_entries(intf);
 
         /* Call all the watcher interfaces to tell them that
            an interface is gone. */
         down_read(&smi_watchers_sem);
-        list_for_each_entry(w, &smi_watchers, link) {
+        list_for_each_entry(w, &smi_watchers, link)
                 w->smi_gone(i);
-        }
         up_read(&smi_watchers_sem);
-        up_read(&interfaces_sem);
+
+        /* Allow the entry to be reused now. */
+        spin_lock_irqsave(&interfaces_lock, flags);
+        ipmi_interfaces[i] = NULL;
+        spin_unlock_irqrestore(&interfaces_lock,flags);
+
+        kref_put(&intf->refcount, intf_free);
         return 0;
 }
 
@@ -1998,14 +2032,14 @@ static int handle_ipmb_get_msg_rsp(ipmi_smi_t          intf,
 static int handle_ipmb_get_msg_cmd(ipmi_smi_t          intf,
                                    struct ipmi_smi_msg *msg)
 {
-        struct cmd_rcvr       *rcvr;
-        int                   rv = 0;
-        unsigned char         netfn;
-        unsigned char         cmd;
-        ipmi_user_t           user = NULL;
-        struct ipmi_ipmb_addr *ipmb_addr;
-        struct ipmi_recv_msg  *recv_msg;
-        unsigned long         flags;
+        struct cmd_rcvr          *rcvr;
+        int                      rv = 0;
+        unsigned char            netfn;
+        unsigned char            cmd;
+        ipmi_user_t              user = NULL;
+        struct ipmi_ipmb_addr    *ipmb_addr;
+        struct ipmi_recv_msg     *recv_msg;
+        unsigned long            flags;
 
         if (msg->rsp_size < 10) {
                 /* Message not big enough, just ignore it. */
@@ -2023,16 +2057,14 @@ static int handle_ipmb_get_msg_cmd(ipmi_smi_t          intf,
         netfn = msg->rsp[4] >> 2;
         cmd = msg->rsp[8];
 
-        read_lock(&(intf->cmd_rcvr_lock));
-        
-        /* Find the command/netfn. */
-        list_for_each_entry(rcvr, &(intf->cmd_rcvrs), link) {
-                if ((rcvr->netfn == netfn) && (rcvr->cmd == cmd)) {
-                        user = rcvr->user;
-                        break;
-                }
-        }
-        read_unlock(&(intf->cmd_rcvr_lock));
+        rcu_read_lock();
+        rcvr = find_cmd_rcvr(intf, netfn, cmd);
+        if (rcvr) {
+                user = rcvr->user;
+                kref_get(&user->refcount);
+        } else
+                user = NULL;
+        rcu_read_unlock();
 
         if (user == NULL) {
                 /* We didn't find a user, deliver an error response. */
@@ -2079,6 +2111,7 @@ static int handle_ipmb_get_msg_cmd(ipmi_smi_t          intf,
                            message, so requeue it for handling
                            later. */
                         rv = 1;
+                        kref_put(&user->refcount, free_user);
                 } else {
                         /* Extract the source address from the data. */
                         ipmb_addr = (struct ipmi_ipmb_addr *) &recv_msg->addr;
@@ -2179,14 +2212,14 @@ static int handle_lan_get_msg_rsp(ipmi_smi_t          intf,
 static int handle_lan_get_msg_cmd(ipmi_smi_t          intf,
                                   struct ipmi_smi_msg *msg)
 {
-        struct cmd_rcvr       *rcvr;
-        int                   rv = 0;
-        unsigned char         netfn;
-        unsigned char         cmd;
-        ipmi_user_t           user = NULL;
-        struct ipmi_lan_addr  *lan_addr;
-        struct ipmi_recv_msg  *recv_msg;
-        unsigned long         flags;
+        struct cmd_rcvr          *rcvr;
+        int                      rv = 0;
+        unsigned char            netfn;
+        unsigned char            cmd;
+        ipmi_user_t              user = NULL;
+        struct ipmi_lan_addr     *lan_addr;
+        struct ipmi_recv_msg     *recv_msg;
+        unsigned long            flags;
 
         if (msg->rsp_size < 12) {
                 /* Message not big enough, just ignore it. */
@@ -2204,19 +2237,17 @@ static int handle_lan_get_msg_cmd(ipmi_smi_t          intf,
         netfn = msg->rsp[6] >> 2;
         cmd = msg->rsp[10];
 
-        read_lock(&(intf->cmd_rcvr_lock));
-
-        /* Find the command/netfn. */
-        list_for_each_entry(rcvr, &(intf->cmd_rcvrs), link) {
-                if ((rcvr->netfn == netfn) && (rcvr->cmd == cmd)) {
-                        user = rcvr->user;
-                        break;
-                }
-        }
-        read_unlock(&(intf->cmd_rcvr_lock));
+        rcu_read_lock();
+        rcvr = find_cmd_rcvr(intf, netfn, cmd);
+        if (rcvr) {
+                user = rcvr->user;
+                kref_get(&user->refcount);
+        } else
+                user = NULL;
+        rcu_read_unlock();
 
         if (user == NULL) {
-                /* We didn't find a user, deliver an error response. */
+                /* We didn't find a user, just give up. */
                 spin_lock_irqsave(&intf->counter_lock, flags);
                 intf->unhandled_commands++;
                 spin_unlock_irqrestore(&intf->counter_lock, flags);
@@ -2235,6 +2266,7 @@ static int handle_lan_get_msg_cmd(ipmi_smi_t          intf,
                            message, so requeue it for handling
                            later. */
                         rv = 1;
+                        kref_put(&user->refcount, free_user);
                 } else {
                         /* Extract the source address from the data. */
                         lan_addr = (struct ipmi_lan_addr *) &recv_msg->addr;
@@ -2286,8 +2318,6 @@ static void copy_event_into_recv_msg(struct ipmi_recv_msg *recv_msg,
         recv_msg->msg.data_len = msg->rsp_size - 3;
 }
 
-/* This will be called with the intf->users_lock read-locked, so no need
-   to do that here. */
 static int handle_read_event_rsp(ipmi_smi_t          intf,
                                  struct ipmi_smi_msg *msg)
 {
@@ -2313,7 +2343,7 @@ static int handle_read_event_rsp(ipmi_smi_t          intf,
 
         INIT_LIST_HEAD(&msgs);
 
-        spin_lock_irqsave(&(intf->events_lock), flags);
+        spin_lock_irqsave(&intf->events_lock, flags);
 
         spin_lock(&intf->counter_lock);
         intf->events++;
@@ -2321,12 +2351,14 @@ static int handle_read_event_rsp(ipmi_smi_t          intf,
 
         /* Allocate and fill in one message for every user that is getting
            events. */
-        list_for_each_entry(user, &(intf->users), link) {
+        rcu_read_lock();
+        list_for_each_entry_rcu(user, &intf->users, link) {
                 if (! user->gets_events)
                         continue;
 
                 recv_msg = ipmi_alloc_recv_msg();
                 if (! recv_msg) {
+                        rcu_read_unlock();
                         list_for_each_entry_safe(recv_msg, recv_msg2, &msgs, link) {
                                 list_del(&recv_msg->link);
                                 ipmi_free_recv_msg(recv_msg);
@@ -2342,8 +2374,10 @@ static int handle_read_event_rsp(ipmi_smi_t          intf,
 
                 copy_event_into_recv_msg(recv_msg, msg);
                 recv_msg->user = user;
+                kref_get(&user->refcount);
                 list_add_tail(&(recv_msg->link), &msgs);
         }
+        rcu_read_unlock();
 
         if (deliver_count) {
                 /* Now deliver all the messages. */
@@ -2382,9 +2416,8 @@ static int handle_bmc_rsp(ipmi_smi_t          intf,
                           struct ipmi_smi_msg *msg)
 {
         struct ipmi_recv_msg *recv_msg;
-        int                  found = 0;
-        struct ipmi_user     *user;
         unsigned long        flags;
+        struct ipmi_user     *user;
 
         recv_msg = (struct ipmi_recv_msg *) msg->user_data;
         if (recv_msg == NULL)
@@ -2396,16 +2429,9 @@ static int handle_bmc_rsp(ipmi_smi_t          intf,
                 return 0;
         }
 
+        user = recv_msg->user;
         /* Make sure the user still exists. */
-        list_for_each_entry(user, &(intf->users), link) {
-                if (user == recv_msg->user) {
-                        /* Found it, so we can deliver it */
-                        found = 1;
-                        break;
-                }
-        }
-
-        if ((! found) && recv_msg->user) {
+        if (user && !user->valid) {
                 /* The user for the message went away, so give up. */
                 spin_lock_irqsave(&intf->counter_lock, flags);
                 intf->unhandled_local_responses++;
@@ -2486,7 +2512,7 @@ static int handle_new_recv_msg(ipmi_smi_t          intf,
         {
                 /* It's a response to a response we sent.  For this we
                    deliver a send message response to the user. */
-                struct ipmi_recv_msg *recv_msg = msg->user_data;
+                struct ipmi_recv_msg     *recv_msg = msg->user_data;
 
                 requeue = 0;
                 if (msg->rsp_size < 2)
@@ -2498,13 +2524,18 @@ static int handle_new_recv_msg(ipmi_smi_t          intf,
                         /* Invalid channel number */
                         goto out;
 
-                if (recv_msg) {
-                        recv_msg->recv_type = IPMI_RESPONSE_RESPONSE_TYPE;
-                        recv_msg->msg.data = recv_msg->msg_data;
-                        recv_msg->msg.data_len = 1;
-                        recv_msg->msg_data[0] = msg->rsp[2];
-                        deliver_response(recv_msg);
-                }
+                if (!recv_msg)
+                        goto out;
+
+                /* Make sure the user still exists. */
+                if (!recv_msg->user || !recv_msg->user->valid)
+                        goto out;
+
+                recv_msg->recv_type = IPMI_RESPONSE_RESPONSE_TYPE;
+                recv_msg->msg.data = recv_msg->msg_data;
+                recv_msg->msg.data_len = 1;
+                recv_msg->msg_data[0] = msg->rsp[2];
+                deliver_response(recv_msg);
         } else if ((msg->rsp[0] == ((IPMI_NETFN_APP_REQUEST|1) << 2))
                    && (msg->rsp[1] == IPMI_GET_MSG_CMD))
         {
@@ -2570,14 +2601,11 @@ void ipmi_smi_msg_received(ipmi_smi_t          intf,
         int           rv;
 
 
-        /* Lock the user lock so the user can't go away while we are
-           working on it. */
-        read_lock(&(intf->users_lock));
-
         if ((msg->data_size >= 2)
             && (msg->data[0] == (IPMI_NETFN_APP_REQUEST << 2))
             && (msg->data[1] == IPMI_SEND_MSG_CMD)
-            && (msg->user_data == NULL)) {
+            && (msg->user_data == NULL))
+        {
                 /* This is the local response to a command send, start
                    the timer for these.  The user_data will not be
                    NULL if this is a response send, and we will let
@@ -2612,46 +2640,46 @@ void ipmi_smi_msg_received(ipmi_smi_t          intf,
                 }
 
                 ipmi_free_smi_msg(msg);
-                goto out_unlock;
+                goto out;
         }
 
         /* To preserve message order, if the list is not empty, we
            tack this message onto the end of the list. */
-        spin_lock_irqsave(&(intf->waiting_msgs_lock), flags);
-        if (!list_empty(&(intf->waiting_msgs))) {
-                list_add_tail(&(msg->link), &(intf->waiting_msgs));
-                spin_unlock_irqrestore(&(intf->waiting_msgs_lock), flags);
-                goto out_unlock;
+        spin_lock_irqsave(&intf->waiting_msgs_lock, flags);
+        if (!list_empty(&intf->waiting_msgs)) {
+                list_add_tail(&msg->link, &intf->waiting_msgs);
+                spin_unlock(&intf->waiting_msgs_lock);
+                goto out;
         }
-        spin_unlock_irqrestore(&(intf->waiting_msgs_lock), flags);
+        spin_unlock_irqrestore(&intf->waiting_msgs_lock, flags);
                 
         rv = handle_new_recv_msg(intf, msg);
         if (rv > 0) {
                 /* Could not handle the message now, just add it to a
                    list to handle later. */
-                spin_lock_irqsave(&(intf->waiting_msgs_lock), flags);
-                list_add_tail(&(msg->link), &(intf->waiting_msgs));
-                spin_unlock_irqrestore(&(intf->waiting_msgs_lock), flags);
+                spin_lock(&intf->waiting_msgs_lock);
+                list_add_tail(&msg->link, &intf->waiting_msgs);
+                spin_unlock(&intf->waiting_msgs_lock);
         } else if (rv == 0) {
                 ipmi_free_smi_msg(msg);
         }
 
- out_unlock:
-        read_unlock(&(intf->users_lock));
+ out:
+        return;
 }
 
 void ipmi_smi_watchdog_pretimeout(ipmi_smi_t intf)
 {
         ipmi_user_t user;
 
-        read_lock(&(intf->users_lock));
-        list_for_each_entry(user, &(intf->users), link) {
+        rcu_read_lock();
+        list_for_each_entry_rcu(user, &intf->users, link) {
                 if (! user->handler->ipmi_watchdog_pretimeout)
                         continue;
 
                 user->handler->ipmi_watchdog_pretimeout(user->handler_data);
         }
-        read_unlock(&(intf->users_lock));
+        rcu_read_unlock();
 }
 
 static void
@@ -2691,8 +2719,65 @@ smi_from_recv_msg(ipmi_smi_t intf, struct ipmi_recv_msg *recv_msg,
         return smi_msg;
 }
 
-static void
-ipmi_timeout_handler(long timeout_period)
+static void check_msg_timeout(ipmi_smi_t intf, struct seq_table *ent,
+                              struct list_head *timeouts, long timeout_period,
+                              int slot, unsigned long *flags)
+{
+        struct ipmi_recv_msg *msg;
+
+        if (!ent->inuse)
+                return;
+
+        ent->timeout -= timeout_period;
+        if (ent->timeout > 0)
+                return;
+
+        if (ent->retries_left == 0) {
+                /* The message has used all its retries. */
+                ent->inuse = 0;
+                msg = ent->recv_msg;
+                list_add_tail(&msg->link, timeouts);
+                spin_lock(&intf->counter_lock);
+                if (ent->broadcast)
+                        intf->timed_out_ipmb_broadcasts++;
+                else if (ent->recv_msg->addr.addr_type == IPMI_LAN_ADDR_TYPE)
+                        intf->timed_out_lan_commands++;
+                else
+                        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--;
+                spin_lock(&intf->counter_lock);
+                if (ent->recv_msg->addr.addr_type == IPMI_LAN_ADDR_TYPE)
+                        intf->retransmitted_lan_commands++;
+                else
+                        intf->retransmitted_ipmb_commands++;
+                spin_unlock(&intf->counter_lock);
+
+                smi_msg = smi_from_recv_msg(intf, ent->recv_msg, slot,
+                                            ent->seqid);
+                if (! smi_msg)
+                        return;
+
+                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);
+        }
+}
+
+static void ipmi_timeout_handler(long timeout_period)
 {
         ipmi_smi_t           intf;
         struct list_head     timeouts;
@@ -2706,14 +2791,14 @@ ipmi_timeout_handler(long timeout_period)
         spin_lock(&interfaces_lock);
         for (i = 0; i < MAX_IPMI_INTERFACES; i++) {
                 intf = ipmi_interfaces[i];
-                if (intf == NULL)
+                if (IPMI_INVALID_INTERFACE(intf))
                         continue;
-
-                read_lock(&(intf->users_lock));
+                kref_get(&intf->refcount);
+                spin_unlock(&interfaces_lock);
 
                 /* See if any waiting messages need to be processed. */
-                spin_lock_irqsave(&(intf->waiting_msgs_lock), flags);
-                list_for_each_entry_safe(smi_msg, smi_msg2, &(intf->waiting_msgs), link) {
+                spin_lock_irqsave(&intf->waiting_msgs_lock, flags);
+                list_for_each_entry_safe(smi_msg, smi_msg2, &intf->waiting_msgs, link) {
                         if (! handle_new_recv_msg(intf, smi_msg)) {
                                 list_del(&smi_msg->link);
                                 ipmi_free_smi_msg(smi_msg);
@@ -2723,73 +2808,23 @@ ipmi_timeout_handler(long timeout_period)
                                 break;
                         }
                 }
-                spin_unlock_irqrestore(&(intf->waiting_msgs_lock), flags);
+                spin_unlock_irqrestore(&intf->waiting_msgs_lock, flags);
 
                 /* Go through the seq table and find any messages that
                    have timed out, putting them in the timeouts
                    list. */
-                spin_lock_irqsave(&(intf->seq_lock), flags);
-                for (j = 0; j < IPMI_IPMB_NUM_SEQ; j++) {
-                        struct seq_table *ent = &(intf->seq_table[j]);
-                        if (!ent->inuse)
-                                continue;
-
-                        ent->timeout -= timeout_period;
-                        if (ent->timeout > 0)
-                                continue;
-
-                        if (ent->retries_left == 0) {
-                                /* The message has used all its retries. */
-                                ent->inuse = 0;
-                                msg = ent->recv_msg;
-                                list_add_tail(&(msg->link), &timeouts);
-                                spin_lock(&intf->counter_lock);
-                                if (ent->broadcast)
-                                        intf->timed_out_ipmb_broadcasts++;
-                                else if (ent->recv_msg->addr.addr_type
-                                         == IPMI_LAN_ADDR_TYPE)
-                                        intf->timed_out_lan_commands++;
-                                else
-                                        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--;
-                                spin_lock(&intf->counter_lock);
-                                if (ent->recv_msg->addr.addr_type
-                                    == IPMI_LAN_ADDR_TYPE)
-                                        intf->retransmitted_lan_commands++;
-                                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);
-
-                list_for_each_entry_safe(msg, msg2, &timeouts, link) {
+                spin_lock_irqsave(&intf->seq_lock, flags);
+                for (j = 0; j < IPMI_IPMB_NUM_SEQ; j++)
+                        check_msg_timeout(intf, &(intf->seq_table[j]),
+                                          &timeouts, timeout_period, j,
+                                          &flags);
+                spin_unlock_irqrestore(&intf->seq_lock, flags);
+
+                list_for_each_entry_safe(msg, msg2, &timeouts, link)
                         handle_msg_timeout(msg);
-                }
 
-                read_unlock(&(intf->users_lock));
+                kref_put(&intf->refcount, intf_free);
+                spin_lock(&interfaces_lock);
         }
         spin_unlock(&interfaces_lock);
 }
@@ -2802,7 +2837,7 @@ static void ipmi_request_event(void)
         spin_lock(&interfaces_lock);
         for (i = 0; i < MAX_IPMI_INTERFACES; i++) {
                 intf = ipmi_interfaces[i];
-                if (intf == NULL)
+                if (IPMI_INVALID_INTERFACE(intf))
                         continue;
 
                 intf->handlers->request_events(intf->send_info);
@@ -2884,6 +2919,13 @@ struct ipmi_recv_msg *ipmi_alloc_recv_msg(void)
         return rv;
 }
 
+void ipmi_free_recv_msg(struct ipmi_recv_msg *msg)
+{
+        if (msg->user)
+                kref_put(&msg->user->refcount, free_user);
+        msg->done(msg);
+}
+
 #ifdef CONFIG_IPMI_PANIC_EVENT
 
 static void dummy_smi_done_handler(struct ipmi_smi_msg *msg)
@@ -2964,7 +3006,7 @@ static void send_panic_events(char *str)
         /* For every registered interface, send the event. */
         for (i = 0; i < MAX_IPMI_INTERFACES; i++) {
                 intf = ipmi_interfaces[i];
-                if (intf == NULL)
+                if (IPMI_INVALID_INTERFACE(intf))
                         continue;
 
                 /* Send the event announcing the panic. */
@@ -2995,7 +3037,7 @@ static void send_panic_events(char *str)
                 int                   j;
 
                 intf = ipmi_interfaces[i];
-                if (intf == NULL)
+                if (IPMI_INVALID_INTERFACE(intf))
                         continue;
 
                 /* First job here is to figure out where to send the
@@ -3131,7 +3173,7 @@ static int panic_event(struct notifier_block *this,
         /* For every registered interface, set it to run to completion. */
         for (i = 0; i < MAX_IPMI_INTERFACES; i++) {
                 intf = ipmi_interfaces[i];
-                if (intf == NULL)
+                if (IPMI_INVALID_INTERFACE(intf))
                         continue;
 
                 intf->handlers->set_run_to_completion(intf->send_info, 1);
@@ -3160,9 +3202,8 @@ static int ipmi_init_msghandler(void)
         printk(KERN_INFO "ipmi message handler version "
                IPMI_DRIVER_VERSION "\n");
 
-        for (i = 0; i < MAX_IPMI_INTERFACES; i++) {
+        for (i = 0; i < MAX_IPMI_INTERFACES; i++)
                 ipmi_interfaces[i] = NULL;
-        }
 
 #ifdef CONFIG_PROC_FS
         proc_ipmi_root = proc_mkdir("ipmi", NULL);
@@ -3258,3 +3299,4 @@ EXPORT_SYMBOL(ipmi_get_my_LUN);
 EXPORT_SYMBOL(ipmi_smi_add_proc_entry);
 EXPORT_SYMBOL(proc_ipmi_root);
 EXPORT_SYMBOL(ipmi_user_set_run_to_completion);
+EXPORT_SYMBOL(ipmi_free_recv_msg);
diff --git a/drivers/char/ipmi/ipmi_poweroff.c b/drivers/char/ipmi/ipmi_poweroff.c
index f66947722e12..e053eade0366 100644
--- a/drivers/char/ipmi/ipmi_poweroff.c
+++ b/drivers/char/ipmi/ipmi_poweroff.c
@@ -56,7 +56,7 @@ static int poweroff_powercycle;
 
 /* parameter definition to allow user to flag power cycle */
 module_param(poweroff_powercycle, int, 0644);
-MODULE_PARM_DESC(poweroff_powercycles, " Set to non-zero to enable power cycle instead of power down. Power cycle is contingent on hardware support, otherwise it defaults back to power down.");
+MODULE_PARM_DESC(poweroff_powercycle, " Set to non-zero to enable power cycle instead of power down. Power cycle is contingent on hardware support, otherwise it defaults back to power down.");
 
 /* Stuff from the get device id command. */
 static unsigned int mfg_id;
@@ -611,9 +611,7 @@ static int ipmi_poweroff_init (void)
         }
 #endif
 
-#ifdef CONFIG_PROC_FS
         rv = ipmi_smi_watcher_register(&smi_watcher);
-#endif
         if (rv) {
                 unregister_sysctl_table(ipmi_table_header);
                 printk(KERN_ERR PFX "Unable to register SMI watcher: %d\n", rv);
diff --git a/drivers/char/ipmi/ipmi_si_intf.c b/drivers/char/ipmi/ipmi_si_intf.c
index b6e5cbfb09f8..ea89dca3dbb5 100644
--- a/drivers/char/ipmi/ipmi_si_intf.c
+++ b/drivers/char/ipmi/ipmi_si_intf.c
@@ -51,6 +51,8 @@
 #include <linux/list.h>
 #include <linux/pci.h>
 #include <linux/ioport.h>
+#include <linux/notifier.h>
+#include <linux/kthread.h>
 #include <asm/irq.h>
 #ifdef CONFIG_HIGH_RES_TIMERS
 #include <linux/hrtime.h>
@@ -125,6 +127,7 @@ struct ipmi_device_id {
 
 struct smi_info
 {
+        int                    intf_num;
         ipmi_smi_t             intf;
         struct si_sm_data      *si_sm;
         struct si_sm_handlers  *handlers;
@@ -192,8 +195,7 @@ struct smi_info
         unsigned long       last_timeout_jiffies;
 
         /* Used to gracefully stop the timer without race conditions. */
-        volatile int        stop_operation;
-        volatile int        timer_stopped;
+        atomic_t            stop_operation;
 
         /* The driver will disable interrupts when it gets into a
            situation where it cannot handle messages due to lack of
@@ -220,8 +222,16 @@ struct smi_info
         unsigned long events;
         unsigned long watchdog_pretimeouts;
         unsigned long incoming_messages;
+
+        struct task_struct *thread;
 };
 
+static struct notifier_block *xaction_notifier_list;
+static int register_xaction_notifier(struct notifier_block * nb)
+{
+        return notifier_chain_register(&xaction_notifier_list, nb);
+}
+
 static void si_restart_short_timer(struct smi_info *smi_info);
 
 static void deliver_recv_msg(struct smi_info *smi_info,
@@ -281,6 +291,11 @@ static enum si_sm_result start_next_msg(struct smi_info *smi_info)
                 do_gettimeofday(&t);
                 printk("**Start2: %d.%9.9d\n", t.tv_sec, t.tv_usec);
 #endif
+                err = notifier_call_chain(&xaction_notifier_list, 0, smi_info);
+                if (err & NOTIFY_STOP_MASK) {
+                        rv = SI_SM_CALL_WITHOUT_DELAY;
+                        goto out;
+                }
                 err = smi_info->handlers->start_transaction(
                         smi_info->si_sm,
                         smi_info->curr_msg->data,
@@ -291,6 +306,7 @@ static enum si_sm_result start_next_msg(struct smi_info *smi_info)
 
                 rv = SI_SM_CALL_WITHOUT_DELAY;
         }
+        out:
         spin_unlock(&(smi_info->msg_lock));
 
         return rv;
@@ -766,6 +782,29 @@ static void set_run_to_completion(void *send_info, int i_run_to_completion)
         spin_unlock_irqrestore(&(smi_info->si_lock), flags);
 }
 
+static int ipmi_thread(void *data)
+{
+        struct smi_info *smi_info = data;
+        unsigned long flags;
+        enum si_sm_result smi_result;
+
+        set_user_nice(current, 19);
+        while (!kthread_should_stop()) {
+                spin_lock_irqsave(&(smi_info->si_lock), flags);
+                smi_result=smi_event_handler(smi_info, 0);
+                spin_unlock_irqrestore(&(smi_info->si_lock), flags);
+                if (smi_result == SI_SM_CALL_WITHOUT_DELAY) {
+                        /* do nothing */
+                }
+                else if (smi_result == SI_SM_CALL_WITH_DELAY)
+                        udelay(1);
+                else
+                        schedule_timeout_interruptible(1);
+        }
+        return 0;
+}
+
+
 static void poll(void *send_info)
 {
         struct smi_info *smi_info = send_info;
@@ -819,15 +858,13 @@ static void smi_timeout(unsigned long data)
         enum si_sm_result smi_result;
         unsigned long     flags;
         unsigned long     jiffies_now;
-        unsigned long     time_diff;
+        long              time_diff;
 #ifdef DEBUG_TIMING
         struct timeval    t;
 #endif
 
-        if (smi_info->stop_operation) {
-                smi_info->timer_stopped = 1;
+        if (atomic_read(&smi_info->stop_operation))
                 return;
-        }
 
         spin_lock_irqsave(&(smi_info->si_lock), flags);
 #ifdef DEBUG_TIMING
@@ -835,7 +872,7 @@ static void smi_timeout(unsigned long data)
         printk("**Timer: %d.%9.9d\n", t.tv_sec, t.tv_usec);
 #endif
         jiffies_now = jiffies;
-        time_diff = ((jiffies_now - smi_info->last_timeout_jiffies)
+        time_diff = (((long)jiffies_now - (long)smi_info->last_timeout_jiffies)
                      * SI_USEC_PER_JIFFY);
         smi_result = smi_event_handler(smi_info, time_diff);
 
@@ -900,7 +937,7 @@ static irqreturn_t si_irq_handler(int irq, void *data, struct pt_regs *regs)
         smi_info->interrupts++;
         spin_unlock(&smi_info->count_lock);
 
-        if (smi_info->stop_operation)
+        if (atomic_read(&smi_info->stop_operation))
                 goto out;
 
 #ifdef DEBUG_TIMING
@@ -1419,7 +1456,7 @@ static u32 ipmi_acpi_gpe(void *context)
         smi_info->interrupts++;
         spin_unlock(&smi_info->count_lock);
 
-        if (smi_info->stop_operation)
+        if (atomic_read(&smi_info->stop_operation))
                 goto out;
 
 #ifdef DEBUG_TIMING
@@ -1919,7 +1956,8 @@ static int try_get_dev_id(struct smi_info *smi_info)
         smi_result = smi_info->handlers->event(smi_info->si_sm, 0);
         for (;;)
         {
-                if (smi_result == SI_SM_CALL_WITH_DELAY) {
+                if (smi_result == SI_SM_CALL_WITH_DELAY ||
+                    smi_result == SI_SM_CALL_WITH_TICK_DELAY) {
                         schedule_timeout_uninterruptible(1);
                         smi_result = smi_info->handlers->event(
                                 smi_info->si_sm, 100);
@@ -2052,6 +2090,9 @@ static int oem_data_avail_to_receive_msg_avail(struct smi_info *smi_info)
  * IPMI Version = 0x51             IPMI 1.5
  * Manufacturer ID = A2 02 00      Dell IANA
  *
+ * Additionally, PowerEdge systems with IPMI < 1.5 may also assert
+ * OEM0_DATA_AVAIL and needs to be treated as RECEIVE_MSG_AVAIL.
+ *
  */
 #define DELL_POWEREDGE_8G_BMC_DEVICE_ID  0x20
 #define DELL_POWEREDGE_8G_BMC_DEVICE_REV 0x80
@@ -2061,16 +2102,87 @@ static void setup_dell_poweredge_oem_data_handler(struct smi_info *smi_info)
 {
         struct ipmi_device_id *id = &smi_info->device_id;
         const char mfr[3]=DELL_IANA_MFR_ID;
-        if (! memcmp(mfr, id->manufacturer_id, sizeof(mfr))
-            && (id->device_id       == DELL_POWEREDGE_8G_BMC_DEVICE_ID)
-            && (id->device_revision == DELL_POWEREDGE_8G_BMC_DEVICE_REV)
-            && (id->ipmi_version    == DELL_POWEREDGE_8G_BMC_IPMI_VERSION))
-        {
-                smi_info->oem_data_avail_handler =
-                        oem_data_avail_to_receive_msg_avail;
+        if (! memcmp(mfr, id->manufacturer_id, sizeof(mfr))) {
+                if (id->device_id       == DELL_POWEREDGE_8G_BMC_DEVICE_ID  &&
+                    id->device_revision == DELL_POWEREDGE_8G_BMC_DEVICE_REV &&
+                    id->ipmi_version    == DELL_POWEREDGE_8G_BMC_IPMI_VERSION) {
+                        smi_info->oem_data_avail_handler =
+                                oem_data_avail_to_receive_msg_avail;
+                }
+                else if (ipmi_version_major(id) < 1 ||
+                         (ipmi_version_major(id) == 1 &&
+                          ipmi_version_minor(id) < 5)) {
+                        smi_info->oem_data_avail_handler =
+                                oem_data_avail_to_receive_msg_avail;
+                }
         }
 }
 
+#define CANNOT_RETURN_REQUESTED_LENGTH 0xCA
+static void return_hosed_msg_badsize(struct smi_info *smi_info)
+{
+        struct ipmi_smi_msg *msg = smi_info->curr_msg;
+
+        /* Make it a reponse */
+        msg->rsp[0] = msg->data[0] | 4;
+        msg->rsp[1] = msg->data[1];
+        msg->rsp[2] = CANNOT_RETURN_REQUESTED_LENGTH;
+        msg->rsp_size = 3;
+        smi_info->curr_msg = NULL;
+        deliver_recv_msg(smi_info, msg);
+}
+
+/*
+ * dell_poweredge_bt_xaction_handler
+ * @info - smi_info.device_id must be populated
+ *
+ * Dell PowerEdge servers with the BT interface (x6xx and 1750) will
+ * not respond to a Get SDR command if the length of the data
+ * requested is exactly 0x3A, which leads to command timeouts and no
+ * data returned.  This intercepts such commands, and causes userspace
+ * callers to try again with a different-sized buffer, which succeeds.
+ */
+
+#define STORAGE_NETFN 0x0A
+#define STORAGE_CMD_GET_SDR 0x23
+static int dell_poweredge_bt_xaction_handler(struct notifier_block *self,
+                                             unsigned long unused,
+                                             void *in)
+{
+        struct smi_info *smi_info = in;
+        unsigned char *data = smi_info->curr_msg->data;
+        unsigned int size   = smi_info->curr_msg->data_size;
+        if (size >= 8 &&
+            (data[0]>>2) == STORAGE_NETFN &&
+            data[1] == STORAGE_CMD_GET_SDR &&
+            data[7] == 0x3A) {
+                return_hosed_msg_badsize(smi_info);
+                return NOTIFY_STOP;
+        }
+        return NOTIFY_DONE;
+}
+
+static struct notifier_block dell_poweredge_bt_xaction_notifier = {
+        .notifier_call  = dell_poweredge_bt_xaction_handler,
+};
+
+/*
+ * setup_dell_poweredge_bt_xaction_handler
+ * @info - smi_info.device_id must be filled in already
+ *
+ * Fills in smi_info.device_id.start_transaction_pre_hook
+ * when we know what function to use there.
+ */
+static void
+setup_dell_poweredge_bt_xaction_handler(struct smi_info *smi_info)
+{
+        struct ipmi_device_id *id = &smi_info->device_id;
+        const char mfr[3]=DELL_IANA_MFR_ID;
+        if (! memcmp(mfr, id->manufacturer_id, sizeof(mfr)) &&
+            smi_info->si_type == SI_BT)
+                register_xaction_notifier(&dell_poweredge_bt_xaction_notifier);
+}
+
 /*
  * setup_oem_data_handler
  * @info - smi_info.device_id must be filled in already
@@ -2084,6 +2196,18 @@ static void setup_oem_data_handler(struct smi_info *smi_info)
         setup_dell_poweredge_oem_data_handler(smi_info);
 }
 
+static void setup_xaction_handlers(struct smi_info *smi_info)
+{
+        setup_dell_poweredge_bt_xaction_handler(smi_info);
+}
+
+static inline void wait_for_timer_and_thread(struct smi_info *smi_info)
+{
+        if (smi_info->thread != ERR_PTR(-ENOMEM))
+                kthread_stop(smi_info->thread);
+        del_timer_sync(&smi_info->si_timer);
+}
+
 /* Returns 0 if initialized, or negative on an error. */
 static int init_one_smi(int intf_num, struct smi_info **smi)
 {
@@ -2179,6 +2303,7 @@ static int init_one_smi(int intf_num, struct smi_info **smi)
                 goto out_err;
 
         setup_oem_data_handler(new_smi);
+        setup_xaction_handlers(new_smi);
 
         /* Try to claim any interrupts. */
         new_smi->irq_setup(new_smi);
@@ -2190,8 +2315,8 @@ static int init_one_smi(int intf_num, struct smi_info **smi)
         new_smi->run_to_completion = 0;
 
         new_smi->interrupt_disabled = 0;
-        new_smi->timer_stopped = 0;
-        new_smi->stop_operation = 0;
+        atomic_set(&new_smi->stop_operation, 0);
+        new_smi->intf_num = intf_num;
 
         /* Start clearing the flags before we enable interrupts or the
            timer to avoid racing with the timer. */
@@ -2209,7 +2334,11 @@ static int init_one_smi(int intf_num, struct smi_info **smi)
         new_smi->si_timer.function = smi_timeout;
         new_smi->last_timeout_jiffies = jiffies;
         new_smi->si_timer.expires = jiffies + SI_TIMEOUT_JIFFIES;
+
         add_timer(&(new_smi->si_timer));
+        if (new_smi->si_type != SI_BT)
+                new_smi->thread = kthread_run(ipmi_thread, new_smi,
+                                              "kipmi%d", new_smi->intf_num);
 
         rv = ipmi_register_smi(&handlers,
                                new_smi,
@@ -2251,12 +2380,8 @@ static int init_one_smi(int intf_num, struct smi_info **smi)
         return 0;
 
  out_err_stop_timer:
-        new_smi->stop_operation = 1;
-
-        /* Wait for the timer to stop.  This avoids problems with race
-           conditions removing the timer here. */
-        while (!new_smi->timer_stopped)
-                schedule_timeout_uninterruptible(1);
+        atomic_inc(&new_smi->stop_operation);
+        wait_for_timer_and_thread(new_smi);
 
  out_err:
         if (new_smi->intf)
@@ -2362,8 +2487,7 @@ static void __exit cleanup_one_si(struct smi_info *to_clean)
         spin_lock_irqsave(&(to_clean->si_lock), flags);
         spin_lock(&(to_clean->msg_lock));
 
-        to_clean->stop_operation = 1;
-
+        atomic_inc(&to_clean->stop_operation);
         to_clean->irq_cleanup(to_clean);
 
         spin_unlock(&(to_clean->msg_lock));
@@ -2374,10 +2498,7 @@ static void __exit cleanup_one_si(struct smi_info *to_clean)
            interrupt. */
         synchronize_sched();
 
-        /* Wait for the timer to stop.  This avoids problems with race
-           conditions removing the timer here. */
-        while (!to_clean->timer_stopped)
-                schedule_timeout_uninterruptible(1);
+        wait_for_timer_and_thread(to_clean);
 
         /* Interrupts and timeouts are stopped, now make sure the
            interface is in a clean state. */
diff --git a/drivers/char/ipmi/ipmi_si_sm.h b/drivers/char/ipmi/ipmi_si_sm.h
index 62791dd42985..bf3d4962d6a5 100644
--- a/drivers/char/ipmi/ipmi_si_sm.h
+++ b/drivers/char/ipmi/ipmi_si_sm.h
@@ -62,6 +62,7 @@ enum si_sm_result
 {
         SI_SM_CALL_WITHOUT_DELAY, /* Call the driver again immediately */
         SI_SM_CALL_WITH_DELAY,  /* Delay some before calling again. */
+        SI_SM_CALL_WITH_TICK_DELAY,     /* Delay at least 1 tick before calling again. */
         SI_SM_TRANSACTION_COMPLETE, /* A transaction is finished. */
         SI_SM_IDLE,             /* The SM is in idle state. */
         SI_SM_HOSED,            /* The hardware violated the state machine. */
diff --git a/drivers/char/ipmi/ipmi_smic_sm.c b/drivers/char/ipmi/ipmi_smic_sm.c
index add2aa2732f0..39d7e5ef1a2b 100644
--- a/drivers/char/ipmi/ipmi_smic_sm.c
+++ b/drivers/char/ipmi/ipmi_smic_sm.c
@@ -43,6 +43,8 @@
 
 #include <linux/kernel.h> /* For printk. */
 #include <linux/string.h>
+#include <linux/module.h>
+#include <linux/moduleparam.h>
 #include <linux/ipmi_msgdefs.h>         /* for completion codes */
 #include "ipmi_si_sm.h"
 
@@ -56,6 +58,8 @@
 #define SMIC_DEBUG_ENABLE       1
 
 static int smic_debug = 1;
+module_param(smic_debug, int, 0644);
+MODULE_PARM_DESC(smic_debug, "debug bitmask, 1=enable, 2=messages, 4=states");
 
 enum smic_states {
         SMIC_IDLE,
@@ -76,11 +80,17 @@ enum smic_states {
 #define SMIC_MAX_ERROR_RETRIES 3
 
 /* Timeouts in microseconds. */
-#define SMIC_RETRY_TIMEOUT 100000
+#define SMIC_RETRY_TIMEOUT 2000000
 
 /* SMIC Flags Register Bits */
 #define SMIC_RX_DATA_READY      0x80
 #define SMIC_TX_DATA_READY      0x40
+/*
+ * SMIC_SMI and SMIC_EVM_DATA_AVAIL are only used by
+ * a few systems, and then only by Systems Management
+ * Interrupts, not by the OS.  Always ignore these bits.
+ *
+ */
 #define SMIC_SMI                0x10
 #define SMIC_EVM_DATA_AVAIL     0x08
 #define SMIC_SMS_DATA_AVAIL     0x04
@@ -364,8 +374,7 @@ static enum si_sm_result smic_event (struct si_sm_data *smic, long time)
         switch (smic->state) {
         case SMIC_IDLE:
                 /* in IDLE we check for available messages */
-                if (flags & (SMIC_SMI |
-                             SMIC_EVM_DATA_AVAIL | SMIC_SMS_DATA_AVAIL))
+                if (flags & SMIC_SMS_DATA_AVAIL)
                 {
                         return SI_SM_ATTN;
                 }
diff --git a/drivers/char/ipmi/ipmi_watchdog.c b/drivers/char/ipmi/ipmi_watchdog.c
index 2da64bf7469c..1f3159eb1ede 100644
--- a/drivers/char/ipmi/ipmi_watchdog.c
+++ b/drivers/char/ipmi/ipmi_watchdog.c
@@ -47,6 +47,9 @@
 #include <linux/reboot.h>
 #include <linux/wait.h>
 #include <linux/poll.h>
+#include <linux/string.h>
+#include <linux/ctype.h>
+#include <asm/atomic.h>
 #ifdef CONFIG_X86_LOCAL_APIC
 #include <asm/apic.h>
 #endif
@@ -158,27 +161,120 @@ static struct fasync_struct *fasync_q = NULL;
 static char pretimeout_since_last_heartbeat = 0;
 static char expect_close;
 
+static DECLARE_RWSEM(register_sem);
+
+/* Parameters to ipmi_set_timeout */
+#define IPMI_SET_TIMEOUT_NO_HB                  0
+#define IPMI_SET_TIMEOUT_HB_IF_NECESSARY        1
+#define IPMI_SET_TIMEOUT_FORCE_HB               2
+
+static int ipmi_set_timeout(int do_heartbeat);
+
 /* If true, the driver will start running as soon as it is configured
    and ready. */
 static int start_now = 0;
 
-module_param(timeout, int, 0);
+static int set_param_int(const char *val, struct kernel_param *kp)
+{
+        char *endp;
+        int  l;
+        int  rv = 0;
+
+        if (!val)
+                return -EINVAL;
+        l = simple_strtoul(val, &endp, 0);
+        if (endp == val)
+                return -EINVAL;
+
+        down_read(&register_sem);
+        *((int *)kp->arg) = l;
+        if (watchdog_user)
+                rv = ipmi_set_timeout(IPMI_SET_TIMEOUT_HB_IF_NECESSARY);
+        up_read(&register_sem);
+
+        return rv;
+}
+
+static int get_param_int(char *buffer, struct kernel_param *kp)
+{
+        return sprintf(buffer, "%i", *((int *)kp->arg));
+}
+
+typedef int (*action_fn)(const char *intval, char *outval);
+
+static int action_op(const char *inval, char *outval);
+static int preaction_op(const char *inval, char *outval);
+static int preop_op(const char *inval, char *outval);
+static void check_parms(void);
+
+static int set_param_str(const char *val, struct kernel_param *kp)
+{
+        action_fn  fn = (action_fn) kp->arg;
+        int        rv = 0;
+        const char *end;
+        char       valcp[16];
+        int        len;
+
+        /* Truncate leading and trailing spaces. */
+        while (isspace(*val))
+                val++;
+        end = val + strlen(val) - 1;
+        while ((end >= val) && isspace(*end))
+                end--;
+        len = end - val + 1;
+        if (len > sizeof(valcp) - 1)
+                return -EINVAL;
+        memcpy(valcp, val, len);
+        valcp[len] = '\0';
+
+        down_read(&register_sem);
+        rv = fn(valcp, NULL);
+        if (rv)
+                goto out_unlock;
+
+        check_parms();
+        if (watchdog_user)
+                rv = ipmi_set_timeout(IPMI_SET_TIMEOUT_HB_IF_NECESSARY);
+
+ out_unlock:
+        up_read(&register_sem);
+        return rv;
+}
+
+static int get_param_str(char *buffer, struct kernel_param *kp)
+{
+        action_fn fn = (action_fn) kp->arg;
+        int       rv;
+
+        rv = fn(NULL, buffer);
+        if (rv)
+                return rv;
+        return strlen(buffer);
+}
+
+module_param_call(timeout, set_param_int, get_param_int, &timeout, 0644);
 MODULE_PARM_DESC(timeout, "Timeout value in seconds.");
-module_param(pretimeout, int, 0);
+
+module_param_call(pretimeout, set_param_int, get_param_int, &pretimeout, 0644);
 MODULE_PARM_DESC(pretimeout, "Pretimeout value in seconds.");
-module_param_string(action, action, sizeof(action), 0);
+
+module_param_call(action, set_param_str, get_param_str, action_op, 0644);
 MODULE_PARM_DESC(action, "Timeout action. One of: "
                  "reset, none, power_cycle, power_off.");
-module_param_string(preaction, preaction, sizeof(preaction), 0);
+
+module_param_call(preaction, set_param_str, get_param_str, preaction_op, 0644);
 MODULE_PARM_DESC(preaction, "Pretimeout action.  One of: "
                  "pre_none, pre_smi, pre_nmi, pre_int.");
-module_param_string(preop, preop, sizeof(preop), 0);
+
+module_param_call(preop, set_param_str, get_param_str, preop_op, 0644);
 MODULE_PARM_DESC(preop, "Pretimeout driver operation.  One of: "
                  "preop_none, preop_panic, preop_give_data.");
+
 module_param(start_now, int, 0);
 MODULE_PARM_DESC(start_now, "Set to 1 to start the watchdog as"
                  "soon as the driver is loaded.");
-module_param(nowayout, int, 0);
+
+module_param(nowayout, int, 0644);
 MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started (default=CONFIG_WATCHDOG_NOWAYOUT)");
 
 /* Default state of the timer. */
@@ -200,6 +296,8 @@ static int ipmi_start_timer_on_heartbeat = 0;
 static unsigned char ipmi_version_major;
 static unsigned char ipmi_version_minor;
 
+/* If a pretimeout occurs, this is used to allow only one panic to happen. */
+static atomic_t preop_panic_excl = ATOMIC_INIT(-1);
 
 static int ipmi_heartbeat(void);
 static void panic_halt_ipmi_heartbeat(void);
@@ -294,11 +392,6 @@ static int i_ipmi_set_timeout(struct ipmi_smi_msg  *smi_msg,
         return rv;
 }
 
-/* Parameters to ipmi_set_timeout */
-#define IPMI_SET_TIMEOUT_NO_HB                  0
-#define IPMI_SET_TIMEOUT_HB_IF_NECESSARY        1
-#define IPMI_SET_TIMEOUT_FORCE_HB               2
-
 static int ipmi_set_timeout(int do_heartbeat)
 {
         int send_heartbeat_now;
@@ -732,8 +825,6 @@ static struct miscdevice ipmi_wdog_miscdev = {
         .fops           = &ipmi_wdog_fops
 };
 
-static DECLARE_RWSEM(register_sem);
-
 static void ipmi_wdog_msg_handler(struct ipmi_recv_msg *msg,
                                   void                 *handler_data)
 {
@@ -749,9 +840,10 @@ static void ipmi_wdog_msg_handler(struct ipmi_recv_msg *msg,
 static void ipmi_wdog_pretimeout_handler(void *handler_data)
 {
         if (preaction_val != WDOG_PRETIMEOUT_NONE) {
-                if (preop_val == WDOG_PREOP_PANIC)
-                        panic("Watchdog pre-timeout");
-                else if (preop_val == WDOG_PREOP_GIVE_DATA) {
+                if (preop_val == WDOG_PREOP_PANIC) {
+                        if (atomic_inc_and_test(&preop_panic_excl))
+                                panic("Watchdog pre-timeout");
+                } else if (preop_val == WDOG_PREOP_GIVE_DATA) {
                         spin_lock(&ipmi_read_lock);
                         data_to_read = 1;
                         wake_up_interruptible(&read_q);
@@ -825,7 +917,8 @@ ipmi_nmi(void *dev_id, struct pt_regs *regs, int cpu, int handled)
                    an error and not work unless we re-enable
                    the timer.   So do so. */
                 pretimeout_since_last_heartbeat = 1;
-                panic(PFX "pre-timeout");
+                if (atomic_inc_and_test(&preop_panic_excl))
+                        panic(PFX "pre-timeout");
         }
 
         return NOTIFY_DONE;
@@ -839,6 +932,7 @@ static struct nmi_handler ipmi_nmi_handler =
         .handler  = ipmi_nmi,
         .priority = 0, /* Call us last. */
 };
+int nmi_handler_registered;
 #endif
 
 static int wdog_reboot_handler(struct notifier_block *this,
@@ -921,59 +1015,86 @@ static struct ipmi_smi_watcher smi_watcher =
         .smi_gone = ipmi_smi_gone
 };
 
-static int __init ipmi_wdog_init(void)
+static int action_op(const char *inval, char *outval)
 {
-        int rv;
+        if (outval)
+                strcpy(outval, action);
+
+        if (!inval)
+                return 0;
 
-        if (strcmp(action, "reset") == 0) {
+        if (strcmp(inval, "reset") == 0)
                 action_val = WDOG_TIMEOUT_RESET;
-        } else if (strcmp(action, "none") == 0) {
+        else if (strcmp(inval, "none") == 0)
                 action_val = WDOG_TIMEOUT_NONE;
-        } else if (strcmp(action, "power_cycle") == 0) {
+        else if (strcmp(inval, "power_cycle") == 0)
                 action_val = WDOG_TIMEOUT_POWER_CYCLE;
-        } else if (strcmp(action, "power_off") == 0) {
+        else if (strcmp(inval, "power_off") == 0)
                 action_val = WDOG_TIMEOUT_POWER_DOWN;
-        } else {
-                action_val = WDOG_TIMEOUT_RESET;
-                printk(KERN_INFO PFX "Unknown action '%s', defaulting to"
-                       " reset\n", action);
-        }
+        else
+                return -EINVAL;
+        strcpy(action, inval);
+        return 0;
+}
+
+static int preaction_op(const char *inval, char *outval)
+{
+        if (outval)
+                strcpy(outval, preaction);
 
-        if (strcmp(preaction, "pre_none") == 0) {
+        if (!inval)
+                return 0;
+
+        if (strcmp(inval, "pre_none") == 0)
                 preaction_val = WDOG_PRETIMEOUT_NONE;
-        } else if (strcmp(preaction, "pre_smi") == 0) {
+        else if (strcmp(inval, "pre_smi") == 0)
                 preaction_val = WDOG_PRETIMEOUT_SMI;
 #ifdef HAVE_NMI_HANDLER
-        } else if (strcmp(preaction, "pre_nmi") == 0) {
+        else if (strcmp(inval, "pre_nmi") == 0)
                 preaction_val = WDOG_PRETIMEOUT_NMI;
 #endif
-        } else if (strcmp(preaction, "pre_int") == 0) {
+        else if (strcmp(inval, "pre_int") == 0)
                 preaction_val = WDOG_PRETIMEOUT_MSG_INT;
-        } else {
-                preaction_val = WDOG_PRETIMEOUT_NONE;
-                printk(KERN_INFO PFX "Unknown preaction '%s', defaulting to"
-                       " none\n", preaction);
-        }
+        else
+                return -EINVAL;
+        strcpy(preaction, inval);
+        return 0;
+}
+
+static int preop_op(const char *inval, char *outval)
+{
+        if (outval)
+                strcpy(outval, preop);
 
-        if (strcmp(preop, "preop_none") == 0) {
+        if (!inval)
+                return 0;
+
+        if (strcmp(inval, "preop_none") == 0)
                 preop_val = WDOG_PREOP_NONE;
-        } else if (strcmp(preop, "preop_panic") == 0) {
+        else if (strcmp(inval, "preop_panic") == 0)
                 preop_val = WDOG_PREOP_PANIC;
-        } else if (strcmp(preop, "preop_give_data") == 0) {
+        else if (strcmp(inval, "preop_give_data") == 0)
                 preop_val = WDOG_PREOP_GIVE_DATA;
-        } else {
-                preop_val = WDOG_PREOP_NONE;
-                printk(KERN_INFO PFX "Unknown preop '%s', defaulting to"
-                       " none\n", preop);
-        }
+        else
+                return -EINVAL;
+        strcpy(preop, inval);
+        return 0;
+}
 
+static void check_parms(void)
+{
 #ifdef HAVE_NMI_HANDLER
+        int do_nmi = 0;
+        int rv;
+
         if (preaction_val == WDOG_PRETIMEOUT_NMI) {
+                do_nmi = 1;
                 if (preop_val == WDOG_PREOP_GIVE_DATA) {
                         printk(KERN_WARNING PFX "Pretimeout op is to give data"
                                " but NMI pretimeout is enabled, setting"
                                " pretimeout op to none\n");
-                        preop_val = WDOG_PREOP_NONE;
+                        preop_op("preop_none", NULL);
+                        do_nmi = 0;
                 }
 #ifdef CONFIG_X86_LOCAL_APIC
                 if (nmi_watchdog == NMI_IO_APIC) {
@@ -983,18 +1104,48 @@ static int __init ipmi_wdog_init(void)
                                " Disabling IPMI nmi pretimeout.\n",
                                nmi_watchdog);
                         preaction_val = WDOG_PRETIMEOUT_NONE;
-                } else {
+                        do_nmi = 0;
+                }
 #endif
+        }
+        if (do_nmi && !nmi_handler_registered) {
                 rv = request_nmi(&ipmi_nmi_handler);
                 if (rv) {
-                        printk(KERN_WARNING PFX "Can't register nmi handler\n");
-                        return rv;
-                }
-#ifdef CONFIG_X86_LOCAL_APIC
-                }
-#endif
+                        printk(KERN_WARNING PFX
+                               "Can't register nmi handler\n");
+                        return;
+                } else
+                        nmi_handler_registered = 1;
+        } else if (!do_nmi && nmi_handler_registered) {
+                release_nmi(&ipmi_nmi_handler);
+                nmi_handler_registered = 0;
         }
 #endif
+}
+
+static int __init ipmi_wdog_init(void)
+{
+        int rv;
+
+        if (action_op(action, NULL)) {
+                action_op("reset", NULL);
+                printk(KERN_INFO PFX "Unknown action '%s', defaulting to"
+                       " reset\n", action);
+        }
+
+        if (preaction_op(preaction, NULL)) {
+                preaction_op("pre_none", NULL);
+                printk(KERN_INFO PFX "Unknown preaction '%s', defaulting to"
+                       " none\n", preaction);
+        }
+
+        if (preop_op(preop, NULL)) {
+                preop_op("preop_none", NULL);
+                printk(KERN_INFO PFX "Unknown preop '%s', defaulting to"
+                       " none\n", preop);
+        }
+
+        check_parms();
 
         rv = ipmi_smi_watcher_register(&smi_watcher);
         if (rv) {
@@ -1021,7 +1172,7 @@ static __exit void ipmi_unregister_watchdog(void)
         down_write(&register_sem);
 
 #ifdef HAVE_NMI_HANDLER
-        if (preaction_val == WDOG_PRETIMEOUT_NMI)
+        if (nmi_handler_registered)
                 release_nmi(&ipmi_nmi_handler);
 #endif
 
diff --git a/drivers/char/istallion.c b/drivers/char/istallion.c
index e3ddbdb85a2f..ce3bc0d45f1f 100644
--- a/drivers/char/istallion.c
+++ b/drivers/char/istallion.c
@@ -860,10 +860,9 @@ static void __exit istallion_module_exit(void)
         if ((i = unregister_chrdev(STL_SIOMEMMAJOR, "staliomem")))
                 printk("STALLION: failed to un-register serial memory device, "
                         "errno=%d\n", -i);
-        if (stli_tmpwritebuf != (char *) NULL)
-                kfree(stli_tmpwritebuf);
-        if (stli_txcookbuf != (char *) NULL)
-                kfree(stli_txcookbuf);
+
+        kfree(stli_tmpwritebuf);
+        kfree(stli_txcookbuf);
 
         for (i = 0; (i < stli_nrbrds); i++) {
                 if ((brdp = stli_brds[i]) == (stlibrd_t *) NULL)
diff --git a/drivers/char/mxser.c b/drivers/char/mxser.c
index 45d012d85e8c..3b965a651da4 100644
--- a/drivers/char/mxser.c
+++ b/drivers/char/mxser.c
@@ -470,6 +470,8 @@ static struct tty_operations mxser_ops = {
         .stop = mxser_stop,
         .start = mxser_start,
         .hangup = mxser_hangup,
+        .break_ctl = mxser_rs_break,
+        .wait_until_sent = mxser_wait_until_sent,
         .tiocmget = mxser_tiocmget,
         .tiocmset = mxser_tiocmset,
 };
@@ -492,14 +494,18 @@ static int __init mxser_module_init(void)
 
 static void __exit mxser_module_exit(void)
 {
-        int i, err = 0;
+        int i, err;
 
         if (verbose)
                 printk(KERN_DEBUG "Unloading module mxser ...\n");
 
-        if ((err |= tty_unregister_driver(mxvar_sdriver)))
+        err = tty_unregister_driver(mxvar_sdriver);
+        if (!err)
+                put_tty_driver(mxvar_sdriver);
+        else
                 printk(KERN_ERR "Couldn't unregister MOXA Smartio/Industio family serial driver\n");
 
+
         for (i = 0; i < MXSER_BOARDS; i++) {
                 struct pci_dev *pdev;
 
@@ -688,7 +694,6 @@ static int mxser_get_PCI_conf(int busnum, int devnum, int board_type, struct mxs
 static int mxser_init(void)
 {
         int i, m, retval, b, n;
-        int ret1;
         struct pci_dev *pdev = NULL;
         int index;
         unsigned char busnum, devnum;
@@ -722,24 +727,6 @@ static int mxser_init(void)
         mxvar_sdriver->termios = mxvar_termios;
         mxvar_sdriver->termios_locked = mxvar_termios_locked;
 
-        mxvar_sdriver->open = mxser_open;
-        mxvar_sdriver->close = mxser_close;
-        mxvar_sdriver->write = mxser_write;
-        mxvar_sdriver->put_char = mxser_put_char;
-        mxvar_sdriver->flush_chars = mxser_flush_chars;
-        mxvar_sdriver->write_room = mxser_write_room;
-        mxvar_sdriver->chars_in_buffer = mxser_chars_in_buffer;
-        mxvar_sdriver->flush_buffer = mxser_flush_buffer;
-        mxvar_sdriver->ioctl = mxser_ioctl;
-        mxvar_sdriver->throttle = mxser_throttle;
-        mxvar_sdriver->unthrottle = mxser_unthrottle;
-        mxvar_sdriver->set_termios = mxser_set_termios;
-        mxvar_sdriver->stop = mxser_stop;
-        mxvar_sdriver->start = mxser_start;
-        mxvar_sdriver->hangup = mxser_hangup;
-        mxvar_sdriver->break_ctl = mxser_rs_break;
-        mxvar_sdriver->wait_until_sent = mxser_wait_until_sent;
-
         mxvar_diagflag = 0;
         memset(mxvar_table, 0, MXSER_PORTS * sizeof(struct mxser_struct));
         memset(&mxvar_log, 0, sizeof(struct mxser_log));
@@ -870,14 +857,11 @@ static int mxser_init(void)
         }
 #endif
 
-        ret1 = 0;
-        if (!(ret1 = tty_register_driver(mxvar_sdriver))) {
-                return 0;
-        } else
+        retval = tty_register_driver(mxvar_sdriver);
+        if (retval) {
                 printk(KERN_ERR "Couldn't install MOXA Smartio/Industio family driver !\n");
+                put_tty_driver(mxvar_sdriver);
 
-
-        if (ret1) {
                 for (i = 0; i < MXSER_BOARDS; i++) {
                         if (mxsercfg[i].board_type == -1)
                                 continue;
@@ -886,10 +870,10 @@ static int mxser_init(void)
                                 //todo: release io, vector
                         }
                 }
-                return -1;
+                return retval;
         }
 
-        return (0);
+        return 0;
 }
 
 static void mxser_do_softint(void *private_)
@@ -933,6 +917,9 @@ static int mxser_open(struct tty_struct *tty, struct file *filp)
         struct mxser_struct *info;
         int retval, line;
 
+        /* initialize driver_data in case something fails */
+        tty->driver_data = NULL;
+
         line = tty->index;
         if (line == MXSER_PORTS)
                 return 0;
@@ -995,7 +982,7 @@ static void mxser_close(struct tty_struct *tty, struct file *filp)
         if (tty->index == MXSER_PORTS)
                 return;
         if (!info)
-                BUG();
+                return;
 
         spin_lock_irqsave(&info->slock, flags);
 
diff --git a/drivers/char/n_hdlc.c b/drivers/char/n_hdlc.c
index 5079beda69b5..c3660d8781a4 100644
--- a/drivers/char/n_hdlc.c
+++ b/drivers/char/n_hdlc.c
@@ -264,8 +264,7 @@ static void n_hdlc_release(struct n_hdlc *n_hdlc)
                 } else
                         break;
         }
-        if (n_hdlc->tbuf)
-                kfree(n_hdlc->tbuf);
+        kfree(n_hdlc->tbuf);
         kfree(n_hdlc);
         
 }       /* end of n_hdlc_release() */
diff --git a/drivers/char/pcmcia/synclink_cs.c b/drivers/char/pcmcia/synclink_cs.c
index 02d7f046c10a..2c326ea53421 100644
--- a/drivers/char/pcmcia/synclink_cs.c
+++ b/drivers/char/pcmcia/synclink_cs.c
@@ -2994,8 +2994,7 @@ int rx_alloc_buffers(MGSLPC_INFO *info)
 
 void rx_free_buffers(MGSLPC_INFO *info)
 {
-        if (info->rx_buf)
-                kfree(info->rx_buf);
+        kfree(info->rx_buf);
         info->rx_buf = NULL;
 }
 
diff --git a/drivers/char/rocket.c b/drivers/char/rocket.c
index 928b850cc679..d3bc731fbb27 100644
--- a/drivers/char/rocket.c
+++ b/drivers/char/rocket.c
@@ -2512,10 +2512,8 @@ static void rp_cleanup_module(void)
                        "rocketport driver\n", -retval);
         put_tty_driver(rocket_driver);
 
-        for (i = 0; i < MAX_RP_PORTS; i++) {
-                if (rp_table[i])
-                        kfree(rp_table[i]);
-        }
+        for (i = 0; i < MAX_RP_PORTS; i++)
+                kfree(rp_table[i]);
 
         for (i = 0; i < NUM_BOARDS; i++) {
                 if (rcktpt_io_addr[i] <= 0 || is_PCI[i])
diff --git a/drivers/char/rtc.c b/drivers/char/rtc.c
index 63fff7c1244a..a7f099fb7dfe 100644
--- a/drivers/char/rtc.c
+++ b/drivers/char/rtc.c
@@ -149,8 +149,22 @@ static void get_rtc_alm_time (struct rtc_time *alm_tm);
 #ifdef RTC_IRQ
 static void rtc_dropped_irq(unsigned long data);
 
-static void set_rtc_irq_bit(unsigned char bit);
-static void mask_rtc_irq_bit(unsigned char bit);
+static void set_rtc_irq_bit_locked(unsigned char bit);
+static void mask_rtc_irq_bit_locked(unsigned char bit);
+
+static inline void set_rtc_irq_bit(unsigned char bit)
+{
+        spin_lock_irq(&rtc_lock);
+        set_rtc_irq_bit_locked(bit);
+        spin_unlock_irq(&rtc_lock);
+}
+
+static void mask_rtc_irq_bit(unsigned char bit)
+{
+        spin_lock_irq(&rtc_lock);
+        mask_rtc_irq_bit_locked(bit);
+        spin_unlock_irq(&rtc_lock);
+}
 #endif
 
 static int rtc_proc_open(struct inode *inode, struct file *file);
@@ -401,18 +415,19 @@ static int rtc_do_ioctl(unsigned int cmd, unsigned long arg, int kernel)
         }
         case RTC_PIE_OFF:       /* Mask periodic int. enab. bit */
         {
-                mask_rtc_irq_bit(RTC_PIE);
+                unsigned long flags; /* can be called from isr via rtc_control() */
+                spin_lock_irqsave (&rtc_lock, flags);
+                mask_rtc_irq_bit_locked(RTC_PIE);
                 if (rtc_status & RTC_TIMER_ON) {
-                        spin_lock_irq (&rtc_lock);
                         rtc_status &= ~RTC_TIMER_ON;
                         del_timer(&rtc_irq_timer);
-                        spin_unlock_irq (&rtc_lock);
                 }
+                spin_unlock_irqrestore (&rtc_lock, flags);
                 return 0;
         }
         case RTC_PIE_ON:        /* Allow periodic ints          */
         {
-
+                unsigned long flags; /* can be called from isr via rtc_control() */
                 /*
                  * We don't really want Joe User enabling more
                  * than 64Hz of interrupts on a multi-user machine.
@@ -421,14 +436,14 @@ static int rtc_do_ioctl(unsigned int cmd, unsigned long arg, int kernel)
                         (!capable(CAP_SYS_RESOURCE)))
                         return -EACCES;
 
+                spin_lock_irqsave (&rtc_lock, flags);
                 if (!(rtc_status & RTC_TIMER_ON)) {
-                        spin_lock_irq (&rtc_lock);
                         rtc_irq_timer.expires = jiffies + HZ/rtc_freq + 2*HZ/100;
                         add_timer(&rtc_irq_timer);
                         rtc_status |= RTC_TIMER_ON;
-                        spin_unlock_irq (&rtc_lock);
                 }
-                set_rtc_irq_bit(RTC_PIE);
+                set_rtc_irq_bit_locked(RTC_PIE);
+                spin_unlock_irqrestore (&rtc_lock, flags);
                 return 0;
         }
         case RTC_UIE_OFF:       /* Mask ints from RTC updates.  */
@@ -609,6 +624,7 @@ static int rtc_do_ioctl(unsigned int cmd, unsigned long arg, int kernel)
         {
                 int tmp = 0;
                 unsigned char val;
+                unsigned long flags; /* can be called from isr via rtc_control() */
 
                 /* 
                  * The max we can do is 8192Hz.
@@ -631,9 +647,9 @@ static int rtc_do_ioctl(unsigned int cmd, unsigned long arg, int kernel)
                 if (arg != (1<<tmp))
                         return -EINVAL;
 
-                spin_lock_irq(&rtc_lock);
+                spin_lock_irqsave(&rtc_lock, flags);
                 if (hpet_set_periodic_freq(arg)) {
-                        spin_unlock_irq(&rtc_lock);
+                        spin_unlock_irqrestore(&rtc_lock, flags);
                         return 0;
                 }
                 rtc_freq = arg;
@@ -641,7 +657,7 @@ static int rtc_do_ioctl(unsigned int cmd, unsigned long arg, int kernel)
                 val = CMOS_READ(RTC_FREQ_SELECT) & 0xf0;
                 val |= (16 - tmp);
                 CMOS_WRITE(val, RTC_FREQ_SELECT);
-                spin_unlock_irq(&rtc_lock);
+                spin_unlock_irqrestore(&rtc_lock, flags);
                 return 0;
         }
 #endif
@@ -844,12 +860,15 @@ int rtc_control(rtc_task_t *task, unsigned int cmd, unsigned long arg)
 #ifndef RTC_IRQ
         return -EIO;
 #else
-        spin_lock_irq(&rtc_task_lock);
+        unsigned long flags;
+        if (cmd != RTC_PIE_ON && cmd != RTC_PIE_OFF && cmd != RTC_IRQP_SET)
+                return -EINVAL;
+        spin_lock_irqsave(&rtc_task_lock, flags);
         if (rtc_callback != task) {
-                spin_unlock_irq(&rtc_task_lock);
+                spin_unlock_irqrestore(&rtc_task_lock, flags);
                 return -ENXIO;
         }
-        spin_unlock_irq(&rtc_task_lock);
+        spin_unlock_irqrestore(&rtc_task_lock, flags);
         return rtc_do_ioctl(cmd, arg, 1);
 #endif
 }
@@ -1306,40 +1325,32 @@ static void get_rtc_alm_time(struct rtc_time *alm_tm)
  * meddles with the interrupt enable/disable bits.
  */
 
-static void mask_rtc_irq_bit(unsigned char bit)
+static void mask_rtc_irq_bit_locked(unsigned char bit)
 {
         unsigned char val;
 
-        spin_lock_irq(&rtc_lock);
-        if (hpet_mask_rtc_irq_bit(bit)) {
-                spin_unlock_irq(&rtc_lock);
+        if (hpet_mask_rtc_irq_bit(bit))
                 return;
-        }
         val = CMOS_READ(RTC_CONTROL);
         val &=  ~bit;
         CMOS_WRITE(val, RTC_CONTROL);
         CMOS_READ(RTC_INTR_FLAGS);
 
         rtc_irq_data = 0;
-        spin_unlock_irq(&rtc_lock);
 }
 
-static void set_rtc_irq_bit(unsigned char bit)
+static void set_rtc_irq_bit_locked(unsigned char bit)
 {
         unsigned char val;
 
-        spin_lock_irq(&rtc_lock);
-        if (hpet_set_rtc_irq_bit(bit)) {
-                spin_unlock_irq(&rtc_lock);
+        if (hpet_set_rtc_irq_bit(bit))
                 return;
-        }
         val = CMOS_READ(RTC_CONTROL);
         val |= bit;
         CMOS_WRITE(val, RTC_CONTROL);
         CMOS_READ(RTC_INTR_FLAGS);
 
         rtc_irq_data = 0;
-        spin_unlock_irq(&rtc_lock);
 }
 #endif
 
diff --git a/drivers/char/selection.c b/drivers/char/selection.c
index 16d630f58bb4..5b187c895c18 100644
--- a/drivers/char/selection.c
+++ b/drivers/char/selection.c
@@ -246,8 +246,7 @@ int set_selection(const struct tiocl_selection __user *sel, struct tty_struct *t
                 clear_selection();
                 return -ENOMEM;
         }
-        if (sel_buffer)
-                kfree(sel_buffer);
+        kfree(sel_buffer);
         sel_buffer = bp;
 
         obp = bp;
diff --git a/drivers/char/stallion.c b/drivers/char/stallion.c
index 1c686414e0a1..95af2a941595 100644
--- a/drivers/char/stallion.c
+++ b/drivers/char/stallion.c
@@ -785,8 +785,7 @@ static void __exit stallion_module_exit(void)
                         "errno=%d\n", -i);
         class_destroy(stallion_class);
 
-        if (stl_tmpwritebuf != (char *) NULL)
-                kfree(stl_tmpwritebuf);
+        kfree(stl_tmpwritebuf);
 
         for (i = 0; (i < stl_nrbrds); i++) {
                 if ((brdp = stl_brds[i]) == (stlbrd_t *) NULL)
@@ -804,8 +803,7 @@ static void __exit stallion_module_exit(void)
                                         continue;
                                 if (portp->tty != (struct tty_struct *) NULL)
                                         stl_hangup(portp->tty);
-                                if (portp->tx.buf != (char *) NULL)
-                                        kfree(portp->tx.buf);
+                                kfree(portp->tx.buf);
                                 kfree(portp);
                         }
                         kfree(panelp);
diff --git a/drivers/char/synclink.c b/drivers/char/synclink.c
index 0133dc0e25d0..5d1ffa3bd4c3 100644
--- a/drivers/char/synclink.c
+++ b/drivers/char/synclink.c
@@ -4016,9 +4016,7 @@ static int mgsl_alloc_intermediate_rxbuffer_memory(struct mgsl_struct *info)
  */
 static void mgsl_free_intermediate_rxbuffer_memory(struct mgsl_struct *info)
 {
-        if ( info->intermediate_rxbuffer )
-                kfree(info->intermediate_rxbuffer);
-
+        kfree(info->intermediate_rxbuffer);
         info->intermediate_rxbuffer = NULL;
 
 }       /* end of mgsl_free_intermediate_rxbuffer_memory() */
@@ -4072,10 +4070,8 @@ static void mgsl_free_intermediate_txbuffer_memory(struct mgsl_struct *info)
         int i;
 
         for ( i=0; i<info->num_tx_holding_buffers; ++i ) {
-                if ( info->tx_holding_buffers[i].buffer ) {
-                                kfree(info->tx_holding_buffers[i].buffer);
-                                info->tx_holding_buffers[i].buffer=NULL;
-                }
+                kfree(info->tx_holding_buffers[i].buffer);
+                info->tx_holding_buffers[i].buffer = NULL;
         }
 
         info->get_tx_holding_index = 0;
diff --git a/drivers/char/synclinkmp.c b/drivers/char/synclinkmp.c
index f185724448b1..7c063c5abc55 100644
--- a/drivers/char/synclinkmp.c
+++ b/drivers/char/synclinkmp.c
@@ -2788,10 +2788,8 @@ static void shutdown(SLMP_INFO * info)
         del_timer(&info->tx_timer);
         del_timer(&info->status_timer);
 
-        if (info->tx_buf) {
-                kfree(info->tx_buf);
-                info->tx_buf = NULL;
-        }
+        kfree(info->tx_buf);
+        info->tx_buf = NULL;
 
         spin_lock_irqsave(&info->lock,flags);
 
@@ -3611,8 +3609,7 @@ int alloc_tmp_rx_buf(SLMP_INFO *info)
 
 void free_tmp_rx_buf(SLMP_INFO *info)
 {
-        if (info->tmp_rx_buf)
-                kfree(info->tmp_rx_buf);
+        kfree(info->tmp_rx_buf);
         info->tmp_rx_buf = NULL;
 }
 
diff --git a/drivers/char/tpm/tpm_nsc.c b/drivers/char/tpm/tpm_nsc.c
index 8d125c974a2d..680a8e331887 100644
--- a/drivers/char/tpm/tpm_nsc.c
+++ b/drivers/char/tpm/tpm_nsc.c
@@ -287,10 +287,6 @@ static int __init init_nsc(void)
         int lo, hi;
         int nscAddrBase = TPM_ADDR;
 
-        driver_register(&nsc_drv);
-
-        /* select PM channel 1 */
-        tpm_write_index(nscAddrBase,NSC_LDN_INDEX, 0x12);
 
         /* verify that it is a National part (SID) */
         if (tpm_read_index(TPM_ADDR, NSC_SID_INDEX) != 0xEF) {
@@ -300,6 +296,8 @@ static int __init init_nsc(void)
                         return -ENODEV;
         }
 
+        driver_register(&nsc_drv);
+
         hi = tpm_read_index(nscAddrBase, TPM_NSC_BASE0_HI);
         lo = tpm_read_index(nscAddrBase, TPM_NSC_BASE0_LO);
         tpm_nsc.base = (hi<<8) | lo;
@@ -307,11 +305,11 @@ static int __init init_nsc(void)
         /* enable the DPM module */
         tpm_write_index(nscAddrBase, NSC_LDC_INDEX, 0x01);
 
-        pdev = kmalloc(sizeof(struct platform_device), GFP_KERNEL);
-        if ( !pdev )
-                return -ENOMEM;
-
-        memset(pdev, 0, sizeof(struct platform_device));
+        pdev = kzalloc(sizeof(struct platform_device), GFP_KERNEL);
+        if (!pdev) {
+                rc = -ENOMEM;
+                goto err_unreg_drv;
+        }
 
         pdev->name = "tpm_nscl0";
         pdev->id = -1;
@@ -319,26 +317,16 @@ static int __init init_nsc(void)
         pdev->dev.release = tpm_nsc_remove;
         pdev->dev.driver = &nsc_drv;
 
-        if ((rc=platform_device_register(pdev)) < 0) {
-                kfree(pdev);
-                pdev = NULL;
-                return rc;
-        }
+        if ((rc = platform_device_register(pdev)) < 0)
+                goto err_free_dev;
 
         if (request_region(tpm_nsc.base, 2, "tpm_nsc0") == NULL ) {
-                platform_device_unregister(pdev);
-                kfree(pdev);
-                pdev = NULL;
-                return -EBUSY;
+                rc = -EBUSY;
+                goto err_unreg_dev;
         }
 
-        if ((rc = tpm_register_hardware(&pdev->dev, &tpm_nsc)) < 0) {
-                release_region(tpm_nsc.base, 2);
-                platform_device_unregister(pdev);
-                kfree(pdev);
-                pdev = NULL;
-                return rc;
-        }
+        if ((rc = tpm_register_hardware(&pdev->dev, &tpm_nsc)) < 0)
+                goto err_rel_reg;
 
         dev_dbg(&pdev->dev, "NSC TPM detected\n");
         dev_dbg(&pdev->dev,
@@ -374,6 +362,16 @@ static int __init init_nsc(void)
                  tpm_read_index(nscAddrBase, 0x27) & 0x1F);
 
         return 0;
+
+err_rel_reg:
+        release_region(tpm_nsc.base, 2);
+err_unreg_dev:
+        platform_device_unregister(pdev);
+err_free_dev:
+        kfree(pdev);
+err_unreg_drv:
+        driver_unregister(&nsc_drv);
+        return rc;
 }
 
 static void __exit cleanup_nsc(void)
diff --git a/drivers/char/tty_io.c b/drivers/char/tty_io.c
index c586bfa852ee..4b1eef51ec59 100644
--- a/drivers/char/tty_io.c
+++ b/drivers/char/tty_io.c
@@ -1416,14 +1416,11 @@ end_init:
 
         /* Release locally allocated memory ... nothing placed in slots */
 free_mem_out:
-        if (o_tp)
-                kfree(o_tp);
+        kfree(o_tp);
         if (o_tty)
                 free_tty_struct(o_tty);
-        if (ltp)
-                kfree(ltp);
-        if (tp)
-                kfree(tp);
+        kfree(ltp);
+        kfree(tp);
         free_tty_struct(tty);
 
 fail_no_mem:
diff --git a/drivers/char/vt_ioctl.c b/drivers/char/vt_ioctl.c
index 003dda147cd0..24011e7c81ff 100644
--- a/drivers/char/vt_ioctl.c
+++ b/drivers/char/vt_ioctl.c
@@ -80,6 +80,9 @@ do_kdsk_ioctl(int cmd, struct kbentry __user *user_kbe, int perm, struct kbd_str
         if (copy_from_user(&tmp, user_kbe, sizeof(struct kbentry)))
                 return -EFAULT;
 
+        if (!capable(CAP_SYS_TTY_CONFIG))
+                perm = 0;
+
         switch (cmd) {
         case KDGKBENT:
                 key_map = key_maps[s];
@@ -193,7 +196,7 @@ do_kdgkb_ioctl(int cmd, struct kbsentry __user *user_kdgkb, int perm)
         int ret;
 
         if (!capable(CAP_SYS_TTY_CONFIG))
-                return -EPERM;
+                perm = 0;
 
         kbs = kmalloc(sizeof(*kbs), GFP_KERNEL);
         if (!kbs) {
diff --git a/drivers/connector/Kconfig b/drivers/connector/Kconfig
index 0bc2059c1e08..e0bdc0db9640 100644
--- a/drivers/connector/Kconfig
+++ b/drivers/connector/Kconfig
@@ -10,4 +10,12 @@ config CONNECTOR
           Connector support can also be built as a module.  If so, the module
           will be called cn.ko.
 
+config PROC_EVENTS
+        boolean "Report process events to userspace"
+        depends on CONNECTOR=y
+        default y
+        ---help---
+          Provide a connector that reports process events to userspace. Send
+          events such as fork, exec, id change (uid, gid, suid, etc), and exit.
+
 endmenu
diff --git a/drivers/connector/Makefile b/drivers/connector/Makefile
index 12ca79e8234d..1f255e46e916 100644
--- a/drivers/connector/Makefile
+++ b/drivers/connector/Makefile
@@ -1,3 +1,4 @@
 obj-$(CONFIG_CONNECTOR)         += cn.o
+obj-$(CONFIG_PROC_EVENTS)       += cn_proc.o
 
 cn-y                            += cn_queue.o connector.o
diff --git a/drivers/connector/cn_proc.c b/drivers/connector/cn_proc.c
new file mode 100644
index 000000000000..fcdf0fff13a6
--- /dev/null
+++ b/drivers/connector/cn_proc.c
@@ -0,0 +1,222 @@
+/*
+ * cn_proc.c - process events connector
+ *
+ * Copyright (C) Matt Helsley, IBM Corp. 2005
+ * Based on cn_fork.c by Guillaume Thouvenin <guillaume.thouvenin@bull.net>
+ * Original copyright notice follows:
+ * Copyright (C) 2005 BULL SA.
+ *
+ *
+ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+
+#include <linux/module.h>
+#include <linux/kernel.h>
+#include <linux/init.h>
+#include <asm/atomic.h>
+
+#include <linux/cn_proc.h>
+
+#define CN_PROC_MSG_SIZE (sizeof(struct cn_msg) + sizeof(struct proc_event))
+
+static atomic_t proc_event_num_listeners = ATOMIC_INIT(0);
+static struct cb_id cn_proc_event_id = { CN_IDX_PROC, CN_VAL_PROC };
+
+/* proc_counts is used as the sequence number of the netlink message */
+static DEFINE_PER_CPU(__u32, proc_event_counts) = { 0 };
+
+static inline void get_seq(__u32 *ts, int *cpu)
+{
+        *ts = get_cpu_var(proc_event_counts)++;
+        *cpu = smp_processor_id();
+        put_cpu_var(proc_counts);
+}
+
+void proc_fork_connector(struct task_struct *task)
+{
+        struct cn_msg *msg;
+        struct proc_event *ev;
+        __u8 buffer[CN_PROC_MSG_SIZE];
+
+        if (atomic_read(&proc_event_num_listeners) < 1)
+                return;
+
+        msg = (struct cn_msg*)buffer;
+        ev = (struct proc_event*)msg->data;
+        get_seq(&msg->seq, &ev->cpu);
+        ev->what = PROC_EVENT_FORK;
+        ev->event_data.fork.parent_pid = task->real_parent->pid;
+        ev->event_data.fork.parent_tgid = task->real_parent->tgid;
+        ev->event_data.fork.child_pid = task->pid;
+        ev->event_data.fork.child_tgid = task->tgid;
+
+        memcpy(&msg->id, &cn_proc_event_id, sizeof(msg->id));
+        msg->ack = 0; /* not used */
+        msg->len = sizeof(*ev);
+        /*  If cn_netlink_send() failed, the data is not sent */
+        cn_netlink_send(msg, CN_IDX_PROC, GFP_KERNEL);
+}
+
+void proc_exec_connector(struct task_struct *task)
+{
+        struct cn_msg *msg;
+        struct proc_event *ev;
+        __u8 buffer[CN_PROC_MSG_SIZE];
+
+        if (atomic_read(&proc_event_num_listeners) < 1)
+                return;
+
+        msg = (struct cn_msg*)buffer;
+        ev = (struct proc_event*)msg->data;
+        get_seq(&msg->seq, &ev->cpu);
+        ev->what = PROC_EVENT_EXEC;
+        ev->event_data.exec.process_pid = task->pid;
+        ev->event_data.exec.process_tgid = task->tgid;
+
+        memcpy(&msg->id, &cn_proc_event_id, sizeof(msg->id));
+        msg->ack = 0; /* not used */
+        msg->len = sizeof(*ev);
+        cn_netlink_send(msg, CN_IDX_PROC, GFP_KERNEL);
+}
+
+void proc_id_connector(struct task_struct *task, int which_id)
+{
+        struct cn_msg *msg;
+        struct proc_event *ev;
+        __u8 buffer[CN_PROC_MSG_SIZE];
+
+        if (atomic_read(&proc_event_num_listeners) < 1)
+                return;
+
+        msg = (struct cn_msg*)buffer;
+        ev = (struct proc_event*)msg->data;
+        ev->what = which_id;
+        ev->event_data.id.process_pid = task->pid;
+        ev->event_data.id.process_tgid = task->tgid;
+        if (which_id == PROC_EVENT_UID) {
+                ev->event_data.id.r.ruid = task->uid;
+                ev->event_data.id.e.euid = task->euid;
+        } else if (which_id == PROC_EVENT_GID) {
+                ev->event_data.id.r.rgid = task->gid;
+                ev->event_data.id.e.egid = task->egid;
+        } else
+                return;
+        get_seq(&msg->seq, &ev->cpu);
+
+        memcpy(&msg->id, &cn_proc_event_id, sizeof(msg->id));
+        msg->ack = 0; /* not used */
+        msg->len = sizeof(*ev);
+        cn_netlink_send(msg, CN_IDX_PROC, GFP_KERNEL);
+}
+
+void proc_exit_connector(struct task_struct *task)
+{
+        struct cn_msg *msg;
+        struct proc_event *ev;
+        __u8 buffer[CN_PROC_MSG_SIZE];
+
+        if (atomic_read(&proc_event_num_listeners) < 1)
+                return;
+
+        msg = (struct cn_msg*)buffer;
+        ev = (struct proc_event*)msg->data;
+        get_seq(&msg->seq, &ev->cpu);
+        ev->what = PROC_EVENT_EXIT;
+        ev->event_data.exit.process_pid = task->pid;
+        ev->event_data.exit.process_tgid = task->tgid;
+        ev->event_data.exit.exit_code = task->exit_code;
+        ev->event_data.exit.exit_signal = task->exit_signal;
+
+        memcpy(&msg->id, &cn_proc_event_id, sizeof(msg->id));
+        msg->ack = 0; /* not used */
+        msg->len = sizeof(*ev);
+        cn_netlink_send(msg, CN_IDX_PROC, GFP_KERNEL);
+}
+
+/*
+ * Send an acknowledgement message to userspace
+ *
+ * Use 0 for success, EFOO otherwise.
+ * Note: this is the negative of conventional kernel error
+ * values because it's not being returned via syscall return
+ * mechanisms.
+ */
+static void cn_proc_ack(int err, int rcvd_seq, int rcvd_ack)
+{
+        struct cn_msg *msg;
+        struct proc_event *ev;
+        __u8 buffer[CN_PROC_MSG_SIZE];
+
+        if (atomic_read(&proc_event_num_listeners) < 1)
+                return;
+
+        msg = (struct cn_msg*)buffer;
+        ev = (struct proc_event*)msg->data;
+        msg->seq = rcvd_seq;
+        ev->cpu = -1;
+        ev->what = PROC_EVENT_NONE;
+        ev->event_data.ack.err = err;
+        memcpy(&msg->id, &cn_proc_event_id, sizeof(msg->id));
+        msg->ack = rcvd_ack + 1;
+        msg->len = sizeof(*ev);
+        cn_netlink_send(msg, CN_IDX_PROC, GFP_KERNEL);
+}
+
+/**
+ * cn_proc_mcast_ctl
+ * @data: message sent from userspace via the connector
+ */
+static void cn_proc_mcast_ctl(void *data)
+{
+        struct cn_msg *msg = data;
+        enum proc_cn_mcast_op *mc_op = NULL;
+        int err = 0;
+
+        if (msg->len != sizeof(*mc_op))
+                return;
+
+        mc_op = (enum proc_cn_mcast_op*)msg->data;
+        switch (*mc_op) {
+        case PROC_CN_MCAST_LISTEN:
+                atomic_inc(&proc_event_num_listeners);
+                break;
+        case PROC_CN_MCAST_IGNORE:
+                atomic_dec(&proc_event_num_listeners);
+                break;
+        default:
+                err = EINVAL;
+                break;
+        }
+        cn_proc_ack(err, msg->seq, msg->ack);
+}
+
+/*
+ * cn_proc_init - initialization entry point
+ *
+ * Adds the connector callback to the connector driver.
+ */
+static int __init cn_proc_init(void)
+{
+        int err;
+
+        if ((err = cn_add_callback(&cn_proc_event_id, "cn_proc",
+                                   &cn_proc_mcast_ctl))) {
+                printk(KERN_WARNING "cn_proc failed to register\n");
+                return err;
+        }
+        return 0;
+}
+
+module_init(cn_proc_init);
diff --git a/drivers/cpufreq/cpufreq.c b/drivers/cpufreq/cpufreq.c
index 6c6121b85a54..25acf478c9e8 100644
--- a/drivers/cpufreq/cpufreq.c
+++ b/drivers/cpufreq/cpufreq.c
@@ -593,12 +593,11 @@ static int cpufreq_add_dev (struct sys_device * sys_dev)
                 goto module_out;
         }
 
-        policy = kmalloc(sizeof(struct cpufreq_policy), GFP_KERNEL);
+        policy = kzalloc(sizeof(struct cpufreq_policy), GFP_KERNEL);
         if (!policy) {
                 ret = -ENOMEM;
                 goto nomem_out;
         }
-        memset(policy, 0, sizeof(struct cpufreq_policy));
 
         policy->cpu = cpu;
         policy->cpus = cpumask_of_cpu(cpu);
diff --git a/drivers/cpufreq/cpufreq_ondemand.c b/drivers/cpufreq/cpufreq_ondemand.c
index c1fc9c62bb51..17741111246b 100644
--- a/drivers/cpufreq/cpufreq_ondemand.c
+++ b/drivers/cpufreq/cpufreq_ondemand.c
@@ -48,7 +48,10 @@
  * All times here are in uS.
  */
 static unsigned int                             def_sampling_rate;
-#define MIN_SAMPLING_RATE                       (def_sampling_rate / 2)
+#define MIN_SAMPLING_RATE_RATIO                 (2)
+/* for correct statistics, we need at least 10 ticks between each measure */
+#define MIN_STAT_SAMPLING_RATE                  (MIN_SAMPLING_RATE_RATIO * jiffies_to_usecs(10))
+#define MIN_SAMPLING_RATE                       (def_sampling_rate / MIN_SAMPLING_RATE_RATIO)
 #define MAX_SAMPLING_RATE                       (500 * def_sampling_rate)
 #define DEF_SAMPLING_RATE_LATENCY_MULTIPLIER    (1000)
 #define DEF_SAMPLING_DOWN_FACTOR                (1)
@@ -416,13 +419,16 @@ static int cpufreq_governor_dbs(struct cpufreq_policy *policy,
                 if (dbs_enable == 1) {
                         unsigned int latency;
                         /* policy latency is in nS. Convert it to uS first */
+                        latency = policy->cpuinfo.transition_latency / 1000;
+                        if (latency == 0)
+                                latency = 1;
 
-                        latency = policy->cpuinfo.transition_latency;
-                        if (latency < 1000)
-                                latency = 1000;
-
-                        def_sampling_rate = (latency / 1000) *
+                        def_sampling_rate = latency *
                                         DEF_SAMPLING_RATE_LATENCY_MULTIPLIER;
+
+                        if (def_sampling_rate < MIN_STAT_SAMPLING_RATE)
+                                def_sampling_rate = MIN_STAT_SAMPLING_RATE;
+
                         dbs_tuners_ins.sampling_rate = def_sampling_rate;
                         dbs_tuners_ins.ignore_nice = 0;
 
diff --git a/drivers/cpufreq/cpufreq_stats.c b/drivers/cpufreq/cpufreq_stats.c
index 3597f25d5efa..0bddb8e694d9 100644
--- a/drivers/cpufreq/cpufreq_stats.c
+++ b/drivers/cpufreq/cpufreq_stats.c
@@ -193,11 +193,15 @@ cpufreq_stats_create_table (struct cpufreq_policy *policy,
         unsigned int cpu = policy->cpu;
         if (cpufreq_stats_table[cpu])
                 return -EBUSY;
-        if ((stat = kmalloc(sizeof(struct cpufreq_stats), GFP_KERNEL)) == NULL)
+        if ((stat = kzalloc(sizeof(struct cpufreq_stats), GFP_KERNEL)) == NULL)
                 return -ENOMEM;
-        memset(stat, 0, sizeof (struct cpufreq_stats));
 
         data = cpufreq_cpu_get(cpu);
+        if (data == NULL) {
+                ret = -EINVAL;
+                goto error_get_fail;
+        }
+
         if ((ret = sysfs_create_group(&data->kobj, &stats_attr_group)))
                 goto error_out;
 
@@ -217,12 +221,11 @@ cpufreq_stats_create_table (struct cpufreq_policy *policy,
         alloc_size += count * count * sizeof(int);
 #endif
         stat->max_state = count;
-        stat->time_in_state = kmalloc(alloc_size, GFP_KERNEL);
+        stat->time_in_state = kzalloc(alloc_size, GFP_KERNEL);
         if (!stat->time_in_state) {
                 ret = -ENOMEM;
                 goto error_out;
         }
-        memset(stat->time_in_state, 0, alloc_size);
         stat->freq_table = (unsigned int *)(stat->time_in_state + count);
 
 #ifdef CONFIG_CPU_FREQ_STAT_DETAILS
@@ -245,6 +248,7 @@ cpufreq_stats_create_table (struct cpufreq_policy *policy,
         return 0;
 error_out:
         cpufreq_cpu_put(data);
+error_get_fail:
         kfree(stat);
         cpufreq_stats_table[cpu] = NULL;
         return ret;
diff --git a/drivers/dio/dio.c b/drivers/dio/dio.c
index a620f7d9ac8e..17502d6efae7 100644
--- a/drivers/dio/dio.c
+++ b/drivers/dio/dio.c
@@ -224,11 +224,10 @@ static int __init dio_init(void)
                 set_fs(fs);
 
                 /* Found a board, allocate it an entry in the list */
-                dev = kmalloc(sizeof(struct dio_dev), GFP_KERNEL);
+                dev = kzalloc(sizeof(struct dio_dev), GFP_KERNEL);
                 if (!dev)
                         return 0;
 
-                memset(dev, 0, sizeof(struct dio_dev));
                 dev->bus = &dio_bus;
                 dev->dev.parent = &dio_bus.dev;
                 dev->dev.bus = &dio_bus_type;
diff --git a/drivers/eisa/eisa-bus.c b/drivers/eisa/eisa-bus.c
index 1937743c8e29..4196137e66de 100644
--- a/drivers/eisa/eisa-bus.c
+++ b/drivers/eisa/eisa-bus.c
@@ -281,13 +281,11 @@ static int __init eisa_probe (struct eisa_root_device *root)
         /* First try to get hold of slot 0. If there is no device
          * here, simply fail, unless root->force_probe is set. */
         
-        if (!(edev = kmalloc (sizeof (*edev), GFP_KERNEL))) {
+        if (!(edev = kzalloc (sizeof (*edev), GFP_KERNEL))) {
                 printk (KERN_ERR "EISA: Couldn't allocate mainboard slot\n");
                 return -ENOMEM;
         }
                 
-        memset (edev, 0, sizeof (*edev));
-
         if (eisa_request_resources (root, edev, 0)) {
                 printk (KERN_WARNING \
                         "EISA: Cannot allocate resource for mainboard\n");
@@ -317,13 +315,11 @@ static int __init eisa_probe (struct eisa_root_device *root)
  force_probe:
         
         for (c = 0, i = 1; i <= root->slots; i++) {
-                if (!(edev = kmalloc (sizeof (*edev), GFP_KERNEL))) {
+                if (!(edev = kzalloc (sizeof (*edev), GFP_KERNEL))) {
                         printk (KERN_ERR "EISA: Out of memory for slot %d\n",
                                 i);
                         continue;
                 }
-                
-                memset (edev, 0, sizeof (*edev));
 
                 if (eisa_request_resources (root, edev, i)) {
                         printk (KERN_WARNING \
diff --git a/drivers/fc4/fc.c b/drivers/fc4/fc.c
index e4710d1d1f9d..5c8943509cc1 100644
--- a/drivers/fc4/fc.c
+++ b/drivers/fc4/fc.c
@@ -266,13 +266,12 @@ static void fcp_report_map_done(fc_channel *fc, int i, int status)
                         printk ("FC: Bad magic from REPORT_AL_MAP on %s - %08x\n", fc->name, p->magic);
                         fc->state = FC_STATE_OFFLINE;
                 } else {
-                        fc->posmap = (fcp_posmap *)kmalloc(sizeof(fcp_posmap)+p->len, GFP_KERNEL);
+                        fc->posmap = (fcp_posmap *)kzalloc(sizeof(fcp_posmap)+p->len, GFP_KERNEL);
                         if (!fc->posmap) {
                                 printk("FC: Not enough memory, offlining channel\n");
                                 fc->state = FC_STATE_OFFLINE;
                         } else {
                                 int k;
-                                memset(fc->posmap, 0, sizeof(fcp_posmap)+p->len);
                                 /* FIXME: This is where SOCAL transfers our AL-PA.
                                    Keep it here till we found out what other cards do... */
                                 fc->sid = (p->magic & 0xff);
@@ -351,14 +350,12 @@ void fcp_register(fc_channel *fc, u8 type, int unregister)
                         fc->dma_scsi_rsp = fc->dma_scsi_cmd + slots * sizeof (fcp_cmd);
                         fc->scsi_bitmap_end = (slots + 63) & ~63;
                         size = fc->scsi_bitmap_end / 8;
-                        fc->scsi_bitmap = kmalloc (size, GFP_KERNEL);
-                        memset (fc->scsi_bitmap, 0, size);
+                        fc->scsi_bitmap = kzalloc (size, GFP_KERNEL);
                         set_bit (0, fc->scsi_bitmap);
                         for (i = fc->can_queue; i < fc->scsi_bitmap_end; i++)
                                 set_bit (i, fc->scsi_bitmap);
                         fc->scsi_free = fc->can_queue;
-                        fc->cmd_slots = (fcp_cmnd **)kmalloc(slots * sizeof(fcp_cmnd*), GFP_KERNEL);
-                        memset(fc->cmd_slots, 0, slots * sizeof(fcp_cmnd*));
+                        fc->cmd_slots = (fcp_cmnd **)kzalloc(slots * sizeof(fcp_cmnd*), GFP_KERNEL);
                         fc->abort_count = 0;
                 } else {
                         fc->scsi_name[0] = 0;
@@ -541,12 +538,11 @@ int fcp_initialize(fc_channel *fcchain, int count)
         FCND(("fcp_inititialize %08lx\n", (long)fcp_init))
         FCND(("fc_channels %08lx\n", (long)fc_channels))
         FCND((" SID %d DID %d\n", fcchain->sid, fcchain->did))
-        l = kmalloc(sizeof (ls) + count, GFP_KERNEL);
+        l = kzalloc(sizeof (ls) + count, GFP_KERNEL);
         if (!l) {
                 printk ("FC: Cannot allocate memory for initialization\n");
                 return -ENOMEM;
         }
-        memset (l, 0, sizeof(ls) + count);
         l->magic = LSMAGIC;
         l->count = count;
         FCND(("FCP Init for %d channels\n", count))
@@ -555,17 +551,15 @@ int fcp_initialize(fc_channel *fcchain, int count)
         l->timer.function = fcp_login_timeout;
         l->timer.data = (unsigned long)l;
         atomic_set (&l->todo, count);
-        l->logi = kmalloc (count * 3 * sizeof(logi), GFP_KERNEL);
-        l->fcmds = kmalloc (count * sizeof(fcp_cmnd), GFP_KERNEL);
+        l->logi = kzalloc (count * 3 * sizeof(logi), GFP_KERNEL);
+        l->fcmds = kzalloc (count * sizeof(fcp_cmnd), GFP_KERNEL);
         if (!l->logi || !l->fcmds) {
-                if (l->logi) kfree (l->logi);
-                if (l->fcmds) kfree (l->fcmds);
+                kfree (l->logi);
+                kfree (l->fcmds);
                 kfree (l);
                 printk ("FC: Cannot allocate DMA memory for initialization\n");
                 return -ENOMEM;
         }
-        memset (l->logi, 0, count * 3 * sizeof(logi));
-        memset (l->fcmds, 0, count * sizeof(fcp_cmnd));
         for (fc = fcchain, i = 0; fc && i < count; fc = fc->next, i++) {
                 fc->state = FC_STATE_UNINITED;
                 fc->rst_pkt = NULL;     /* kmalloc when first used */
@@ -678,13 +672,11 @@ int fcp_forceoffline(fc_channel *fcchain, int count)
         l.timer.function = fcp_login_timeout;
         l.timer.data = (unsigned long)&l;
         atomic_set (&l.todo, count);
-        l.fcmds = kmalloc (count * sizeof(fcp_cmnd), GFP_KERNEL);
+        l.fcmds = kzalloc (count * sizeof(fcp_cmnd), GFP_KERNEL);
         if (!l.fcmds) {
-                kfree (l.fcmds);
                 printk ("FC: Cannot allocate memory for forcing offline\n");
                 return -ENOMEM;
         }
-        memset (l.fcmds, 0, count * sizeof(fcp_cmnd));
         FCND(("Initializing OFFLINE packets\n"))
         for (fc = fcchain, i = 0; fc && i < count; fc = fc->next, i++) {
                 fc->state = FC_STATE_UNINITED;
@@ -1114,9 +1106,8 @@ int fc_do_plogi(fc_channel *fc, unsigned char alpa, fc_wwn *node, fc_wwn *nport)
         logi *l;
         int status;
 
-        l = (logi *)kmalloc(2 * sizeof(logi), GFP_KERNEL);
+        l = (logi *)kzalloc(2 * sizeof(logi), GFP_KERNEL);
         if (!l) return -ENOMEM;
-        memset(l, 0, 2 * sizeof(logi));
         l->code = LS_PLOGI;
         memcpy (&l->nport_wwn, &fc->wwn_nport, sizeof(fc_wwn));
         memcpy (&l->node_wwn, &fc->wwn_node, sizeof(fc_wwn));
@@ -1149,9 +1140,8 @@ int fc_do_prli(fc_channel *fc, unsigned char alpa)
         prli *p;
         int status;
 
-        p = (prli *)kmalloc(2 * sizeof(prli), GFP_KERNEL);
+        p = (prli *)kzalloc(2 * sizeof(prli), GFP_KERNEL);
         if (!p) return -ENOMEM;
-        memset(p, 0, 2 * sizeof(prli));
         p->code = LS_PRLI;
         p->params[0] = 0x08002000;
         p->params[3] = 0x00000022;
diff --git a/drivers/fc4/soc.c b/drivers/fc4/soc.c
index 247b46302777..ec1f94738c59 100644
--- a/drivers/fc4/soc.c
+++ b/drivers/fc4/soc.c
@@ -556,10 +556,9 @@ static inline void soc_init(struct sbus_dev *sdev, int no)
         int size, i;
         int irq;
         
-        s = kmalloc (sizeof (struct soc), GFP_KERNEL);
+        s = kzalloc (sizeof (struct soc), GFP_KERNEL);
         if (s == NULL)
                 return;
-        memset (s, 0, sizeof(struct soc));
         spin_lock_init(&s->lock);
         s->soc_no = no;
 
diff --git a/drivers/fc4/socal.c b/drivers/fc4/socal.c
index b2377dbd84a1..922e9613b2cf 100644
--- a/drivers/fc4/socal.c
+++ b/drivers/fc4/socal.c
@@ -665,9 +665,8 @@ static inline void socal_init(struct sbus_dev *sdev, int no)
         int size, i;
         int irq, node;
         
-        s = kmalloc (sizeof (struct socal), GFP_KERNEL);
+        s = kzalloc (sizeof (struct socal), GFP_KERNEL);
         if (!s) return;
-        memset (s, 0, sizeof(struct socal));
         spin_lock_init(&s->lock);
         s->socal_no = no;
 
diff --git a/drivers/firmware/dell_rbu.c b/drivers/firmware/dell_rbu.c
index 125929c9048f..ba17292eb290 100644
--- a/drivers/firmware/dell_rbu.c
+++ b/drivers/firmware/dell_rbu.c
@@ -50,7 +50,7 @@
 MODULE_AUTHOR("Abhay Salunke <abhay_salunke@dell.com>");
 MODULE_DESCRIPTION("Driver for updating BIOS image on DELL systems");
 MODULE_LICENSE("GPL");
-MODULE_VERSION("3.0");
+MODULE_VERSION("3.1");
 
 #define BIOS_SCAN_LIMIT 0xffffffff
 #define MAX_IMAGE_LENGTH 16
@@ -73,6 +73,11 @@ module_param_string(image_type, image_type, sizeof (image_type), 0);
 MODULE_PARM_DESC(image_type,
         "BIOS image type. choose- mono or packet or init");
 
+static unsigned long allocation_floor = 0x100000;
+module_param(allocation_floor, ulong, 0644);
+MODULE_PARM_DESC(allocation_floor,
+    "Minimum address for allocations when using Packet mode");
+
 struct packet_data {
         struct list_head list;
         size_t length;
@@ -99,61 +104,122 @@ static int create_packet(void *data, size_t length)
 {
         struct packet_data *newpacket;
         int ordernum = 0;
+        int retval = 0;
+        unsigned int packet_array_size = 0;
+        void **invalid_addr_packet_array = 0;
+        void *packet_data_temp_buf = 0;
+        unsigned int idx = 0;
 
         pr_debug("create_packet: entry \n");
 
         if (!rbu_data.packetsize) {
                 pr_debug("create_packet: packetsize not specified\n");
-                return -EINVAL;
+                retval = -EINVAL;
+                goto out_noalloc;
         }
+
         spin_unlock(&rbu_data.lock);
-        newpacket = kmalloc(sizeof (struct packet_data), GFP_KERNEL);
-        spin_lock(&rbu_data.lock);
+
+        newpacket = kzalloc(sizeof (struct packet_data), GFP_KERNEL);
 
         if (!newpacket) {
                 printk(KERN_WARNING
                         "dell_rbu:%s: failed to allocate new "
                         "packet\n", __FUNCTION__);
-                return -ENOMEM;
+                retval = -ENOMEM;
+                spin_lock(&rbu_data.lock);
+                goto out_noalloc;
         }
 
         ordernum = get_order(length);
+
         /*
-         * there is no upper limit on memory
-         * address for packetized mechanism
+         * BIOS errata mean we cannot allocate packets below 1MB or they will
+         * be overwritten by BIOS.
+         *
+         * array to temporarily hold packets
+         * that are below the allocation floor
+         *
+         * NOTE: very simplistic because we only need the floor to be at 1MB
+         *       due to BIOS errata. This shouldn't be used for higher floors
+         *       or you will run out of mem trying to allocate the array.
          */
-        spin_unlock(&rbu_data.lock);
-        newpacket->data = (unsigned char *) __get_free_pages(GFP_KERNEL,
-                ordernum);
-        spin_lock(&rbu_data.lock);
+        packet_array_size = max(
+                        (unsigned int)(allocation_floor / rbu_data.packetsize),
+                        (unsigned int)1);
+        invalid_addr_packet_array = kzalloc(packet_array_size * sizeof(void*),
+                                                GFP_KERNEL);
 
-        pr_debug("create_packet: newpacket %p\n", newpacket->data);
-
-        if (!newpacket->data) {
+        if (!invalid_addr_packet_array) {
                 printk(KERN_WARNING
-                        "dell_rbu:%s: failed to allocate new "
-                        "packet\n", __FUNCTION__);
-                kfree(newpacket);
-                return -ENOMEM;
+                        "dell_rbu:%s: failed to allocate "
+                        "invalid_addr_packet_array \n",
+                        __FUNCTION__);
+                retval = -ENOMEM;
+                spin_lock(&rbu_data.lock);
+                goto out_alloc_packet;
         }
 
+        while (!packet_data_temp_buf) {
+                packet_data_temp_buf = (unsigned char *)
+                        __get_free_pages(GFP_KERNEL, ordernum);
+                if (!packet_data_temp_buf) {
+                        printk(KERN_WARNING
+                                "dell_rbu:%s: failed to allocate new "
+                                "packet\n", __FUNCTION__);
+                        retval = -ENOMEM;
+                        spin_lock(&rbu_data.lock);
+                        goto out_alloc_packet_array;
+                }
+
+                if ((unsigned long)virt_to_phys(packet_data_temp_buf)
+                                < allocation_floor) {
+                        pr_debug("packet 0x%lx below floor at 0x%lx.\n",
+                                        (unsigned long)virt_to_phys(
+                                                packet_data_temp_buf),
+                                        allocation_floor);
+                        invalid_addr_packet_array[idx++] = packet_data_temp_buf;
+                        packet_data_temp_buf = 0;
+                }
+        }
+        spin_lock(&rbu_data.lock);
+
+        newpacket->data = packet_data_temp_buf;
+
+        pr_debug("create_packet: newpacket at physical addr %lx\n",
+                (unsigned long)virt_to_phys(newpacket->data));
+
+        /* packets may not have fixed size */
+        newpacket->length = length;
         newpacket->ordernum = ordernum;
         ++rbu_data.num_packets;
-        /*
-         * initialize the newly created packet headers
-         */
+
+        /* initialize the newly created packet headers */
         INIT_LIST_HEAD(&newpacket->list);
         list_add_tail(&newpacket->list, &packet_data_head.list);
-        /*
-         * packets may not have fixed size
-         */
-        newpacket->length = length;
 
         memcpy(newpacket->data, data, length);
 
         pr_debug("create_packet: exit \n");
 
-        return 0;
+out_alloc_packet_array:
+        /* always free packet array */
+        for (;idx>0;idx--) {
+                pr_debug("freeing unused packet below floor 0x%lx.\n",
+                        (unsigned long)virt_to_phys(
+                                invalid_addr_packet_array[idx-1]));
+                free_pages((unsigned long)invalid_addr_packet_array[idx-1],
+                        ordernum);
+        }
+        kfree(invalid_addr_packet_array);
+
+out_alloc_packet:
+        /* if error, free data */
+        if (retval)
+                kfree(newpacket);
+
+out_noalloc:
+        return retval;
 }
 
 static int packetize_data(void *data, size_t length)
@@ -693,3 +759,6 @@ static __exit void dcdrbu_exit(void)
 
 module_exit(dcdrbu_exit);
 module_init(dcdrbu_init);
+
+/* vim:noet:ts=8:sw=8
+*/
diff --git a/drivers/firmware/edd.c b/drivers/firmware/edd.c
index 6996476669f1..b4502ed65793 100644
--- a/drivers/firmware/edd.c
+++ b/drivers/firmware/edd.c
@@ -715,7 +715,6 @@ edd_device_register(struct edd_device *edev, int i)
 
         if (!edev)
                 return 1;
-        memset(edev, 0, sizeof (*edev));
         edd_dev_set_info(edev, i);
         kobject_set_name(&edev->kobj, "int13_dev%02x",
                          0x80 + i);
@@ -756,7 +755,7 @@ edd_init(void)
                 return rc;
 
         for (i = 0; i < edd_num_devices() && !rc; i++) {
-                edev = kmalloc(sizeof (*edev), GFP_KERNEL);
+                edev = kzalloc(sizeof (*edev), GFP_KERNEL);
                 if (!edev)
                         return -ENOMEM;
 
diff --git a/drivers/firmware/efivars.c b/drivers/firmware/efivars.c
index 33b17c6a46fb..bda5bce681b6 100644
--- a/drivers/firmware/efivars.c
+++ b/drivers/firmware/efivars.c
@@ -614,16 +614,14 @@ efivar_create_sysfs_entry(unsigned long variable_name_size,
         char *short_name;
         struct efivar_entry *new_efivar;
 
-        short_name = kmalloc(short_name_size + 1, GFP_KERNEL);
-        new_efivar = kmalloc(sizeof(struct efivar_entry), GFP_KERNEL);
+        short_name = kzalloc(short_name_size + 1, GFP_KERNEL);
+        new_efivar = kzalloc(sizeof(struct efivar_entry), GFP_KERNEL);
 
         if (!short_name || !new_efivar)  {
                 kfree(short_name);
                 kfree(new_efivar);
                 return 1;
         }
-        memset(short_name, 0, short_name_size+1);
-        memset(new_efivar, 0, sizeof(struct efivar_entry));
 
         memcpy(new_efivar->var.VariableName, variable_name,
                 variable_name_size);
@@ -674,14 +672,12 @@ efivars_init(void)
         if (!efi_enabled)
                 return -ENODEV;
 
-        variable_name = kmalloc(variable_name_size, GFP_KERNEL);
+        variable_name = kzalloc(variable_name_size, GFP_KERNEL);
         if (!variable_name) {
                 printk(KERN_ERR "efivars: Memory allocation failed.\n");
                 return -ENOMEM;
         }
 
-        memset(variable_name, 0, variable_name_size);
-
         printk(KERN_INFO "EFI Variables Facility v%s %s\n", EFIVARS_VERSION,
                EFIVARS_DATE);
 
diff --git a/drivers/hwmon/hwmon.c b/drivers/hwmon/hwmon.c
index 6f48579799b5..dddd3eb9b387 100644
--- a/drivers/hwmon/hwmon.c
+++ b/drivers/hwmon/hwmon.c
@@ -16,6 +16,7 @@
 #include <linux/kdev_t.h>
 #include <linux/idr.h>
 #include <linux/hwmon.h>
+#include <linux/gfp.h>
 
 #define HWMON_ID_PREFIX "hwmon"
 #define HWMON_ID_FORMAT HWMON_ID_PREFIX "%d"
diff --git a/drivers/hwmon/max1619.c b/drivers/hwmon/max1619.c
index 6a82ffae1bfd..69e7e125683b 100644
--- a/drivers/hwmon/max1619.c
+++ b/drivers/hwmon/max1619.c
@@ -193,7 +193,7 @@ static int max1619_detect(struct i2c_adapter *adapter, int address, int kind)
         int err = 0;
         const char *name = "";  
         u8 reg_config=0, reg_convrate=0, reg_status=0;
-        u8 man_id, chip_id;
+
         if (!i2c_check_functionality(adapter, I2C_FUNC_SMBUS_BYTE_DATA))
                 goto exit;
 
@@ -238,16 +238,15 @@ static int max1619_detect(struct i2c_adapter *adapter, int address, int kind)
         }
 
         if (kind <= 0) { /* identification */
+                u8 man_id, chip_id;
         
                 man_id = i2c_smbus_read_byte_data(new_client,
                          MAX1619_REG_R_MAN_ID);
                 chip_id = i2c_smbus_read_byte_data(new_client,
                           MAX1619_REG_R_CHIP_ID);
                 
-                if ((man_id == 0x4D) && (chip_id == 0x04)){  
-                                kind = max1619;
-                        }
-                }
+                if ((man_id == 0x4D) && (chip_id == 0x04))
+                        kind = max1619;
 
                 if (kind <= 0) { /* identification failed */
                         dev_info(&adapter->dev,
@@ -255,11 +254,10 @@ static int max1619_detect(struct i2c_adapter *adapter, int address, int kind)
                             "chip_id=0x%02X).\n", man_id, chip_id);
                         goto exit_free;
                 }
-        
+        }
 
-        if (kind == max1619){
+        if (kind == max1619)
                 name = "max1619";
-        }
 
         /* We can fill in the remaining client fields */
         strlcpy(new_client->name, name, I2C_NAME_SIZE);
diff --git a/drivers/hwmon/w83781d.c b/drivers/hwmon/w83781d.c
index 9265f32122fa..ffdb3a03e2b5 100644
--- a/drivers/hwmon/w83781d.c
+++ b/drivers/hwmon/w83781d.c
@@ -976,11 +976,9 @@ w83781d_detect_subclients(struct i2c_adapter *adapter, int address, int kind,
 ERROR_SC_3:
         i2c_detach_client(data->lm75[0]);
 ERROR_SC_2:
-        if (data->lm75[1])
-                kfree(data->lm75[1]);
+        kfree(data->lm75[1]);
 ERROR_SC_1:
-        if (data->lm75[0])
-                kfree(data->lm75[0]);
+        kfree(data->lm75[0]);
 ERROR_SC_0:
         return err;
 }
diff --git a/drivers/i2c/busses/i2c-amd756-s4882.c b/drivers/i2c/busses/i2c-amd756-s4882.c
index f51ab652300a..56c7d987590f 100644
--- a/drivers/i2c/busses/i2c-amd756-s4882.c
+++ b/drivers/i2c/busses/i2c-amd756-s4882.c
@@ -245,10 +245,8 @@ static void __exit amd756_s4882_exit(void)
                 kfree(s4882_adapter);
                 s4882_adapter = NULL;
         }
-        if (s4882_algo) {
-                kfree(s4882_algo);
-                s4882_algo = NULL;
-        }
+        kfree(s4882_algo);
+        s4882_algo = NULL;
 
         /* Restore physical bus */
         if (i2c_add_adapter(&amd756_smbus))
diff --git a/drivers/ide/ide-cd.c b/drivers/ide/ide-cd.c
index 8b9d85526596..c2f47923d174 100644
--- a/drivers/ide/ide-cd.c
+++ b/drivers/ide/ide-cd.c
@@ -3292,12 +3292,9 @@ static void ide_cd_release(struct kref *kref)
         ide_drive_t *drive = info->drive;
         struct gendisk *g = info->disk;
 
-        if (info->buffer != NULL)
-                kfree(info->buffer);
-        if (info->toc != NULL)
-                kfree(info->toc);
-        if (info->changer_info != NULL)
-                kfree(info->changer_info);
+        kfree(info->buffer);
+        kfree(info->toc);
+        kfree(info->changer_info);
         if (devinfo->handle == drive && unregister_cdrom(devinfo))
                 printk(KERN_ERR "%s: %s failed to unregister device from the cdrom "
                                 "driver.\n", __FUNCTION__, drive->name);
@@ -3455,7 +3452,7 @@ static int ide_cd_probe(struct device *dev)
                 printk(KERN_INFO "ide-cd: passing drive %s to ide-scsi emulation.\n", drive->name);
                 goto failed;
         }
-        info = kmalloc(sizeof(struct cdrom_info), GFP_KERNEL);
+        info = kzalloc(sizeof(struct cdrom_info), GFP_KERNEL);
         if (info == NULL) {
                 printk(KERN_ERR "%s: Can't allocate a cdrom structure\n", drive->name);
                 goto failed;
@@ -3469,8 +3466,6 @@ static int ide_cd_probe(struct device *dev)
 
         ide_register_subdriver(drive, &ide_cdrom_driver);
 
-        memset(info, 0, sizeof (struct cdrom_info));
-
         kref_init(&info->kref);
 
         info->drive = drive;
@@ -3489,12 +3484,9 @@ static int ide_cd_probe(struct device *dev)
         if (ide_cdrom_setup(drive)) {
                 struct cdrom_device_info *devinfo = &info->devinfo;
                 ide_unregister_subdriver(drive, &ide_cdrom_driver);
-                if (info->buffer != NULL)
-                        kfree(info->buffer);
-                if (info->toc != NULL)
-                        kfree(info->toc);
-                if (info->changer_info != NULL)
-                        kfree(info->changer_info);
+                kfree(info->buffer);
+                kfree(info->toc);
+                kfree(info->changer_info);
                 if (devinfo->handle == drive && unregister_cdrom(devinfo))
                         printk (KERN_ERR "%s: ide_cdrom_cleanup failed to unregister device from the cdrom driver.\n", drive->name);
                 kfree(info);
diff --git a/drivers/ide/ide-disk.c b/drivers/ide/ide-disk.c
index 234f5de3e929..e827b39e4b3c 100644
--- a/drivers/ide/ide-disk.c
+++ b/drivers/ide/ide-disk.c
@@ -1215,7 +1215,7 @@ static int ide_disk_probe(struct device *dev)
         if (drive->media != ide_disk)
                 goto failed;
 
-        idkp = kmalloc(sizeof(*idkp), GFP_KERNEL);
+        idkp = kzalloc(sizeof(*idkp), GFP_KERNEL);
         if (!idkp)
                 goto failed;
 
@@ -1228,8 +1228,6 @@ static int ide_disk_probe(struct device *dev)
 
         ide_register_subdriver(drive, &idedisk_driver);
 
-        memset(idkp, 0, sizeof(*idkp));
-
         kref_init(&idkp->kref);
 
         idkp->drive = drive;
diff --git a/drivers/ide/ide-floppy.c b/drivers/ide/ide-floppy.c
index 29c22fc278c6..e83f54d37f96 100644
--- a/drivers/ide/ide-floppy.c
+++ b/drivers/ide/ide-floppy.c
@@ -2146,7 +2146,7 @@ static int ide_floppy_probe(struct device *dev)
                 printk("ide-floppy: passing drive %s to ide-scsi emulation.\n", drive->name);
                 goto failed;
         }
-        if ((floppy = (idefloppy_floppy_t *) kmalloc (sizeof (idefloppy_floppy_t), GFP_KERNEL)) == NULL) {
+        if ((floppy = (idefloppy_floppy_t *) kzalloc (sizeof (idefloppy_floppy_t), GFP_KERNEL)) == NULL) {
                 printk (KERN_ERR "ide-floppy: %s: Can't allocate a floppy structure\n", drive->name);
                 goto failed;
         }
@@ -2159,8 +2159,6 @@ static int ide_floppy_probe(struct device *dev)
 
         ide_register_subdriver(drive, &idefloppy_driver);
 
-        memset(floppy, 0, sizeof(*floppy));
-
         kref_init(&floppy->kref);
 
         floppy->drive = drive;
diff --git a/drivers/ide/ide-probe.c b/drivers/ide/ide-probe.c
index c1128ae5cd2f..02167a5b751d 100644
--- a/drivers/ide/ide-probe.c
+++ b/drivers/ide/ide-probe.c
@@ -596,14 +596,13 @@ static inline u8 probe_for_drive (ide_drive_t *drive)
          *      Also note that 0 everywhere means "can't do X"
          */
  
-        drive->id = kmalloc(SECTOR_WORDS *4, GFP_KERNEL);
+        drive->id = kzalloc(SECTOR_WORDS *4, GFP_KERNEL);
         drive->id_read = 0;
         if(drive->id == NULL)
         {
                 printk(KERN_ERR "ide: out of memory for id data.\n");
                 return 0;
         }
-        memset(drive->id, 0, SECTOR_WORDS * 4);
         strcpy(drive->id->model, "UNKNOWN");
         
         /* skip probing? */
@@ -1316,10 +1315,8 @@ static void drive_release_dev (struct device *dev)
                 drive->devfs_name[0] = '\0';
         }
         ide_remove_drive_from_hwgroup(drive);
-        if (drive->id != NULL) {
-                kfree(drive->id);
-                drive->id = NULL;
-        }
+        kfree(drive->id);
+        drive->id = NULL;
         drive->present = 0;
         /* Messed up locking ... */
         spin_unlock_irq(&ide_lock);
diff --git a/drivers/ide/ide-tape.c b/drivers/ide/ide-tape.c
index 47f2b832555f..0ac7eb8f40d5 100644
--- a/drivers/ide/ide-tape.c
+++ b/drivers/ide/ide-tape.c
@@ -4850,7 +4850,7 @@ static int ide_tape_probe(struct device *dev)
                 printk(KERN_WARNING "ide-tape: Use drive %s with ide-scsi emulation and osst.\n", drive->name);
                 printk(KERN_WARNING "ide-tape: OnStream support will be removed soon from ide-tape!\n");
         }
-        tape = (idetape_tape_t *) kmalloc (sizeof (idetape_tape_t), GFP_KERNEL);
+        tape = (idetape_tape_t *) kzalloc (sizeof (idetape_tape_t), GFP_KERNEL);
         if (tape == NULL) {
                 printk(KERN_ERR "ide-tape: %s: Can't allocate a tape structure\n", drive->name);
                 goto failed;
@@ -4864,8 +4864,6 @@ static int ide_tape_probe(struct device *dev)
 
         ide_register_subdriver(drive, &idetape_driver);
 
-        memset(tape, 0, sizeof(*tape));
-
         kref_init(&tape->kref);
 
         tape->drive = drive;
diff --git a/drivers/ide/ide-taskfile.c b/drivers/ide/ide-taskfile.c
index ace8edad6e96..7ec18fa3b5ff 100644
--- a/drivers/ide/ide-taskfile.c
+++ b/drivers/ide/ide-taskfile.c
@@ -528,9 +528,8 @@ int ide_taskfile_ioctl (ide_drive_t *drive, unsigned int cmd, unsigned long arg)
 
 //      printk("IDE Taskfile ...\n");
 
-        req_task = kmalloc(tasksize, GFP_KERNEL);
+        req_task = kzalloc(tasksize, GFP_KERNEL);
         if (req_task == NULL) return -ENOMEM;
-        memset(req_task, 0, tasksize);
         if (copy_from_user(req_task, buf, tasksize)) {
                 kfree(req_task);
                 return -EFAULT;
@@ -541,12 +540,11 @@ int ide_taskfile_ioctl (ide_drive_t *drive, unsigned int cmd, unsigned long arg)
 
         if (taskout) {
                 int outtotal = tasksize;
-                outbuf = kmalloc(taskout, GFP_KERNEL);
+                outbuf = kzalloc(taskout, GFP_KERNEL);
                 if (outbuf == NULL) {
                         err = -ENOMEM;
                         goto abort;
                 }
-                memset(outbuf, 0, taskout);
                 if (copy_from_user(outbuf, buf + outtotal, taskout)) {
                         err = -EFAULT;
                         goto abort;
@@ -555,12 +553,11 @@ int ide_taskfile_ioctl (ide_drive_t *drive, unsigned int cmd, unsigned long arg)
 
         if (taskin) {
                 int intotal = tasksize + taskout;
-                inbuf = kmalloc(taskin, GFP_KERNEL);
+                inbuf = kzalloc(taskin, GFP_KERNEL);
                 if (inbuf == NULL) {
                         err = -ENOMEM;
                         goto abort;
                 }
-                memset(inbuf, 0, taskin);
                 if (copy_from_user(inbuf, buf + intotal, taskin)) {
                         err = -EFAULT;
                         goto abort;
@@ -649,10 +646,8 @@ int ide_taskfile_ioctl (ide_drive_t *drive, unsigned int cmd, unsigned long arg)
         }
 abort:
         kfree(req_task);
-        if (outbuf != NULL)
-                kfree(outbuf);
-        if (inbuf != NULL)
-                kfree(inbuf);
+        kfree(outbuf);
+        kfree(inbuf);
 
 //      printk("IDE Taskfile ioctl ended. rc = %i\n", err);
 
@@ -709,10 +704,9 @@ int ide_cmd_ioctl (ide_drive_t *drive, unsigned int cmd, unsigned long arg)
 
         if (args[3]) {
                 argsize = 4 + (SECTOR_WORDS * 4 * args[3]);
-                argbuf = kmalloc(argsize, GFP_KERNEL);
+                argbuf = kzalloc(argsize, GFP_KERNEL);
                 if (argbuf == NULL)
                         return -ENOMEM;
-                memcpy(argbuf, args, 4);
         }
         if (set_transfer(drive, &tfargs)) {
                 xfer_rate = args[1];
diff --git a/drivers/ide/ide.c b/drivers/ide/ide.c
index 73ca8f73917d..9fe19808d815 100644
--- a/drivers/ide/ide.c
+++ b/drivers/ide/ide.c
@@ -864,9 +864,8 @@ static int __ide_add_setting(ide_drive_t *drive, const char *name, int rw, int r
         down(&ide_setting_sem);
         while ((*p) && strcmp((*p)->name, name) < 0)
                 p = &((*p)->next);
-        if ((setting = kmalloc(sizeof(*setting), GFP_KERNEL)) == NULL)
+        if ((setting = kzalloc(sizeof(*setting), GFP_KERNEL)) == NULL)
                 goto abort;
-        memset(setting, 0, sizeof(*setting));
         if ((setting->name = kmalloc(strlen(name) + 1, GFP_KERNEL)) == NULL)
                 goto abort;
         strcpy(setting->name, name);
@@ -889,8 +888,7 @@ static int __ide_add_setting(ide_drive_t *drive, const char *name, int rw, int r
         return 0;
 abort:
         up(&ide_setting_sem);
-        if (setting)
-                kfree(setting);
+        kfree(setting);
         return -1;
 }
 
diff --git a/drivers/ide/legacy/ide-cs.c b/drivers/ide/legacy/ide-cs.c
index a35a58bef1a4..1dafffa7e513 100644
--- a/drivers/ide/legacy/ide-cs.c
+++ b/drivers/ide/legacy/ide-cs.c
@@ -116,9 +116,8 @@ static dev_link_t *ide_attach(void)
     DEBUG(0, "ide_attach()\n");
 
     /* Create new ide device */
-    info = kmalloc(sizeof(*info), GFP_KERNEL);
+    info = kzalloc(sizeof(*info), GFP_KERNEL);
     if (!info) return NULL;
-    memset(info, 0, sizeof(*info));
     link = &info->link; link->priv = info;
 
     link->io.Attributes1 = IO_DATA_PATH_WIDTH_AUTO;
@@ -221,9 +220,8 @@ static void ide_config(dev_link_t *link)
 
     DEBUG(0, "ide_config(0x%p)\n", link);
 
-    stk = kmalloc(sizeof(*stk), GFP_KERNEL);
+    stk = kzalloc(sizeof(*stk), GFP_KERNEL);
     if (!stk) goto err_mem;
-    memset(stk, 0, sizeof(*stk));
     cfg = &stk->parse.cftable_entry;
 
     tuple.TupleData = (cisdata_t *)&stk->buf;
diff --git a/drivers/ide/pci/hpt366.c b/drivers/ide/pci/hpt366.c
index 127619a109ed..7b589d948bf9 100644
--- a/drivers/ide/pci/hpt366.c
+++ b/drivers/ide/pci/hpt366.c
@@ -1516,7 +1516,7 @@ static void __devinit init_dma_hpt366(ide_hwif_t *hwif, unsigned long dmabase)
 
 static void __devinit init_iops_hpt366(ide_hwif_t *hwif)
 {
-        struct hpt_info *info = kmalloc(sizeof(struct hpt_info), GFP_KERNEL);
+        struct hpt_info *info = kzalloc(sizeof(struct hpt_info), GFP_KERNEL);
         unsigned long dmabase = pci_resource_start(hwif->pci_dev, 4);
         u8 did, rid;
 
@@ -1524,7 +1524,6 @@ static void __devinit init_iops_hpt366(ide_hwif_t *hwif)
                 printk(KERN_WARNING "hpt366: out of memory.\n");
                 return;
         }
-        memset(info, 0, sizeof(struct hpt_info));
         ide_set_hwifdata(hwif, info);
 
         if(dmabase) {
diff --git a/drivers/ide/pci/it821x.c b/drivers/ide/pci/it821x.c
index e440036e651f..108fda83fea4 100644
--- a/drivers/ide/pci/it821x.c
+++ b/drivers/ide/pci/it821x.c
@@ -642,14 +642,13 @@ static void __devinit it821x_fixups(ide_hwif_t *hwif)
 
 static void __devinit init_hwif_it821x(ide_hwif_t *hwif)
 {
-        struct it821x_dev *idev = kmalloc(sizeof(struct it821x_dev), GFP_KERNEL);
+        struct it821x_dev *idev = kzalloc(sizeof(struct it821x_dev), GFP_KERNEL);
         u8 conf;
 
         if(idev == NULL) {
                 printk(KERN_ERR "it821x: out of memory, falling back to legacy behaviour.\n");
                 goto fallback;
         }
-        memset(idev, 0, sizeof(struct it821x_dev));
         ide_set_hwifdata(hwif, idev);
 
         pci_read_config_byte(hwif->pci_dev, 0x50, &conf);
diff --git a/drivers/ide/ppc/pmac.c b/drivers/ide/ppc/pmac.c
index d8c3d8ebad30..b3e65a65d202 100644
--- a/drivers/ide/ppc/pmac.c
+++ b/drivers/ide/ppc/pmac.c
@@ -497,16 +497,19 @@ pmu_hd_blink_init(void)
         if (pmu_get_model() != PMU_KEYLARGO_BASED)
                 return 0;
         
-        dt = find_devices("device-tree");
+        dt = of_find_node_by_path("/");
         if (dt == NULL)
                 return 0;
         model = (const char *)get_property(dt, "model", NULL);
         if (model == NULL)
                 return 0;
         if (strncmp(model, "PowerBook", strlen("PowerBook")) != 0 &&
-            strncmp(model, "iBook", strlen("iBook")) != 0)
+            strncmp(model, "iBook", strlen("iBook")) != 0) {
+                of_node_put(dt);
                 return 0;
-        
+        }
+        of_node_put(dt);
+
         pmu_blink_on.complete = 1;
         pmu_blink_off.complete = 1;
         spin_lock_init(&pmu_blink_lock);
diff --git a/drivers/ieee1394/amdtp.c b/drivers/ieee1394/amdtp.c
index e8e28569a668..75897509c401 100644
--- a/drivers/ieee1394/amdtp.c
+++ b/drivers/ieee1394/amdtp.c
@@ -320,8 +320,7 @@ static void ohci1394_stop_it_ctx(struct ti_ohci *ohci, int ctx, int synchronous)
                         if ((control & OHCI1394_CONTEXT_ACTIVE) == 0)
                                 break;
 
-                        set_current_state(TASK_INTERRUPTIBLE);
-                        schedule_timeout(1);
+                        schedule_timeout_interruptible(1);
                 }
         }
 }
diff --git a/drivers/infiniband/core/agent.c b/drivers/infiniband/core/agent.c
index 7545775d38ef..34b724afd28d 100644
--- a/drivers/infiniband/core/agent.c
+++ b/drivers/infiniband/core/agent.c
@@ -37,6 +37,9 @@
  * $Id: agent.c 1389 2004-12-27 22:56:47Z roland $
  */
 
+#include <linux/slab.h>
+#include <linux/string.h>
+
 #include "agent.h"
 #include "smi.h"
 
diff --git a/drivers/infiniband/core/mad.c b/drivers/infiniband/core/mad.c
index 3d8175e5f054..41d6b4017acb 100644
--- a/drivers/infiniband/core/mad.c
+++ b/drivers/infiniband/core/mad.c
@@ -508,8 +508,7 @@ static void unregister_mad_agent(struct ib_mad_agent_private *mad_agent_priv)
         wait_event(mad_agent_priv->wait,
                    !atomic_read(&mad_agent_priv->refcount));
 
-        if (mad_agent_priv->reg_req)
-                kfree(mad_agent_priv->reg_req);
+        kfree(mad_agent_priv->reg_req);
         ib_dereg_mr(mad_agent_priv->agent.mr);
         kfree(mad_agent_priv);
 }
@@ -2500,8 +2499,7 @@ error:
 static void destroy_mad_qp(struct ib_mad_qp_info *qp_info)
 {
         ib_destroy_qp(qp_info->qp);
-        if (qp_info->snoop_table)
-                kfree(qp_info->snoop_table);
+        kfree(qp_info->snoop_table);
 }
 
 /*
diff --git a/drivers/infiniband/core/packer.c b/drivers/infiniband/core/packer.c
index 35df5010e723..c972d7235764 100644
--- a/drivers/infiniband/core/packer.c
+++ b/drivers/infiniband/core/packer.c
@@ -33,6 +33,8 @@
  * $Id: packer.c 1349 2004-12-16 21:09:43Z roland $
  */
 
+#include <linux/string.h>
+
 #include <rdma/ib_pack.h>
 
 static u64 value_read(int offset, int size, void *structure)
diff --git a/drivers/infiniband/core/sysfs.c b/drivers/infiniband/core/sysfs.c
index b8120650e711..08648b1a387e 100644
--- a/drivers/infiniband/core/sysfs.c
+++ b/drivers/infiniband/core/sysfs.c
@@ -36,6 +36,9 @@
 
 #include "core_priv.h"
 
+#include <linux/slab.h>
+#include <linux/string.h>
+
 #include <rdma/ib_mad.h>
 
 struct ib_port {
diff --git a/drivers/infiniband/core/ud_header.c b/drivers/infiniband/core/ud_header.c
index 527b23450ab3..997c07db6d8f 100644
--- a/drivers/infiniband/core/ud_header.c
+++ b/drivers/infiniband/core/ud_header.c
@@ -34,6 +34,7 @@
  */
 
 #include <linux/errno.h>
+#include <linux/string.h>
 
 #include <rdma/ib_pack.h>
 
diff --git a/drivers/infiniband/core/verbs.c b/drivers/infiniband/core/verbs.c
index 72d3ef786db5..4186cc888ea5 100644
--- a/drivers/infiniband/core/verbs.c
+++ b/drivers/infiniband/core/verbs.c
@@ -40,6 +40,7 @@
 
 #include <linux/errno.h>
 #include <linux/err.h>
+#include <linux/string.h>
 
 #include <rdma/ib_verbs.h>
 #include <rdma/ib_cache.h>
diff --git a/drivers/infiniband/hw/mthca/mthca_catas.c b/drivers/infiniband/hw/mthca/mthca_catas.c
index 7ac52af43b99..25ebab64bc42 100644
--- a/drivers/infiniband/hw/mthca/mthca_catas.c
+++ b/drivers/infiniband/hw/mthca/mthca_catas.c
@@ -32,6 +32,9 @@
  * $Id$
  */
 
+#include <linux/jiffies.h>
+#include <linux/timer.h>
+
 #include "mthca_dev.h"
 
 enum {
diff --git a/drivers/infiniband/hw/mthca/mthca_srq.c b/drivers/infiniband/hw/mthca/mthca_srq.c
index 292f55be8cbd..26d5161fde07 100644
--- a/drivers/infiniband/hw/mthca/mthca_srq.c
+++ b/drivers/infiniband/hw/mthca/mthca_srq.c
@@ -32,6 +32,9 @@
  * $Id: mthca_srq.c 3047 2005-08-10 03:59:35Z roland $
  */
 
+#include <linux/slab.h>
+#include <linux/string.h>
+
 #include "mthca_dev.h"
 #include "mthca_cmd.h"
 #include "mthca_memfree.h"
diff --git a/drivers/input/input.c b/drivers/input/input.c
index 1a1654caedd5..0879915b14d5 100644
--- a/drivers/input/input.c
+++ b/drivers/input/input.c
@@ -377,7 +377,7 @@ static int input_devices_read(char *buf, char **start, off_t pos, int count, int
 
         list_for_each_entry(dev, &input_dev_list, node) {
 
-                path = dev->dynalloc ? kobject_get_path(&dev->cdev.kobj, GFP_KERNEL) : NULL;
+                path = kobject_get_path(&dev->cdev.kobj, GFP_KERNEL);
 
                 len = sprintf(buf, "I: Bus=%04x Vendor=%04x Product=%04x Version=%04x\n",
                         dev->id.bustype, dev->id.vendor, dev->id.product, dev->id.version);
@@ -741,15 +741,21 @@ static void input_register_classdevice(struct input_dev *dev)
         sysfs_create_group(&dev->cdev.kobj, &input_dev_caps_attr_group);
 }
 
-void input_register_device(struct input_dev *dev)
+int input_register_device(struct input_dev *dev)
 {
         struct input_handle *handle;
         struct input_handler *handler;
         struct input_device_id *id;
 
-        set_bit(EV_SYN, dev->evbit);
+        if (!dev->dynalloc) {
+                printk(KERN_WARNING "input: device %s is statically allocated, will not register\n"
+                        "Please convert to input_allocate_device() or contact dtor_core@ameritech.net\n",
+                        dev->name ? dev->name : "<Unknown>");
+                return -EINVAL;
+        }
 
         init_MUTEX(&dev->sem);
+        set_bit(EV_SYN, dev->evbit);
 
         /*
          * If delay and period are pre-set by the driver, then autorepeating
@@ -767,8 +773,7 @@ void input_register_device(struct input_dev *dev)
         INIT_LIST_HEAD(&dev->h_list);
         list_add_tail(&dev->node, &input_dev_list);
 
-        if (dev->dynalloc)
-                input_register_classdevice(dev);
+        input_register_classdevice(dev);
 
         list_for_each_entry(handler, &input_handler_list, node)
                 if (!handler->blacklist || !input_match_device(handler->blacklist, dev))
@@ -776,8 +781,9 @@ void input_register_device(struct input_dev *dev)
                                 if ((handle = handler->connect(handler, dev, id)))
                                         input_link_handle(handle);
 
-
         input_wakeup_procfs_readers();
+
+        return 0;
 }
 
 void input_unregister_device(struct input_dev *dev)
@@ -797,11 +803,10 @@ void input_unregister_device(struct input_dev *dev)
 
         list_del_init(&dev->node);
 
-        if (dev->dynalloc) {
-                sysfs_remove_group(&dev->cdev.kobj, &input_dev_caps_attr_group);
-                sysfs_remove_group(&dev->cdev.kobj, &input_dev_id_attr_group);
-                class_device_unregister(&dev->cdev);
-        }
+        sysfs_remove_group(&dev->cdev.kobj, &input_dev_caps_attr_group);
+        sysfs_remove_group(&dev->cdev.kobj, &input_dev_id_attr_group);
+        sysfs_remove_group(&dev->cdev.kobj, &input_dev_group);
+        class_device_unregister(&dev->cdev);
 
         input_wakeup_procfs_readers();
 }
diff --git a/drivers/input/keyboard/lkkbd.c b/drivers/input/keyboard/lkkbd.c
index 9481132532d0..77c4d9669ad0 100644
--- a/drivers/input/keyboard/lkkbd.c
+++ b/drivers/input/keyboard/lkkbd.c
@@ -273,11 +273,11 @@ static lk_keycode_t lkkbd_keycode[LK_NUM_KEYCODES] = {
         [0xfb] = KEY_APOSTROPHE,
 };
 
-#define CHECK_LED(LED, BITS) do {               \
-        if (test_bit (LED, lk->dev->led))       \
-                leds_on |= BITS;                \
-        else                                    \
-                leds_off |= BITS;               \
+#define CHECK_LED(LK, VAR_ON, VAR_OFF, LED, BITS) do {          \
+        if (test_bit (LED, (LK)->dev->led))                     \
+                VAR_ON |= BITS;                                 \
+        else                                                    \
+                VAR_OFF |= BITS;                                \
         } while (0)
 
 /*
@@ -298,6 +298,42 @@ struct lkkbd {
         int ctrlclick_volume;
 };
 
+#ifdef LKKBD_DEBUG
+/*
+ * Responses from the keyboard and mapping back to their names.
+ */
+static struct {
+        unsigned char value;
+        unsigned char *name;
+} lk_response[] = {
+#define RESPONSE(x) { .value = (x), .name = #x, }
+        RESPONSE (LK_STUCK_KEY),
+        RESPONSE (LK_SELFTEST_FAILED),
+        RESPONSE (LK_ALL_KEYS_UP),
+        RESPONSE (LK_METRONOME),
+        RESPONSE (LK_OUTPUT_ERROR),
+        RESPONSE (LK_INPUT_ERROR),
+        RESPONSE (LK_KBD_LOCKED),
+        RESPONSE (LK_KBD_TEST_MODE_ACK),
+        RESPONSE (LK_PREFIX_KEY_DOWN),
+        RESPONSE (LK_MODE_CHANGE_ACK),
+        RESPONSE (LK_RESPONSE_RESERVED),
+#undef RESPONSE
+};
+
+static unsigned char *
+response_name (unsigned char value)
+{
+        int i;
+
+        for (i = 0; i < ARRAY_SIZE (lk_response); i++)
+                if (lk_response[i].value == value)
+                        return lk_response[i].name;
+
+        return "<unknown>";
+}
+#endif /* LKKBD_DEBUG */
+
 /*
  * Calculate volume parameter byte for a given volume.
  */
@@ -440,43 +476,24 @@ lkkbd_interrupt (struct serio *serio, unsigned char data, unsigned int flags,
                                         input_report_key (lk->dev, lk->keycode[i], 0);
                         input_sync (lk->dev);
                         break;
-                case LK_METRONOME:
-                        DBG (KERN_INFO "Got LK_METRONOME and don't "
-                                        "know how to handle...\n");
+
+                case 0x01:
+                        DBG (KERN_INFO "Got 0x01, scheduling re-initialization\n");
+                        lk->ignore_bytes = LK_NUM_IGNORE_BYTES;
+                        lk->id[LK_NUM_IGNORE_BYTES - lk->ignore_bytes--] = data;
+                        schedule_work (&lk->tq);
                         break;
+
+                case LK_METRONOME:
                 case LK_OUTPUT_ERROR:
-                        DBG (KERN_INFO "Got LK_OUTPUT_ERROR and don't "
-                                        "know how to handle...\n");
-                        break;
                 case LK_INPUT_ERROR:
-                        DBG (KERN_INFO "Got LK_INPUT_ERROR and don't "
-                                        "know how to handle...\n");
-                        break;
                 case LK_KBD_LOCKED:
-                        DBG (KERN_INFO "Got LK_KBD_LOCKED and don't "
-                                        "know how to handle...\n");
-                        break;
                 case LK_KBD_TEST_MODE_ACK:
-                        DBG (KERN_INFO "Got LK_KBD_TEST_MODE_ACK and don't "
-                                        "know how to handle...\n");
-                        break;
                 case LK_PREFIX_KEY_DOWN:
-                        DBG (KERN_INFO "Got LK_PREFIX_KEY_DOWN and don't "
-                                        "know how to handle...\n");
-                        break;
                 case LK_MODE_CHANGE_ACK:
-                        DBG (KERN_INFO "Got LK_MODE_CHANGE_ACK and ignored "
-                                        "it properly...\n");
-                        break;
                 case LK_RESPONSE_RESERVED:
-                        DBG (KERN_INFO "Got LK_RESPONSE_RESERVED and don't "
-                                        "know how to handle...\n");
-                        break;
-                case 0x01:
-                        DBG (KERN_INFO "Got 0x01, scheduling re-initialization\n");
-                        lk->ignore_bytes = LK_NUM_IGNORE_BYTES;
-                        lk->id[LK_NUM_IGNORE_BYTES - lk->ignore_bytes--] = data;
-                        schedule_work (&lk->tq);
+                        DBG (KERN_INFO "Got %s and don't know how to handle...\n",
+                                        response_name (data));
                         break;
 
                 default:
@@ -509,10 +526,10 @@ lkkbd_event (struct input_dev *dev, unsigned int type, unsigned int code,
 
         switch (type) {
                 case EV_LED:
-                        CHECK_LED (LED_CAPSL, LK_LED_SHIFTLOCK);
-                        CHECK_LED (LED_COMPOSE, LK_LED_COMPOSE);
-                        CHECK_LED (LED_SCROLLL, LK_LED_SCROLLLOCK);
-                        CHECK_LED (LED_SLEEP, LK_LED_WAIT);
+                        CHECK_LED (lk, leds_on, leds_off, LED_CAPSL, LK_LED_SHIFTLOCK);
+                        CHECK_LED (lk, leds_on, leds_off, LED_COMPOSE, LK_LED_COMPOSE);
+                        CHECK_LED (lk, leds_on, leds_off, LED_SCROLLL, LK_LED_SCROLLLOCK);
+                        CHECK_LED (lk, leds_on, leds_off, LED_SLEEP, LK_LED_WAIT);
                         if (leds_on != 0) {
                                 lk->serio->write (lk->serio, LK_CMD_LED_ON);
                                 lk->serio->write (lk->serio, leds_on);
@@ -574,10 +591,10 @@ lkkbd_reinit (void *data)
         lk->serio->write (lk->serio, LK_CMD_SET_DEFAULTS);
 
         /* Set LEDs */
-        CHECK_LED (LED_CAPSL, LK_LED_SHIFTLOCK);
-        CHECK_LED (LED_COMPOSE, LK_LED_COMPOSE);
-        CHECK_LED (LED_SCROLLL, LK_LED_SCROLLLOCK);
-        CHECK_LED (LED_SLEEP, LK_LED_WAIT);
+        CHECK_LED (lk, leds_on, leds_off, LED_CAPSL, LK_LED_SHIFTLOCK);
+        CHECK_LED (lk, leds_on, leds_off, LED_COMPOSE, LK_LED_COMPOSE);
+        CHECK_LED (lk, leds_on, leds_off, LED_SCROLLL, LK_LED_SCROLLLOCK);
+        CHECK_LED (lk, leds_on, leds_off, LED_SLEEP, LK_LED_WAIT);
         if (leds_on != 0) {
                 lk->serio->write (lk->serio, LK_CMD_LED_ON);
                 lk->serio->write (lk->serio, leds_on);
diff --git a/drivers/input/keyboard/locomokbd.c b/drivers/input/keyboard/locomokbd.c
index 8935290256b3..2c510881874a 100644
--- a/drivers/input/keyboard/locomokbd.c
+++ b/drivers/input/keyboard/locomokbd.c
@@ -76,7 +76,7 @@ static unsigned char locomokbd_keycode[LOCOMOKBD_NUMKEYS] = {
 
 struct locomokbd {
         unsigned char keycode[LOCOMOKBD_NUMKEYS];
-        struct input_dev input;
+        struct input_dev *input;
         char phys[32];
 
         struct locomo_dev *ldev;
@@ -136,8 +136,7 @@ static void locomokbd_scankeyboard(struct locomokbd *locomokbd, struct pt_regs *
 
         spin_lock_irqsave(&locomokbd->lock, flags);
 
-        if (regs)
-                input_regs(&locomokbd->input, regs);
+        input_regs(locomokbd->input, regs);
 
         locomokbd_charge_all(membase);
 
@@ -152,16 +151,16 @@ static void locomokbd_scankeyboard(struct locomokbd *locomokbd, struct pt_regs *
                         scancode = SCANCODE(col, row);
                         if (rowd & KB_ROWMASK(row)) {
                                 num_pressed += 1;
-                                input_report_key(&locomokbd->input, locomokbd->keycode[scancode], 1);
+                                input_report_key(locomokbd->input, locomokbd->keycode[scancode], 1);
                         } else {
-                                input_report_key(&locomokbd->input, locomokbd->keycode[scancode], 0);
+                                input_report_key(locomokbd->input, locomokbd->keycode[scancode], 0);
                         }
                 }
                 locomokbd_reset_col(membase, col);
         }
         locomokbd_activate_all(membase);
 
-        input_sync(&locomokbd->input);
+        input_sync(locomokbd->input);
 
         /* if any keys are pressed, enable the timer */
         if (num_pressed)
@@ -196,13 +195,15 @@ static void locomokbd_timer_callback(unsigned long data)
 static int locomokbd_probe(struct locomo_dev *dev)
 {
         struct locomokbd *locomokbd;
+        struct input_dev *input_dev;
         int i, ret;
 
-        locomokbd = kmalloc(sizeof(struct locomokbd), GFP_KERNEL);
-        if (!locomokbd)
-                return -ENOMEM;
-
-        memset(locomokbd, 0, sizeof(struct locomokbd));
+        locomokbd = kzalloc(sizeof(struct locomokbd), GFP_KERNEL);
+        input_dev = input_allocate_device();
+        if (!locomokbd || !input_dev) {
+                ret = -ENOMEM;
+                goto free;
+        }
 
         /* try and claim memory region */
         if (!request_mem_region((unsigned long) dev->mapbase,
@@ -224,27 +225,26 @@ static int locomokbd_probe(struct locomo_dev *dev)
         locomokbd->timer.function = locomokbd_timer_callback;
         locomokbd->timer.data = (unsigned long) locomokbd;
 
-        locomokbd->input.evbit[0] = BIT(EV_KEY) | BIT(EV_REP);
+        locomokbd->input = input_dev;
+        strcpy(locomokbd->phys, "locomokbd/input0");
+
+        input_dev->name = "LoCoMo keyboard";
+        input_dev->phys = locomokbd->phys;
+        input_dev->id.bustype = BUS_HOST;
+        input_dev->id.vendor = 0x0001;
+        input_dev->id.product = 0x0001;
+        input_dev->id.version = 0x0100;
+        input_dev->private = locomokbd;
 
-        init_input_dev(&locomokbd->input);
-        locomokbd->input.keycode = locomokbd->keycode;
-        locomokbd->input.keycodesize = sizeof(unsigned char);
-        locomokbd->input.keycodemax = ARRAY_SIZE(locomokbd_keycode);
-        locomokbd->input.private = locomokbd;
+        input_dev->evbit[0] = BIT(EV_KEY) | BIT(EV_REP);
+        input_dev->keycode = locomokbd->keycode;
+        input_dev->keycodesize = sizeof(unsigned char);
+        input_dev->keycodemax = ARRAY_SIZE(locomokbd_keycode);
 
         memcpy(locomokbd->keycode, locomokbd_keycode, sizeof(locomokbd->keycode));
         for (i = 0; i < LOCOMOKBD_NUMKEYS; i++)
-                set_bit(locomokbd->keycode[i], locomokbd->input.keybit);
-        clear_bit(0, locomokbd->input.keybit);
-
-        strcpy(locomokbd->phys, "locomokbd/input0");
-
-        locomokbd->input.name = "LoCoMo keyboard";
-        locomokbd->input.phys = locomokbd->phys;
-        locomokbd->input.id.bustype = BUS_XTKBD;
-        locomokbd->input.id.vendor = 0x0001;
-        locomokbd->input.id.product = 0x0001;
-        locomokbd->input.id.version = 0x0100;
+                set_bit(locomokbd->keycode[i], input_dev->keybit);
+        clear_bit(0, input_dev->keybit);
 
         /* attempt to get the interrupt */
         ret = request_irq(dev->irq[0], locomokbd_interrupt, 0, "locomokbd", locomokbd);
@@ -253,9 +253,7 @@ static int locomokbd_probe(struct locomo_dev *dev)
                 goto out;
         }
 
-        input_register_device(&locomokbd->input);
-
-        printk(KERN_INFO "input: LoCoMo keyboard on locomokbd\n");
+        input_register_device(locomokbd->input);
 
         return 0;
 
@@ -263,6 +261,7 @@ out:
         release_mem_region((unsigned long) dev->mapbase, dev->length);
         locomo_set_drvdata(dev, NULL);
 free:
+        input_free_device(input_dev);
         kfree(locomokbd);
 
         return ret;
@@ -276,7 +275,7 @@ static int locomokbd_remove(struct locomo_dev *dev)
 
         del_timer_sync(&locomokbd->timer);
 
-        input_unregister_device(&locomokbd->input);
+        input_unregister_device(locomokbd->input);
         locomo_set_drvdata(dev, NULL);
 
         release_mem_region((unsigned long) dev->mapbase, dev->length);
diff --git a/drivers/input/misc/uinput.c b/drivers/input/misc/uinput.c
index 4015a91f4b6e..948c1cc01bc9 100644
--- a/drivers/input/misc/uinput.c
+++ b/drivers/input/misc/uinput.c
@@ -271,8 +271,7 @@ static int uinput_alloc_device(struct file *file, const char __user *buffer, siz
                 goto exit;
         }
 
-        if (dev->name)
-                kfree(dev->name);
+        kfree(dev->name);
 
         size = strnlen(user_dev->name, UINPUT_MAX_NAME_SIZE) + 1;
         dev->name = name = kmalloc(size, GFP_KERNEL);
@@ -372,11 +371,8 @@ static int uinput_burn_device(struct uinput_device *udev)
         if (test_bit(UIST_CREATED, &udev->state))
                 uinput_destroy_device(udev);
 
-        if (udev->dev->name)
-                kfree(udev->dev->name);
-        if (udev->dev->phys)
-                kfree(udev->dev->phys);
-
+        kfree(udev->dev->name);
+        kfree(udev->dev->phys);
         kfree(udev->dev);
         kfree(udev);
 
diff --git a/drivers/input/mouse/logips2pp.c b/drivers/input/mouse/logips2pp.c
index 0f69ff46c1ae..31a59f7abfaf 100644
--- a/drivers/input/mouse/logips2pp.c
+++ b/drivers/input/mouse/logips2pp.c
@@ -217,6 +217,9 @@ static struct ps2pp_info *get_model_info(unsigned char model)
                 { 61,   PS2PP_KIND_MX,                                  /* MX700 */
                                 PS2PP_WHEEL | PS2PP_SIDE_BTN | PS2PP_TASK_BTN |
                                 PS2PP_EXTRA_BTN | PS2PP_NAV_BTN },
+                { 66,   PS2PP_KIND_MX,                                  /* MX3100 reciver */
+                                PS2PP_WHEEL | PS2PP_SIDE_BTN | PS2PP_TASK_BTN |
+                                PS2PP_EXTRA_BTN | PS2PP_NAV_BTN | PS2PP_HWHEEL },
                 { 73,   0,                      PS2PP_SIDE_BTN },
                 { 75,   PS2PP_KIND_WHEEL,       PS2PP_WHEEL },
                 { 76,   PS2PP_KIND_WHEEL,       PS2PP_WHEEL },
diff --git a/drivers/isdn/hardware/avm/avm_cs.c b/drivers/isdn/hardware/avm/avm_cs.c
index db9bad2b3d16..27391c32f3eb 100644
--- a/drivers/isdn/hardware/avm/avm_cs.c
+++ b/drivers/isdn/hardware/avm/avm_cs.c
@@ -212,11 +212,8 @@ static void avmcs_detach(dev_link_t *link)
     
     /* Unlink device structure, free pieces */
     *linkp = link->next;
-    if (link->priv) {
-        kfree(link->priv);
-    }
+    kfree(link->priv);
     kfree(link);
-    
 } /* avmcs_detach */
 
 /*======================================================================
diff --git a/drivers/isdn/hisax/avm_pci.c b/drivers/isdn/hisax/avm_pci.c
index 625799ab0d14..5d8ee7368f7b 100644
--- a/drivers/isdn/hisax/avm_pci.c
+++ b/drivers/isdn/hisax/avm_pci.c
@@ -552,14 +552,10 @@ close_hdlcstate(struct BCState *bcs)
 {
         modehdlc(bcs, 0, 0);
         if (test_and_clear_bit(BC_FLG_INIT, &bcs->Flag)) {
-                if (bcs->hw.hdlc.rcvbuf) {
-                        kfree(bcs->hw.hdlc.rcvbuf);
-                        bcs->hw.hdlc.rcvbuf = NULL;
-                }
-                if (bcs->blog) {
-                        kfree(bcs->blog);
-                        bcs->blog = NULL;
-                }
+                kfree(bcs->hw.hdlc.rcvbuf);
+                bcs->hw.hdlc.rcvbuf = NULL;
+                kfree(bcs->blog);
+                bcs->blog = NULL;
                 skb_queue_purge(&bcs->rqueue);
                 skb_queue_purge(&bcs->squeue);
                 if (bcs->tx_skb) {
diff --git a/drivers/isdn/hisax/avma1_cs.c b/drivers/isdn/hisax/avma1_cs.c
index 0e22991635e7..5f5a5ae740d2 100644
--- a/drivers/isdn/hisax/avma1_cs.c
+++ b/drivers/isdn/hisax/avma1_cs.c
@@ -236,9 +236,7 @@ static void avma1cs_detach(dev_link_t *link)
     
     /* Unlink device structure, free pieces */
     *linkp = link->next;
-    if (link->priv) {
-        kfree(link->priv);
-    }
+    kfree(link->priv);
     kfree(link);
     
 } /* avma1cs_detach */
diff --git a/drivers/isdn/hisax/config.c b/drivers/isdn/hisax/config.c
index fbaab4352902..8159bcecd0c2 100644
--- a/drivers/isdn/hisax/config.c
+++ b/drivers/isdn/hisax/config.c
@@ -787,8 +787,7 @@ static void ll_unload(struct IsdnCardState *cs)
         ic.command = ISDN_STAT_UNLOAD;
         ic.driver = cs->myid;
         cs->iif.statcallb(&ic);
-        if (cs->status_buf)
-                kfree(cs->status_buf);
+        kfree(cs->status_buf);
         cs->status_read = NULL;
         cs->status_write = NULL;
         cs->status_end = NULL;
@@ -807,10 +806,8 @@ static void closecard(int cardnr)
 
         skb_queue_purge(&csta->rq);
         skb_queue_purge(&csta->sq);
-        if (csta->rcvbuf) {
-                kfree(csta->rcvbuf);
-                csta->rcvbuf = NULL;
-        }
+        kfree(csta->rcvbuf);
+        csta->rcvbuf = NULL;
         if (csta->tx_skb) {
                 dev_kfree_skb(csta->tx_skb);
                 csta->tx_skb = NULL;
diff --git a/drivers/isdn/hisax/hfc_2bds0.c b/drivers/isdn/hisax/hfc_2bds0.c
index 7cf87793e790..637a261c9312 100644
--- a/drivers/isdn/hisax/hfc_2bds0.c
+++ b/drivers/isdn/hisax/hfc_2bds0.c
@@ -1052,18 +1052,12 @@ init2bds0(struct IsdnCardState *cs)
 void
 release2bds0(struct IsdnCardState *cs)
 {
-        if (cs->bcs[0].hw.hfc.send) {
-                kfree(cs->bcs[0].hw.hfc.send);
-                cs->bcs[0].hw.hfc.send = NULL;
-        }
-        if (cs->bcs[1].hw.hfc.send) {
-                kfree(cs->bcs[1].hw.hfc.send);
-                cs->bcs[1].hw.hfc.send = NULL;
-        }
-        if (cs->hw.hfcD.send) {
-                kfree(cs->hw.hfcD.send);
-                cs->hw.hfcD.send = NULL;
-        }
+        kfree(cs->bcs[0].hw.hfc.send);
+        cs->bcs[0].hw.hfc.send = NULL;
+        kfree(cs->bcs[1].hw.hfc.send);
+        cs->bcs[1].hw.hfc.send = NULL;
+        kfree(cs->hw.hfcD.send);
+        cs->hw.hfcD.send = NULL;
 }
 
 void
diff --git a/drivers/isdn/hisax/hfc_2bs0.c b/drivers/isdn/hisax/hfc_2bs0.c
index f978a5af8662..c964539cc43e 100644
--- a/drivers/isdn/hisax/hfc_2bs0.c
+++ b/drivers/isdn/hisax/hfc_2bs0.c
@@ -582,12 +582,8 @@ inithfc(struct IsdnCardState *cs)
 void
 releasehfc(struct IsdnCardState *cs)
 {
-        if (cs->bcs[0].hw.hfc.send) {
-                kfree(cs->bcs[0].hw.hfc.send);
-                cs->bcs[0].hw.hfc.send = NULL;
-        }
-        if (cs->bcs[1].hw.hfc.send) {
-                kfree(cs->bcs[1].hw.hfc.send);
-                cs->bcs[1].hw.hfc.send = NULL;
-        }
+        kfree(cs->bcs[0].hw.hfc.send);
+        cs->bcs[0].hw.hfc.send = NULL;
+        kfree(cs->bcs[1].hw.hfc.send);
+        cs->bcs[1].hw.hfc.send = NULL;
 }
diff --git a/drivers/isdn/hisax/hfc_usb.c b/drivers/isdn/hisax/hfc_usb.c
index e2c3af49d72b..32bf0d5d0f9a 100644
--- a/drivers/isdn/hisax/hfc_usb.c
+++ b/drivers/isdn/hisax/hfc_usb.c
@@ -1,7 +1,7 @@
 /*
  * hfc_usb.c
  *
- * $Id: hfc_usb.c,v 4.34 2005/01/26 17:25:53 martinb1 Exp $
+ * $Id: hfc_usb.c,v 4.36 2005/04/08 09:55:13 martinb1 Exp $
  *
  * modular HiSax ISDN driver for Colognechip HFC-S USB chip
  *
@@ -44,12 +44,8 @@
 #include "hisax_if.h"
 #include "hfc_usb.h"
 
-/*
-* Version Information
-* (do not modify the CVS Makros $Revision: 4.34 $ and $Date: 2005/01/26 17:25:53 $ !)
-*/
 static const char *hfcusb_revision =
-    "Revision: 4.34 $ Date: 2005/01/26 17:25:53 $ ";
+    "$Revision: 4.36 $ $Date: 2005/04/08 09:55:13 $ ";
 
 /* Hisax debug support
 * use "modprobe debug=x" where x is bitfield of USB_DBG & ISDN_DBG
@@ -63,81 +59,89 @@ module_param(debug, uint, 0);
 static int hfc_debug;
 #endif
 
+/* private vendor specific data */
+typedef struct {
+        __u8 led_scheme;        // led display scheme
+        signed short led_bits[8];       // array of 8 possible LED bitmask settings
+        char *vend_name;        // device name
+} hfcsusb_vdata;
 
 /****************************************/
 /* data defining the devices to be used */
 /****************************************/
-static struct usb_device_id hfc_usb_idtab[] = {
-        {USB_DEVICE(0x0959, 0x2bd0)},   /* Colognechip USB eval TA */
-        {USB_DEVICE(0x0675, 0x1688)},   /* DrayTek miniVigor 128 USB ISDN TA */
-        {USB_DEVICE(0x07b0, 0x0007)},   /* Billion USB TA 2 */
-        {USB_DEVICE(0x0742, 0x2008)},   /* Stollmann USB TA */
-        {USB_DEVICE(0x0742, 0x2009)},   /* Aceex USB ISDN TA */
-        {USB_DEVICE(0x0742, 0x200A)},   /* OEM USB ISDN TA */
-        {USB_DEVICE(0x08e3, 0x0301)},   /* OliTec ISDN USB */
-        {USB_DEVICE(0x07fa, 0x0846)},   /* Bewan ISDN USB TA */
-        {USB_DEVICE(0x07fa, 0x0847)},   /* Djinn Numeris USB */
-        {USB_DEVICE(0x07b0, 0x0006)},   /* Twister ISDN USB TA */
-        {}                      /* end with an all-zeroes entry */
+static struct usb_device_id hfcusb_idtab[] = {
+        {
+         .idVendor = 0x0959,
+         .idProduct = 0x2bd0,
+         .driver_info = (unsigned long) &((hfcsusb_vdata)
+                          {LED_OFF, {4, 0, 2, 1},
+                           "ISDN USB TA (Cologne Chip HFC-S USB based)"}),
+        },
+        {
+         .idVendor = 0x0675,
+         .idProduct = 0x1688,
+         .driver_info = (unsigned long) &((hfcsusb_vdata)
+                          {LED_SCHEME1, {1, 2, 0, 0},
+                           "DrayTek miniVigor 128 USB ISDN TA"}),
+        },
+        {
+         .idVendor = 0x07b0,
+         .idProduct = 0x0007,
+         .driver_info = (unsigned long) &((hfcsusb_vdata)
+                          {LED_SCHEME1, {0x80, -64, -32, -16},
+                           "Billion tiny USB ISDN TA 128"}),
+        },
+        {
+         .idVendor = 0x0742,
+         .idProduct = 0x2008,
+         .driver_info = (unsigned long) &((hfcsusb_vdata)
+                          {LED_SCHEME1, {4, 0, 2, 1},
+                           "Stollmann USB TA"}),
+         },
+        {
+         .idVendor = 0x0742,
+         .idProduct = 0x2009,
+         .driver_info = (unsigned long) &((hfcsusb_vdata)
+                          {LED_SCHEME1, {4, 0, 2, 1},
+                           "Aceex USB ISDN TA"}),
+         },
+        {
+         .idVendor = 0x0742,
+         .idProduct = 0x200A,
+         .driver_info = (unsigned long) &((hfcsusb_vdata)
+                          {LED_SCHEME1, {4, 0, 2, 1},
+                           "OEM USB ISDN TA"}),
+         },
+        {
+         .idVendor = 0x08e3,
+         .idProduct = 0x0301,
+         .driver_info = (unsigned long) &((hfcsusb_vdata)
+                          {LED_SCHEME1, {2, 0, 1, 4},
+                           "Olitec USB RNIS"}),
+         },
+        {
+         .idVendor = 0x07fa,
+         .idProduct = 0x0846,
+         .driver_info = (unsigned long) &((hfcsusb_vdata)
+                          {LED_SCHEME1, {0x80, -64, -32, -16},
+                           "Bewan Modem RNIS USB"}),
+         },
+        {
+         .idVendor = 0x07fa,
+         .idProduct = 0x0847,
+         .driver_info = (unsigned long) &((hfcsusb_vdata)
+                          {LED_SCHEME1, {0x80, -64, -32, -16},
+                           "Djinn Numeris USB"}),
+         },
+        {
+         .idVendor = 0x07b0,
+         .idProduct = 0x0006,
+         .driver_info = (unsigned long) &((hfcsusb_vdata)
+                          {LED_SCHEME1, {0x80, -64, -32, -16},
+                           "Twister ISDN TA"}),
+         },
 };
 
-/* driver internal device specific data:
-*   VendorID, ProductID, Devicename, LED_SCHEME,
-*   LED's BitMask in HFCUSB_P_DATA Register : LED_USB, LED_S0, LED_B1, LED_B2
-*/
-static vendor_data vdata[] = {
-        /* CologneChip Eval TA */
-        {0x0959, 0x2bd0, "ISDN USB TA (Cologne Chip HFC-S USB based)",
-         LED_OFF, {4, 0, 2, 1}
-         }
-        ,
-        /* DrayTek miniVigor 128 USB ISDN TA */
-        {0x0675, 0x1688, "DrayTek miniVigor 128 USB ISDN TA",
-         LED_SCHEME1, {1, 2, 0, 0}
-         }
-        ,
-        /* Billion TA */
-        {0x07b0, 0x0007, "Billion tiny USB ISDN TA 128",
-         LED_SCHEME1, {0x80, -64, -32, -16}
-         }
-        ,
-        /* Stollmann TA */
-        {0x0742, 0x2008, "Stollmann USB TA",
-         LED_SCHEME1, {4, 0, 2, 1}
-         }
-        ,
-        /* Aceex USB ISDN TA */
-        {0x0742, 0x2009, "Aceex USB ISDN TA",
-         LED_SCHEME1, {4, 0, 2, 1}
-         }
-        ,
-        /* OEM USB ISDN TA */
-        {0x0742, 0x200A, "OEM USB ISDN TA",
-         LED_SCHEME1, {4, 0, 2, 1}
-         }
-        ,
-        /* Olitec TA  */
-        {0x08e3, 0x0301, "Olitec USB RNIS",
-         LED_SCHEME1, {2, 0, 1, 4}
-         }
-        ,
-        /* Bewan TA   */
-        {0x07fa, 0x0846, "Bewan Modem RNIS USB",
-         LED_SCHEME1, {0x80, -64, -32, -16}
-         }
-        ,
-        /* Bewan TA   */
-        {0x07fa, 0x0847, "Djinn Numeris USB",
-         LED_SCHEME1, {0x80, -64, -32, -16}
-         }
-        ,
-        /* Twister ISDN TA   */
-        {0x07b0, 0x0006, "Twister ISDN TA",
-         LED_SCHEME1, {0x80, -64, -32, -16}
-         }
-        ,
-        {0, 0, 0}               /* EOL element */
-};
 
 /***************************************************************/
 /* structure defining input+output fifos (interrupt/bulk mode) */
@@ -211,8 +215,6 @@ typedef struct hfcusb_data {
         volatile __u8 l1_state; /* actual l1 state */
         struct timer_list t3_timer;     /* timer 3 for activation/deactivation */
         struct timer_list t4_timer;     /* timer 4 for activation/deactivation */
-        struct timer_list led_timer;    /* timer flashing leds */
-
 } hfcusb_data;
 
 
@@ -227,7 +229,7 @@ symbolic(struct hfcusb_symbolic_list list[], const int num)
         for (i = 0; list[i].name != NULL; i++)
                 if (list[i].num == num)
                         return (list[i].name);
-        return "<unkown>";
+        return "<unkown ERROR>";
 }
 
 
@@ -335,93 +337,57 @@ set_led_bit(hfcusb_data * hfc, signed short led_bits, int unset)
         }
 }
 
-/******************************************/
-/* invert B-channel LEDs if data is sent  */
-/******************************************/
-static void
-led_timer(hfcusb_data * hfc)
-{
-        static int cnt = 0;
-
-        if (cnt) {
-                if (hfc->led_b_active & 1)
-                        set_led_bit(hfc, vdata[hfc->vend_idx].led_bits[2],
-                                    0);
-                if (hfc->led_b_active & 2)
-                        set_led_bit(hfc, vdata[hfc->vend_idx].led_bits[3],
-                                    0);
-        } else {
-                if (!(hfc->led_b_active & 1) || hfc->led_new_data & 1)
-                        set_led_bit(hfc, vdata[hfc->vend_idx].led_bits[2],
-                                    1);
-                if (!(hfc->led_b_active & 2) || hfc->led_new_data & 2)
-                        set_led_bit(hfc, vdata[hfc->vend_idx].led_bits[3],
-                                    1);
-        }
-
-        write_led(hfc, hfc->led_state);
-        hfc->led_new_data = 0;
-
-        cnt = !cnt;
-
-        /* restart 4 hz timer */
-        if (!timer_pending(&hfc->led_timer)) {
-                add_timer(&hfc->led_timer);
-                hfc->led_timer.expires = jiffies + (LED_TIME * HZ) / 1000;
-        }
-}
-
 /**************************/
 /* handle LED requests    */
 /**************************/
 static void
 handle_led(hfcusb_data * hfc, int event)
 {
+        hfcsusb_vdata *driver_info =
+            (hfcsusb_vdata *) hfcusb_idtab[hfc->vend_idx].driver_info;
+
         /* if no scheme -> no LED action */
-        if (vdata[hfc->vend_idx].led_scheme == LED_OFF)
+        if (driver_info->led_scheme == LED_OFF)
                 return;
 
         switch (event) {
                 case LED_POWER_ON:
-                        set_led_bit(hfc, vdata[hfc->vend_idx].led_bits[0],
+                        set_led_bit(hfc, driver_info->led_bits[0],
                                     0);
-                        set_led_bit(hfc, vdata[hfc->vend_idx].led_bits[1],
+                        set_led_bit(hfc, driver_info->led_bits[1],
                                     1);
-                        set_led_bit(hfc, vdata[hfc->vend_idx].led_bits[2],
+                        set_led_bit(hfc, driver_info->led_bits[2],
                                     1);
-                        set_led_bit(hfc, vdata[hfc->vend_idx].led_bits[3],
+                        set_led_bit(hfc, driver_info->led_bits[3],
                                     1);
                         break;
                 case LED_POWER_OFF:     /* no Power off handling */
                         break;
                 case LED_S0_ON:
-                        set_led_bit(hfc, vdata[hfc->vend_idx].led_bits[1],
+                        set_led_bit(hfc, driver_info->led_bits[1],
                                     0);
                         break;
                 case LED_S0_OFF:
-                        set_led_bit(hfc, vdata[hfc->vend_idx].led_bits[1],
+                        set_led_bit(hfc, driver_info->led_bits[1],
                                     1);
                         break;
                 case LED_B1_ON:
-                        hfc->led_b_active |= 1;
+                        set_led_bit(hfc, driver_info->led_bits[2],
+                                    0);
                         break;
                 case LED_B1_OFF:
-                        hfc->led_b_active &= ~1;
-                        break;
-                case LED_B1_DATA:
-                        hfc->led_new_data |= 1;
+                        set_led_bit(hfc, driver_info->led_bits[2],
+                                    1);
                         break;
                 case LED_B2_ON:
-                        hfc->led_b_active |= 2;
+                        set_led_bit(hfc, driver_info->led_bits[3],
+                                    0);
                         break;
                 case LED_B2_OFF:
-                        hfc->led_b_active &= ~2;
-                        break;
-                case LED_B2_DATA:
-                        hfc->led_new_data |= 2;
+                        set_led_bit(hfc, driver_info->led_bits[3],
+                                    1);
                         break;
         }
-
         write_led(hfc, hfc->led_state);
 }
 
@@ -725,14 +691,6 @@ tx_iso_complete(struct urb *urb, struct pt_regs *regs)
                                     current_len + 1;
 
                                 tx_offset += (current_len + 1);
-                                if (!transp_mode) {
-                                        if (fifon == HFCUSB_B1_TX)
-                                                handle_led(hfc,
-                                                           LED_B1_DATA);
-                                        if (fifon == HFCUSB_B2_TX)
-                                                handle_led(hfc,
-                                                           LED_B2_DATA);
-                                }
                         } else {
                                 urb->iso_frame_desc[k].offset =
                                     tx_offset++;
@@ -966,14 +924,6 @@ collect_rx_frame(usb_fifo * fifo, __u8 * data, int len, int finish)
                         skb_trim(fifo->skbuff, 0);
                 }
         }
-
-        /* LED flashing only in HDLC mode */
-        if (!transp_mode) {
-                if (fifon == HFCUSB_B1_RX)
-                        handle_led(hfc, LED_B1_DATA);
-                if (fifon == HFCUSB_B2_RX)
-                        handle_led(hfc, LED_B2_DATA);
-        }
 }
 
 /***********************************************/
@@ -1339,17 +1289,6 @@ usb_init(hfcusb_data * hfc)
         hfc->t4_timer.data = (long) hfc;
         hfc->t4_timer.function = (void *) l1_timer_expire_t4;
 
-        /* init the led timer */
-        init_timer(&hfc->led_timer);
-        hfc->led_timer.data = (long) hfc;
-        hfc->led_timer.function = (void *) led_timer;
-
-        /* trigger 4 hz led timer */
-        if (!timer_pending(&hfc->led_timer)) {
-                hfc->led_timer.expires = jiffies + (LED_TIME * HZ) / 1000;
-                add_timer(&hfc->led_timer);
-        }
-
         /* init the background machinery for control requests */
         hfc->ctrl_read.bRequestType = 0xc0;
         hfc->ctrl_read.bRequest = 1;
@@ -1440,13 +1379,18 @@ hfc_usb_probe(struct usb_interface *intf, const struct usb_device_id *id)
             attr, cfg_found, cidx, ep_addr;
         int cmptbl[16], small_match, iso_packet_size, packet_size,
             alt_used = 0;
+        hfcsusb_vdata *driver_info;
 
         vend_idx = 0xffff;
-        for (i = 0; vdata[i].vendor; i++) {
-                if (dev->descriptor.idVendor == vdata[i].vendor
-                    && dev->descriptor.idProduct == vdata[i].prod_id)
+        for (i = 0; hfcusb_idtab[i].idVendor; i++) {
+                if (dev->descriptor.idVendor == hfcusb_idtab[i].idVendor
+                    && dev->descriptor.idProduct ==
+                    hfcusb_idtab[i].idProduct) {
                         vend_idx = i;
+                        continue;
+                }
         }
+
 #ifdef CONFIG_HISAX_DEBUG
         DBG(USB_DBG,
             "HFC-USB: probing interface(%d) actalt(%d) minor(%d)\n", ifnum,
@@ -1457,10 +1401,6 @@ hfc_usb_probe(struct usb_interface *intf, const struct usb_device_id *id)
                ifnum, iface->desc.bAlternateSetting, intf->minor);
 
         if (vend_idx != 0xffff) {
-#ifdef CONFIG_HISAX_DEBUG
-                DBG(USB_DBG, "HFC-S USB: found vendor idx:%d  name:%s",
-                    vend_idx, vdata[vend_idx].vend_name);
-#endif
                 /* if vendor and product ID is OK, start probing alternate settings */
                 alt_idx = 0;
                 small_match = 0xffff;
@@ -1687,9 +1627,11 @@ hfc_usb_probe(struct usb_interface *intf, const struct usb_device_id *id)
                             usb_sndctrlpipe(context->dev, 0);
                         context->ctrl_urb = usb_alloc_urb(0, GFP_KERNEL);
 
-                        printk(KERN_INFO
-                               "HFC-S USB: detected \"%s\"\n",
-                               vdata[vend_idx].vend_name);
+                        driver_info =
+                            (hfcsusb_vdata *) hfcusb_idtab[vend_idx].
+                            driver_info;
+                        printk(KERN_INFO "HFC-S USB: detected \"%s\"\n",
+                               driver_info->vend_name);
 #ifdef CONFIG_HISAX_DEBUG
                         DBG(USB_DBG,
                             "HFC-S USB: Endpoint-Config: %s (if=%d alt=%d)\n",
@@ -1740,8 +1682,6 @@ hfc_usb_disconnect(struct usb_interface
                 del_timer(&context->t3_timer);
         if (timer_pending(&context->t4_timer))
                 del_timer(&context->t4_timer);
-        if (timer_pending(&context->led_timer))
-                del_timer(&context->led_timer);
         /* tell all fifos to terminate */
         for (i = 0; i < HFCUSB_NUM_FIFOS; i++) {
                 if (context->fifos[i].usb_transfer_mode == USB_ISOC) {
@@ -1785,9 +1725,11 @@ hfc_usb_disconnect(struct usb_interface
 /* our driver information structure */
 /************************************/
 static struct usb_driver hfc_drv = {
-        .owner = THIS_MODULE,.name =
-            "hfc_usb",.id_table = hfc_usb_idtab,.probe =
-            hfc_usb_probe,.disconnect = hfc_usb_disconnect,
+        .owner = THIS_MODULE,
+        .name  = "hfc_usb",
+        .id_table = hfcusb_idtab,
+        .probe = hfc_usb_probe,
+        .disconnect = hfc_usb_disconnect,
 };
 static void __exit
 hfc_usb_exit(void)
@@ -1825,4 +1767,4 @@ module_exit(hfc_usb_exit);
 MODULE_AUTHOR(DRIVER_AUTHOR);
 MODULE_DESCRIPTION(DRIVER_DESC);
 MODULE_LICENSE("GPL");
-MODULE_DEVICE_TABLE(usb, hfc_usb_idtab);
+MODULE_DEVICE_TABLE(usb, hfcusb_idtab);
diff --git a/drivers/isdn/hisax/hfc_usb.h b/drivers/isdn/hisax/hfc_usb.h
index 280dd29b30d6..ec52c1a7c22a 100644
--- a/drivers/isdn/hisax/hfc_usb.h
+++ b/drivers/isdn/hisax/hfc_usb.h
@@ -1,7 +1,7 @@
 /*
 * hfc_usb.h
 *
-* $Id: hfc_usb.h,v 4.1 2005/01/26 17:25:53 martinb1 Exp $
+* $Id: hfc_usb.h,v 4.2 2005/04/07 15:27:17 martinb1 Exp $
 */
 
 #ifndef __HFC_USB_H__
@@ -91,7 +91,7 @@
 /**********/
 /* macros */
 /**********/
-#define write_usb(a,b,c)usb_control_msg((a)->dev,(a)->ctrl_out_pipe,0,0x40,(c),(b),0,0,HFC_CTRL_TIMEOUT)
+#define write_usb(a,b,c)usb_control_msg((a)->dev,(a)->ctrl_out_pipe,0,0x40,(c),(b),NULL,0,HFC_CTRL_TIMEOUT)
 #define read_usb(a,b,c) usb_control_msg((a)->dev,(a)->ctrl_in_pipe,1,0xC0,0,(b),(c),1,HFC_CTRL_TIMEOUT)
 
 
@@ -186,6 +186,7 @@ static int validconf[][19] = {
         {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}        // EOL element
 };
 
+#ifdef CONFIG_HISAX_DEBUG
 // string description of chosen config
 static char *conf_str[] = {
         "4 Interrupt IN + 3 Isochron OUT",
@@ -193,6 +194,7 @@ static char *conf_str[] = {
         "4 Isochron IN + 3 Isochron OUT",
         "3 Isochron IN + 3 Isochron OUT"
 };
+#endif
 
 
 typedef struct {
diff --git a/drivers/isdn/hisax/hscx.c b/drivers/isdn/hisax/hscx.c
index 66dbaee77bfb..c8f9951f7914 100644
--- a/drivers/isdn/hisax/hscx.c
+++ b/drivers/isdn/hisax/hscx.c
@@ -156,14 +156,10 @@ close_hscxstate(struct BCState *bcs)
 {
         modehscx(bcs, 0, bcs->channel);
         if (test_and_clear_bit(BC_FLG_INIT, &bcs->Flag)) {
-                if (bcs->hw.hscx.rcvbuf) {
-                        kfree(bcs->hw.hscx.rcvbuf);
-                        bcs->hw.hscx.rcvbuf = NULL;
-                }
-                if (bcs->blog) {
-                        kfree(bcs->blog);
-                        bcs->blog = NULL;
-                }
+                kfree(bcs->hw.hscx.rcvbuf);
+                bcs->hw.hscx.rcvbuf = NULL;
+                kfree(bcs->blog);
+                bcs->blog = NULL;
                 skb_queue_purge(&bcs->rqueue);
                 skb_queue_purge(&bcs->squeue);
                 if (bcs->tx_skb) {
diff --git a/drivers/isdn/hisax/icc.c b/drivers/isdn/hisax/icc.c
index b4ca5859b177..c615752b96aa 100644
--- a/drivers/isdn/hisax/icc.c
+++ b/drivers/isdn/hisax/icc.c
@@ -571,14 +571,10 @@ setstack_icc(struct PStack *st, struct IsdnCardState *cs)
 
 static void
 DC_Close_icc(struct IsdnCardState *cs) {
-        if (cs->dc.icc.mon_rx) {
-                kfree(cs->dc.icc.mon_rx);
-                cs->dc.icc.mon_rx = NULL;
-        }
-        if (cs->dc.icc.mon_tx) {
-                kfree(cs->dc.icc.mon_tx);
-                cs->dc.icc.mon_tx = NULL;
-        }
+        kfree(cs->dc.icc.mon_rx);
+        cs->dc.icc.mon_rx = NULL;
+        kfree(cs->dc.icc.mon_tx);
+        cs->dc.icc.mon_tx = NULL;
 }
 
 static void
diff --git a/drivers/isdn/hisax/ipacx.c b/drivers/isdn/hisax/ipacx.c
index efba2f448017..2e9afae1254a 100644
--- a/drivers/isdn/hisax/ipacx.c
+++ b/drivers/isdn/hisax/ipacx.c
@@ -762,14 +762,10 @@ bch_close_state(struct BCState *bcs)
 {
         bch_mode(bcs, 0, bcs->channel);
         if (test_and_clear_bit(BC_FLG_INIT, &bcs->Flag)) {
-                if (bcs->hw.hscx.rcvbuf) {
-                        kfree(bcs->hw.hscx.rcvbuf);
-                        bcs->hw.hscx.rcvbuf = NULL;
-                }
-                if (bcs->blog) {
-                        kfree(bcs->blog);
-                        bcs->blog = NULL;
-                }
+                kfree(bcs->hw.hscx.rcvbuf);
+                bcs->hw.hscx.rcvbuf = NULL;
+                kfree(bcs->blog);
+                bcs->blog = NULL;
                 skb_queue_purge(&bcs->rqueue);
                 skb_queue_purge(&bcs->squeue);
                 if (bcs->tx_skb) {
diff --git a/drivers/isdn/hisax/isac.c b/drivers/isdn/hisax/isac.c
index 85e063a08d23..565b7892c267 100644
--- a/drivers/isdn/hisax/isac.c
+++ b/drivers/isdn/hisax/isac.c
@@ -570,15 +570,12 @@ setstack_isac(struct PStack *st, struct IsdnCardState *cs)
 }
 
 static void
-DC_Close_isac(struct IsdnCardState *cs) {
-        if (cs->dc.isac.mon_rx) {
-                kfree(cs->dc.isac.mon_rx);
-                cs->dc.isac.mon_rx = NULL;
-        }
-        if (cs->dc.isac.mon_tx) {
-                kfree(cs->dc.isac.mon_tx);
-                cs->dc.isac.mon_tx = NULL;
-        }
+DC_Close_isac(struct IsdnCardState *cs)
+{
+        kfree(cs->dc.isac.mon_rx);
+        cs->dc.isac.mon_rx = NULL;
+        kfree(cs->dc.isac.mon_tx);
+        cs->dc.isac.mon_tx = NULL;
 }
 
 static void
diff --git a/drivers/isdn/hisax/isar.c b/drivers/isdn/hisax/isar.c
index 642a87c51295..674af673ff96 100644
--- a/drivers/isdn/hisax/isar.c
+++ b/drivers/isdn/hisax/isar.c
@@ -1688,10 +1688,8 @@ close_isarstate(struct BCState *bcs)
 {
         modeisar(bcs, 0, bcs->channel);
         if (test_and_clear_bit(BC_FLG_INIT, &bcs->Flag)) {
-                if (bcs->hw.isar.rcvbuf) {
-                        kfree(bcs->hw.isar.rcvbuf);
-                        bcs->hw.isar.rcvbuf = NULL;
-                }
+                kfree(bcs->hw.isar.rcvbuf);
+                bcs->hw.isar.rcvbuf = NULL;
                 skb_queue_purge(&bcs->rqueue);
                 skb_queue_purge(&bcs->squeue);
                 if (bcs->tx_skb) {
diff --git a/drivers/isdn/hisax/jade.c b/drivers/isdn/hisax/jade.c
index 363ae3179bbd..2659fecc2674 100644
--- a/drivers/isdn/hisax/jade.c
+++ b/drivers/isdn/hisax/jade.c
@@ -195,14 +195,10 @@ close_jadestate(struct BCState *bcs)
 {
     modejade(bcs, 0, bcs->channel);
     if (test_and_clear_bit(BC_FLG_INIT, &bcs->Flag)) {
-        if (bcs->hw.hscx.rcvbuf) {
-                kfree(bcs->hw.hscx.rcvbuf);
-                bcs->hw.hscx.rcvbuf = NULL;
-        }
-        if (bcs->blog) {
-                kfree(bcs->blog);
-                bcs->blog = NULL;
-        }
+        kfree(bcs->hw.hscx.rcvbuf);
+        bcs->hw.hscx.rcvbuf = NULL;
+        kfree(bcs->blog);
+        bcs->blog = NULL;
         skb_queue_purge(&bcs->rqueue);
         skb_queue_purge(&bcs->squeue);
         if (bcs->tx_skb) {
diff --git a/drivers/isdn/hisax/netjet.c b/drivers/isdn/hisax/netjet.c
index 94da03c30c51..47a47ef0968b 100644
--- a/drivers/isdn/hisax/netjet.c
+++ b/drivers/isdn/hisax/netjet.c
@@ -855,14 +855,10 @@ close_tigerstate(struct BCState *bcs)
 {
         mode_tiger(bcs, 0, bcs->channel);
         if (test_and_clear_bit(BC_FLG_INIT, &bcs->Flag)) {
-                if (bcs->hw.tiger.rcvbuf) {
-                        kfree(bcs->hw.tiger.rcvbuf);
-                        bcs->hw.tiger.rcvbuf = NULL;
-                }
-                if (bcs->hw.tiger.sendbuf) {
-                        kfree(bcs->hw.tiger.sendbuf);
-                        bcs->hw.tiger.sendbuf = NULL;
-                }
+                kfree(bcs->hw.tiger.rcvbuf);
+                bcs->hw.tiger.rcvbuf = NULL;
+                kfree(bcs->hw.tiger.sendbuf);
+                bcs->hw.tiger.sendbuf = NULL;
                 skb_queue_purge(&bcs->rqueue);
                 skb_queue_purge(&bcs->squeue);
                 if (bcs->tx_skb) {
@@ -967,20 +963,12 @@ inittiger(struct IsdnCardState *cs)
 static void
 releasetiger(struct IsdnCardState *cs)
 {
-        if (cs->bcs[0].hw.tiger.send) {
-                kfree(cs->bcs[0].hw.tiger.send);
-                cs->bcs[0].hw.tiger.send = NULL;
-        }
-        if (cs->bcs[1].hw.tiger.send) {
-                cs->bcs[1].hw.tiger.send = NULL;
-        }
-        if (cs->bcs[0].hw.tiger.rec) {
-                kfree(cs->bcs[0].hw.tiger.rec);
-                cs->bcs[0].hw.tiger.rec = NULL;
-        }
-        if (cs->bcs[1].hw.tiger.rec) {
-                cs->bcs[1].hw.tiger.rec = NULL;
-        }
+        kfree(cs->bcs[0].hw.tiger.send);
+        cs->bcs[0].hw.tiger.send = NULL;
+        cs->bcs[1].hw.tiger.send = NULL;
+        kfree(cs->bcs[0].hw.tiger.rec);
+        cs->bcs[0].hw.tiger.rec = NULL;
+        cs->bcs[1].hw.tiger.rec = NULL;
 }
 
 void
diff --git a/drivers/isdn/hisax/st5481_usb.c b/drivers/isdn/hisax/st5481_usb.c
index 89fbeb58485d..b096b64b0253 100644
--- a/drivers/isdn/hisax/st5481_usb.c
+++ b/drivers/isdn/hisax/st5481_usb.c
@@ -335,14 +335,12 @@ void st5481_release_usb(struct st5481_adapter *adapter)
 
         // Stop and free Control and Interrupt URBs
         usb_kill_urb(ctrl->urb);
-        if (ctrl->urb->transfer_buffer)
-                kfree(ctrl->urb->transfer_buffer);
+        kfree(ctrl->urb->transfer_buffer);
         usb_free_urb(ctrl->urb);
         ctrl->urb = NULL;
 
         usb_kill_urb(intr->urb);
-        if (intr->urb->transfer_buffer)
-                kfree(intr->urb->transfer_buffer);
+        kfree(intr->urb->transfer_buffer);
         usb_free_urb(intr->urb);
         ctrl->urb = NULL;
 }
@@ -457,8 +455,7 @@ st5481_setup_isocpipes(struct urb* urb[2], struct usb_device *dev,
  err:
         for (j = 0; j < 2; j++) {
                 if (urb[j]) {
-                        if (urb[j]->transfer_buffer)
-                                kfree(urb[j]->transfer_buffer);
+                        kfree(urb[j]->transfer_buffer);
                         urb[j]->transfer_buffer = NULL;
                         usb_free_urb(urb[j]);
                         urb[j] = NULL;
@@ -473,8 +470,7 @@ void st5481_release_isocpipes(struct urb* urb[2])
 
         for (j = 0; j < 2; j++) {
                 usb_kill_urb(urb[j]);
-                if (urb[j]->transfer_buffer)
-                        kfree(urb[j]->transfer_buffer);                 
+                kfree(urb[j]->transfer_buffer);
                 usb_free_urb(urb[j]);
                 urb[j] = NULL;
         }
diff --git a/drivers/isdn/hisax/w6692.c b/drivers/isdn/hisax/w6692.c
index 7baf8e488471..0352ee5f706c 100644
--- a/drivers/isdn/hisax/w6692.c
+++ b/drivers/isdn/hisax/w6692.c
@@ -819,14 +819,10 @@ close_w6692state(struct BCState *bcs)
 {
         W6692Bmode(bcs, 0, bcs->channel);
         if (test_and_clear_bit(BC_FLG_INIT, &bcs->Flag)) {
-                if (bcs->hw.w6692.rcvbuf) {
-                        kfree(bcs->hw.w6692.rcvbuf);
-                        bcs->hw.w6692.rcvbuf = NULL;
-                }
-                if (bcs->blog) {
-                        kfree(bcs->blog);
-                        bcs->blog = NULL;
-                }
+                kfree(bcs->hw.w6692.rcvbuf);
+                bcs->hw.w6692.rcvbuf = NULL;
+                kfree(bcs->blog);
+                bcs->blog = NULL;
                 skb_queue_purge(&bcs->rqueue);
                 skb_queue_purge(&bcs->squeue);
                 if (bcs->tx_skb) {
diff --git a/drivers/isdn/hysdn/hysdn_procconf.c b/drivers/isdn/hysdn/hysdn_procconf.c
index 639582f61f41..87f59a0e2a95 100644
--- a/drivers/isdn/hysdn/hysdn_procconf.c
+++ b/drivers/isdn/hysdn/hysdn_procconf.c
@@ -359,8 +359,7 @@ hysdn_conf_close(struct inode *ino, struct file *filep)
         } else if ((filep->f_mode & (FMODE_READ | FMODE_WRITE)) == FMODE_READ) {
                 /* read access -> output card info data */
 
-                if (filep->private_data)
-                        kfree(filep->private_data);     /* release memory */
+                kfree(filep->private_data);     /* release memory */
         }
         unlock_kernel();
         return (retval);
diff --git a/drivers/isdn/i4l/isdn_ppp.c b/drivers/isdn/i4l/isdn_ppp.c
index d97a9be5469c..1a19a0f89428 100644
--- a/drivers/isdn/i4l/isdn_ppp.c
+++ b/drivers/isdn/i4l/isdn_ppp.c
@@ -364,10 +364,8 @@ isdn_ppp_release(int min, struct file *file)
                 isdn_net_hangup(&p->dev);
         }
         for (i = 0; i < NUM_RCV_BUFFS; i++) {
-                if (is->rq[i].buf) {
-                        kfree(is->rq[i].buf);
-                        is->rq[i].buf = NULL;
-                }
+                kfree(is->rq[i].buf);
+                is->rq[i].buf = NULL;
         }
         is->first = is->rq + NUM_RCV_BUFFS - 1; /* receive queue */
         is->last = is->rq;
@@ -378,14 +376,10 @@ isdn_ppp_release(int min, struct file *file)
         is->slcomp = NULL;
 #endif
 #ifdef CONFIG_IPPP_FILTER
-        if (is->pass_filter) {
-                kfree(is->pass_filter);
-                is->pass_filter = NULL;
-        }
-        if (is->active_filter) {
-                kfree(is->active_filter);
-                is->active_filter = NULL;
-        }
+        kfree(is->pass_filter);
+        is->pass_filter = NULL;
+        kfree(is->active_filter);
+        is->active_filter = NULL;
 #endif
 
 /* TODO: if this was the previous master: link the stuff to the new master */
@@ -914,8 +908,7 @@ isdn_ppp_cleanup(void)
                 kfree(ippp_table[i]);
 
 #ifdef CONFIG_ISDN_MPP
-        if (isdn_ppp_bundle_arr)
-                kfree(isdn_ppp_bundle_arr);
+        kfree(isdn_ppp_bundle_arr);
 #endif /* CONFIG_ISDN_MPP */
 
 }
diff --git a/drivers/isdn/i4l/isdn_tty.c b/drivers/isdn/i4l/isdn_tty.c
index b37ef1f06b3d..8c404b4e2482 100644
--- a/drivers/isdn/i4l/isdn_tty.c
+++ b/drivers/isdn/i4l/isdn_tty.c
@@ -712,22 +712,14 @@ isdn_tty_modem_hup(modem_info * info, int local)
 #endif
         info->emu.vpar[4] = 0;
         info->emu.vpar[5] = 8;
-        if (info->dtmf_state) {
-                kfree(info->dtmf_state);
-                info->dtmf_state = NULL;
-        }
-        if (info->silence_state) {
-                kfree(info->silence_state);
-                info->silence_state = NULL;
-        }
-        if (info->adpcms) {
-                kfree(info->adpcms);
-                info->adpcms = NULL;
-        }
-        if (info->adpcmr) {
-                kfree(info->adpcmr);
-                info->adpcmr = NULL;
-        }
+        kfree(info->dtmf_state);
+        info->dtmf_state = NULL;
+        kfree(info->silence_state);
+        info->silence_state = NULL;
+        kfree(info->adpcms);
+        info->adpcms = NULL;
+        kfree(info->adpcmr);
+        info->adpcmr = NULL;
 #endif
         if ((info->msr & UART_MSR_RI) &&
                 (info->emu.mdmreg[REG_RUNG] & BIT_RUNG))
@@ -1721,8 +1713,7 @@ isdn_tty_close(struct tty_struct *tty, struct file *filp)
                  */
                 timeout = jiffies + HZ;
                 while (!(info->lsr & UART_LSR_TEMT)) {
-                        set_current_state(TASK_INTERRUPTIBLE);
-                        schedule_timeout(20);
+                        schedule_timeout_interruptible(20);
                         if (time_after(jiffies,timeout))
                                 break;
                 }
diff --git a/drivers/isdn/icn/icn.c b/drivers/isdn/icn/icn.c
index 386df71eee74..6649f8bc9951 100644
--- a/drivers/isdn/icn/icn.c
+++ b/drivers/isdn/icn/icn.c
@@ -947,8 +947,7 @@ icn_loadproto(u_char __user * buffer, icn_card * card)
                                 icn_maprelease_channel(card, 0);
                                 return -EIO;
                         }
-                        set_current_state(TASK_INTERRUPTIBLE);
-                        schedule_timeout(10);
+                        schedule_timeout_interruptible(10);
                 }
         }
         writeb(0x20, &sbuf_n);
diff --git a/drivers/isdn/isdnloop/isdnloop.c b/drivers/isdn/isdnloop/isdnloop.c
index 14e1f8fbc61f..33d339700411 100644
--- a/drivers/isdn/isdnloop/isdnloop.c
+++ b/drivers/isdn/isdnloop/isdnloop.c
@@ -1161,12 +1161,9 @@ isdnloop_command(isdn_ctrl * c, isdnloop_card * card)
                                         if (a) {
                                                 if (!card->leased) {
                                                         card->leased = 1;
-                                                        while (card->ptype == ISDN_PTYPE_UNKNOWN) {
-                                                                set_current_state(TASK_INTERRUPTIBLE);
-                                                                schedule_timeout(10);
-                                                        }
-                                                        set_current_state(TASK_INTERRUPTIBLE);
-                                                        schedule_timeout(10);
+                                                        while (card->ptype == ISDN_PTYPE_UNKNOWN)
+                                                                schedule_timeout_interruptible(10);
+                                                        schedule_timeout_interruptible(10);
                                                         sprintf(cbuf, "00;FV2ON\n01;EAZ1\n02;EAZ2\n");
                                                         i = isdnloop_writecmd(cbuf, strlen(cbuf), 0, card);
                                                         printk(KERN_INFO
diff --git a/drivers/isdn/pcbit/drv.c b/drivers/isdn/pcbit/drv.c
index 5de861f40816..94f21486bb24 100644
--- a/drivers/isdn/pcbit/drv.c
+++ b/drivers/isdn/pcbit/drv.c
@@ -561,10 +561,8 @@ void pcbit_l3_receive(struct pcbit_dev * dev, ulong msg,
                 else
                         pcbit_fsm_event(dev, chan, EV_USR_RELEASE_REQ, NULL);
 
-                if (cbdata.data.setup.CalledPN)
-                        kfree(cbdata.data.setup.CalledPN);
-                if (cbdata.data.setup.CallingPN)
-                        kfree(cbdata.data.setup.CallingPN);
+                kfree(cbdata.data.setup.CalledPN);
+                kfree(cbdata.data.setup.CallingPN);
                 break;
     
         case MSG_CONN_CONF:
diff --git a/drivers/isdn/sc/init.c b/drivers/isdn/sc/init.c
index 1ebed041672d..62b7acfad8a4 100644
--- a/drivers/isdn/sc/init.c
+++ b/drivers/isdn/sc/init.c
@@ -529,8 +529,7 @@ static int identify_board(unsigned long rambase, unsigned int iobase)
          */
         x = 0;
         while((inb(iobase + FIFOSTAT_OFFSET) & RF_HAS_DATA) && x < 100) {
-                set_current_state(TASK_INTERRUPTIBLE);
-                schedule_timeout(1);
+                schedule_timeout_interruptible(1);
                 x++;
         }
         if(x == 100) {
diff --git a/drivers/isdn/sc/message.c b/drivers/isdn/sc/message.c
index ca204da3257d..0a0fe6b8039b 100644
--- a/drivers/isdn/sc/message.c
+++ b/drivers/isdn/sc/message.c
@@ -208,8 +208,7 @@ int send_and_receive(int card,
         tries = 0;
         /* wait for the response */
         while (tries < timeout) {
-                set_current_state(TASK_INTERRUPTIBLE);
-                schedule_timeout(1);
+                schedule_timeout_interruptible(1);
                 
                 pr_debug("SAR waiting..\n");
 
diff --git a/drivers/macintosh/Kconfig b/drivers/macintosh/Kconfig
index bc3e096d84f7..a0ea44c3e8b1 100644
--- a/drivers/macintosh/Kconfig
+++ b/drivers/macintosh/Kconfig
@@ -169,6 +169,25 @@ config THERM_PM72
           This driver provides thermostat and fan control for the desktop
           G5 machines. 
 
+config WINDFARM
+        tristate "New PowerMac thermal control infrastructure"
+
+config WINDFARM_PM81
+        tristate "Support for thermal management on iMac G5"
+        depends on WINDFARM && I2C && CPU_FREQ_PMAC64 && PMAC_SMU
+        select I2C_PMAC_SMU
+        help
+          This driver provides thermal control for the iMacG5
+
+config WINDFARM_PM91
+        tristate "Support for thermal management on PowerMac9,1"
+        depends on WINDFARM && I2C && CPU_FREQ_PMAC64 && PMAC_SMU
+        select I2C_PMAC_SMU
+        help
+          This driver provides thermal control for the PowerMac9,1
+          which is the recent (SMU based) single CPU desktop G5
+
+
 config ANSLCD
         tristate "Support for ANS LCD display"
         depends on ADB_CUDA && PPC_PMAC
diff --git a/drivers/macintosh/Makefile b/drivers/macintosh/Makefile
index 236291bd48a4..f4657aa81fb0 100644
--- a/drivers/macintosh/Makefile
+++ b/drivers/macintosh/Makefile
@@ -26,3 +26,12 @@ obj-$(CONFIG_ADB_MACIO)		+= macio-adb.o
 obj-$(CONFIG_THERM_PM72)        += therm_pm72.o
 obj-$(CONFIG_THERM_WINDTUNNEL)  += therm_windtunnel.o
 obj-$(CONFIG_THERM_ADT746X)     += therm_adt746x.o
+obj-$(CONFIG_WINDFARM)          += windfarm_core.o
+obj-$(CONFIG_WINDFARM_PM81)     += windfarm_smu_controls.o \
+                                   windfarm_smu_sensors.o \
+                                   windfarm_lm75_sensor.o windfarm_pid.o \
+                                   windfarm_cpufreq_clamp.o windfarm_pm81.o
+obj-$(CONFIG_WINDFARM_PM91)     += windfarm_smu_controls.o \
+                                   windfarm_smu_sensors.o \
+                                   windfarm_lm75_sensor.o windfarm_pid.o \
+                                   windfarm_cpufreq_clamp.o windfarm_pm91.o
diff --git a/drivers/macintosh/adbhid.c b/drivers/macintosh/adbhid.c
index 8f02c155fdc0..c0b46bceb5df 100644
--- a/drivers/macintosh/adbhid.c
+++ b/drivers/macintosh/adbhid.c
@@ -857,8 +857,7 @@ adbhid_input_register(int id, int default_id, int original_handler_id,
 static void adbhid_input_unregister(int id)
 {
         input_unregister_device(adbhid[id]->input);
-        if (adbhid[id]->keycode)
-                kfree(adbhid[id]->keycode);
+        kfree(adbhid[id]->keycode);
         kfree(adbhid[id]);
         adbhid[id] = NULL;
 }
diff --git a/drivers/macintosh/smu.c b/drivers/macintosh/smu.c
index 34f3c7e2d832..e8378274d710 100644
--- a/drivers/macintosh/smu.c
+++ b/drivers/macintosh/smu.c
@@ -47,13 +47,13 @@
 #include <asm/uaccess.h>
 #include <asm/of_device.h>
 
-#define VERSION "0.6"
+#define VERSION "0.7"
 #define AUTHOR  "(c) 2005 Benjamin Herrenschmidt, IBM Corp."
 
 #undef DEBUG_SMU
 
 #ifdef DEBUG_SMU
-#define DPRINTK(fmt, args...) do { printk(KERN_DEBUG fmt , ##args); } while (0)
+#define DPRINTK(fmt, args...) do { udbg_printf(KERN_DEBUG fmt , ##args); } while (0)
 #else
 #define DPRINTK(fmt, args...) do { } while (0)
 #endif
@@ -92,7 +92,7 @@ struct smu_device {
  * for now, just hard code that
  */
 static struct smu_device        *smu;
-
+static DECLARE_MUTEX(smu_part_access);
 
 /*
  * SMU driver low level stuff
@@ -113,9 +113,11 @@ static void smu_start_cmd(void)
 
         DPRINTK("SMU: starting cmd %x, %d bytes data\n", cmd->cmd,
                 cmd->data_len);
-        DPRINTK("SMU: data buffer: %02x %02x %02x %02x ...\n",
+        DPRINTK("SMU: data buffer: %02x %02x %02x %02x %02x %02x %02x %02x\n",
                 ((u8 *)cmd->data_buf)[0], ((u8 *)cmd->data_buf)[1],
-                ((u8 *)cmd->data_buf)[2], ((u8 *)cmd->data_buf)[3]);
+                ((u8 *)cmd->data_buf)[2], ((u8 *)cmd->data_buf)[3],
+                ((u8 *)cmd->data_buf)[4], ((u8 *)cmd->data_buf)[5],
+                ((u8 *)cmd->data_buf)[6], ((u8 *)cmd->data_buf)[7]);
 
         /* Fill the SMU command buffer */
         smu->cmd_buf->cmd = cmd->cmd;
@@ -440,7 +442,7 @@ int smu_present(void)
 EXPORT_SYMBOL(smu_present);
 
 
-int smu_init (void)
+int __init smu_init (void)
 {
         struct device_node *np;
         u32 *data;
@@ -588,6 +590,8 @@ static void smu_expose_childs(void *unused)
                         sprintf(name, "smu-i2c-%02x", *reg);
                         of_platform_device_create(np, name, &smu->of_dev->dev);
                 }
+                if (device_is_compatible(np, "smu-sensors"))
+                        of_platform_device_create(np, "smu-sensors", &smu->of_dev->dev);
         }
 
 }
@@ -845,6 +849,156 @@ int smu_queue_i2c(struct smu_i2c_cmd *cmd)
         return 0;
 }
 
+/*
+ * Handling of "partitions"
+ */
+
+static int smu_read_datablock(u8 *dest, unsigned int addr, unsigned int len)
+{
+        DECLARE_COMPLETION(comp);
+        unsigned int chunk;
+        struct smu_cmd cmd;
+        int rc;
+        u8 params[8];
+
+        /* We currently use a chunk size of 0xe. We could check the
+         * SMU firmware version and use bigger sizes though
+         */
+        chunk = 0xe;
+
+        while (len) {
+                unsigned int clen = min(len, chunk);
+
+                cmd.cmd = SMU_CMD_MISC_ee_COMMAND;
+                cmd.data_len = 7;
+                cmd.data_buf = params;
+                cmd.reply_len = chunk;
+                cmd.reply_buf = dest;
+                cmd.done = smu_done_complete;
+                cmd.misc = &comp;
+                params[0] = SMU_CMD_MISC_ee_GET_DATABLOCK_REC;
+                params[1] = 0x4;
+                *((u32 *)&params[2]) = addr;
+                params[6] = clen;
+
+                rc = smu_queue_cmd(&cmd);
+                if (rc)
+                        return rc;
+                wait_for_completion(&comp);
+                if (cmd.status != 0)
+                        return rc;
+                if (cmd.reply_len != clen) {
+                        printk(KERN_DEBUG "SMU: short read in "
+                               "smu_read_datablock, got: %d, want: %d\n",
+                               cmd.reply_len, clen);
+                        return -EIO;
+                }
+                len -= clen;
+                addr += clen;
+                dest += clen;
+        }
+        return 0;
+}
+
+static struct smu_sdbp_header *smu_create_sdb_partition(int id)
+{
+        DECLARE_COMPLETION(comp);
+        struct smu_simple_cmd cmd;
+        unsigned int addr, len, tlen;
+        struct smu_sdbp_header *hdr;
+        struct property *prop;
+
+        /* First query the partition info */
+        smu_queue_simple(&cmd, SMU_CMD_PARTITION_COMMAND, 2,
+                         smu_done_complete, &comp,
+                         SMU_CMD_PARTITION_LATEST, id);
+        wait_for_completion(&comp);
+
+        /* Partition doesn't exist (or other error) */
+        if (cmd.cmd.status != 0 || cmd.cmd.reply_len != 6)
+                return NULL;
+
+        /* Fetch address and length from reply */
+        addr = *((u16 *)cmd.buffer);
+        len = cmd.buffer[3] << 2;
+        /* Calucluate total length to allocate, including the 17 bytes
+         * for "sdb-partition-XX" that we append at the end of the buffer
+         */
+        tlen = sizeof(struct property) + len + 18;
+
+        prop = kcalloc(tlen, 1, GFP_KERNEL);
+        if (prop == NULL)
+                return NULL;
+        hdr = (struct smu_sdbp_header *)(prop + 1);
+        prop->name = ((char *)prop) + tlen - 18;
+        sprintf(prop->name, "sdb-partition-%02x", id);
+        prop->length = len;
+        prop->value = (unsigned char *)hdr;
+        prop->next = NULL;
+
+        /* Read the datablock */
+        if (smu_read_datablock((u8 *)hdr, addr, len)) {
+                printk(KERN_DEBUG "SMU: datablock read failed while reading "
+                       "partition %02x !\n", id);
+                goto failure;
+        }
+
+        /* Got it, check a few things and create the property */
+        if (hdr->id != id) {
+                printk(KERN_DEBUG "SMU: Reading partition %02x and got "
+                       "%02x !\n", id, hdr->id);
+                goto failure;
+        }
+        if (prom_add_property(smu->of_node, prop)) {
+                printk(KERN_DEBUG "SMU: Failed creating sdb-partition-%02x "
+                       "property !\n", id);
+                goto failure;
+        }
+
+        return hdr;
+ failure:
+        kfree(prop);
+        return NULL;
+}
+
+/* Note: Only allowed to return error code in pointers (using ERR_PTR)
+ * when interruptible is 1
+ */
+struct smu_sdbp_header *__smu_get_sdb_partition(int id, unsigned int *size,
+                                                int interruptible)
+{
+        char pname[32];
+        struct smu_sdbp_header *part;
+
+        if (!smu)
+                return NULL;
+
+        sprintf(pname, "sdb-partition-%02x", id);
+
+        if (interruptible) {
+                int rc;
+                rc = down_interruptible(&smu_part_access);
+                if (rc)
+                        return ERR_PTR(rc);
+        } else
+                down(&smu_part_access);
+
+        part = (struct smu_sdbp_header *)get_property(smu->of_node,
+                                                      pname, size);
+        if (part == NULL) {
+                part = smu_create_sdb_partition(id);
+                if (part != NULL && size)
+                        *size = part->len << 2;
+        }
+        up(&smu_part_access);
+        return part;
+}
+
+struct smu_sdbp_header *smu_get_sdb_partition(int id, unsigned int *size)
+{
+        return __smu_get_sdb_partition(id, size, 0);
+}
+EXPORT_SYMBOL(smu_get_sdb_partition);
 
 
 /*
@@ -918,6 +1072,14 @@ static ssize_t smu_write(struct file *file, const char __user *buf,
         else if (hdr.cmdtype == SMU_CMDTYPE_WANTS_EVENTS) {
                 pp->mode = smu_file_events;
                 return 0;
+        } else if (hdr.cmdtype == SMU_CMDTYPE_GET_PARTITION) {
+                struct smu_sdbp_header *part;
+                part = __smu_get_sdb_partition(hdr.cmd, NULL, 1);
+                if (part == NULL)
+                        return -EINVAL;
+                else if (IS_ERR(part))
+                        return PTR_ERR(part);
+                return 0;
         } else if (hdr.cmdtype != SMU_CMDTYPE_SMU)
                 return -EINVAL;
         else if (pp->mode != smu_file_commands)
diff --git a/drivers/macintosh/therm_pm72.c b/drivers/macintosh/therm_pm72.c
index cc507ceef153..3fc8cdd94c3d 100644
--- a/drivers/macintosh/therm_pm72.c
+++ b/drivers/macintosh/therm_pm72.c
@@ -1678,10 +1678,9 @@ static int main_control_loop(void *x)
                 }
 
                 // FIXME: Deal with signals
-                set_current_state(TASK_INTERRUPTIBLE);
                 elapsed = jiffies - start;
                 if (elapsed < HZ)
-                        schedule_timeout(HZ - elapsed);
+                        schedule_timeout_interruptible(HZ - elapsed);
         }
 
  out:
diff --git a/drivers/macintosh/via-pmu.c b/drivers/macintosh/via-pmu.c
index 9bc6cc6e3845..564043508569 100644
--- a/drivers/macintosh/via-pmu.c
+++ b/drivers/macintosh/via-pmu.c
@@ -2053,6 +2053,7 @@ pmu_register_sleep_notifier(struct pmu_sleep_notifier *n)
         __list_add(&n->list, list->prev, list);
         return 0;
 }
+EXPORT_SYMBOL(pmu_register_sleep_notifier);
 
 int
 pmu_unregister_sleep_notifier(struct pmu_sleep_notifier* n)
@@ -2063,6 +2064,7 @@ pmu_unregister_sleep_notifier(struct pmu_sleep_notifier* n)
         n->list.next = NULL;
         return 0;
 }
+EXPORT_SYMBOL(pmu_unregister_sleep_notifier);
 #endif /* CONFIG_PM */
 
 #if defined(CONFIG_PM) && defined(CONFIG_PPC32)
@@ -2667,10 +2669,10 @@ powerbook_sleep_3400(void)
         asleep = 1;
 
         /* Put the CPU into sleep mode */
-        asm volatile("mfspr %0,1008" : "=r" (hid0) :);
+        hid0 = mfspr(SPRN_HID0);
         hid0 = (hid0 & ~(HID0_NAP | HID0_DOZE)) | HID0_SLEEP;
-        asm volatile("mtspr 1008,%0" : : "r" (hid0));
-        _nmask_and_or_msr(0, MSR_POW | MSR_EE);
+        mtspr(SPRN_HID0, hid0);
+        mtmsr(mfmsr() | MSR_POW | MSR_EE);
         udelay(10);
 
         /* OK, we're awake again, start restoring things */
@@ -3139,8 +3141,6 @@ EXPORT_SYMBOL(pmu_i2c_stdsub_write);
 EXPORT_SYMBOL(pmu_i2c_simple_read);
 EXPORT_SYMBOL(pmu_i2c_simple_write);
 #if defined(CONFIG_PM) && defined(CONFIG_PPC32)
-EXPORT_SYMBOL(pmu_register_sleep_notifier);
-EXPORT_SYMBOL(pmu_unregister_sleep_notifier);
 EXPORT_SYMBOL(pmu_enable_irled);
 EXPORT_SYMBOL(pmu_battery_count);
 EXPORT_SYMBOL(pmu_batteries);
diff --git a/drivers/macintosh/windfarm.h b/drivers/macintosh/windfarm.h
new file mode 100644
index 000000000000..3f0cb0312ea3
--- /dev/null
+++ b/drivers/macintosh/windfarm.h
@@ -0,0 +1,131 @@
+/*
+ * Windfarm PowerMac thermal control.
+ *
+ * (c) Copyright 2005 Benjamin Herrenschmidt, IBM Corp.
+ *                    <benh@kernel.crashing.org>
+ *
+ * Released under the term of the GNU GPL v2.
+ */
+
+#ifndef __WINDFARM_H__
+#define __WINDFARM_H__
+
+#include <linux/kref.h>
+#include <linux/list.h>
+#include <linux/module.h>
+#include <linux/notifier.h>
+
+/* Display a 16.16 fixed point value */
+#define FIX32TOPRINT(f) ((f) >> 16),((((f) & 0xffff) * 1000) >> 16)
+
+/*
+ * Control objects
+ */
+
+struct wf_control;
+
+struct wf_control_ops {
+        int                     (*set_value)(struct wf_control *ct, s32 val);
+        int                     (*get_value)(struct wf_control *ct, s32 *val);
+        s32                     (*get_min)(struct wf_control *ct);
+        s32                     (*get_max)(struct wf_control *ct);
+        void                    (*release)(struct wf_control *ct);
+        struct module           *owner;
+};
+
+struct wf_control {
+        struct list_head        link;
+        struct wf_control_ops   *ops;
+        char                    *name;
+        int                     type;
+        struct kref             ref;
+};
+
+#define WF_CONTROL_TYPE_GENERIC         0
+#define WF_CONTROL_RPM_FAN              1
+#define WF_CONTROL_PWM_FAN              2
+
+
+/* Note about lifetime rules: wf_register_control() will initialize
+ * the kref and wf_unregister_control will decrement it, thus the
+ * object creating/disposing a given control shouldn't assume it
+ * still exists after wf_unregister_control has been called.
+ * wf_find_control will inc the refcount for you
+ */
+extern int wf_register_control(struct wf_control *ct);
+extern void wf_unregister_control(struct wf_control *ct);
+extern struct wf_control * wf_find_control(const char *name);
+extern int wf_get_control(struct wf_control *ct);
+extern void wf_put_control(struct wf_control *ct);
+
+static inline int wf_control_set_max(struct wf_control *ct)
+{
+        s32 vmax = ct->ops->get_max(ct);
+        return ct->ops->set_value(ct, vmax);
+}
+
+static inline int wf_control_set_min(struct wf_control *ct)
+{
+        s32 vmin = ct->ops->get_min(ct);
+        return ct->ops->set_value(ct, vmin);
+}
+
+/*
+ * Sensor objects
+ */
+
+struct wf_sensor;
+
+struct wf_sensor_ops {
+        int                     (*get_value)(struct wf_sensor *sr, s32 *val);
+        void                    (*release)(struct wf_sensor *sr);
+        struct module           *owner;
+};
+
+struct wf_sensor {
+        struct list_head        link;
+        struct wf_sensor_ops    *ops;
+        char                    *name;
+        struct kref             ref;
+};
+
+/* Same lifetime rules as controls */
+extern int wf_register_sensor(struct wf_sensor *sr);
+extern void wf_unregister_sensor(struct wf_sensor *sr);
+extern struct wf_sensor * wf_find_sensor(const char *name);
+extern int wf_get_sensor(struct wf_sensor *sr);
+extern void wf_put_sensor(struct wf_sensor *sr);
+
+/* For use by clients. Note that we are a bit racy here since
+ * notifier_block doesn't have a module owner field. I may fix
+ * it one day ...
+ *
+ * LOCKING NOTE !
+ *
+ * All "events" except WF_EVENT_TICK are called with an internal mutex
+ * held which will deadlock if you call basically any core routine.
+ * So don't ! Just take note of the event and do your actual operations
+ * from the ticker.
+ *
+ */
+extern int wf_register_client(struct notifier_block *nb);
+extern int wf_unregister_client(struct notifier_block *nb);
+
+/* Overtemp conditions. Those are refcounted */
+extern void wf_set_overtemp(void);
+extern void wf_clear_overtemp(void);
+extern int wf_is_overtemp(void);
+
+#define WF_EVENT_NEW_CONTROL    0 /* param is wf_control * */
+#define WF_EVENT_NEW_SENSOR     1 /* param is wf_sensor * */
+#define WF_EVENT_OVERTEMP       2 /* no param */
+#define WF_EVENT_NORMALTEMP     3 /* overtemp condition cleared */
+#define WF_EVENT_TICK           4 /* 1 second tick */
+
+/* Note: If that driver gets more broad use, we could replace the
+ * simplistic overtemp bits with "environmental conditions". That
+ * could then be used to also notify of things like fan failure,
+ * case open, battery conditions, ...
+ */
+
+#endif /* __WINDFARM_H__ */
diff --git a/drivers/macintosh/windfarm_core.c b/drivers/macintosh/windfarm_core.c
new file mode 100644
index 000000000000..6c2a471ea6c0
--- /dev/null
+++ b/drivers/macintosh/windfarm_core.c
@@ -0,0 +1,426 @@
+/*
+ * Windfarm PowerMac thermal control. Core
+ *
+ * (c) Copyright 2005 Benjamin Herrenschmidt, IBM Corp.
+ *                    <benh@kernel.crashing.org>
+ *
+ * Released under the term of the GNU GPL v2.
+ *
+ * This core code tracks the list of sensors & controls, register
+ * clients, and holds the kernel thread used for control.
+ *
+ * TODO:
+ *
+ * Add some information about sensor/control type and data format to
+ * sensors/controls, and have the sysfs attribute stuff be moved
+ * generically here instead of hard coded in the platform specific
+ * driver as it us currently
+ *
+ * This however requires solving some annoying lifetime issues with
+ * sysfs which doesn't seem to have lifetime rules for struct attribute,
+ * I may have to create full features kobjects for every sensor/control
+ * instead which is a bit of an overkill imho
+ */
+
+#include <linux/types.h>
+#include <linux/errno.h>
+#include <linux/kernel.h>
+#include <linux/init.h>
+#include <linux/spinlock.h>
+#include <linux/smp_lock.h>
+#include <linux/kthread.h>
+#include <linux/jiffies.h>
+#include <linux/reboot.h>
+#include <linux/device.h>
+#include <linux/platform_device.h>
+
+#include "windfarm.h"
+
+#define VERSION "0.2"
+
+#undef DEBUG
+
+#ifdef DEBUG
+#define DBG(args...)    printk(args)
+#else
+#define DBG(args...)    do { } while(0)
+#endif
+
+static LIST_HEAD(wf_controls);
+static LIST_HEAD(wf_sensors);
+static DECLARE_MUTEX(wf_lock);
+static struct notifier_block *wf_client_list;
+static int wf_client_count;
+static unsigned int wf_overtemp;
+static unsigned int wf_overtemp_counter;
+struct task_struct *wf_thread;
+
+/*
+ * Utilities & tick thread
+ */
+
+static inline void wf_notify(int event, void *param)
+{
+        notifier_call_chain(&wf_client_list, event, param);
+}
+
+int wf_critical_overtemp(void)
+{
+        static char * critical_overtemp_path = "/sbin/critical_overtemp";
+        char *argv[] = { critical_overtemp_path, NULL };
+        static char *envp[] = { "HOME=/",
+                                "TERM=linux",
+                                "PATH=/sbin:/usr/sbin:/bin:/usr/bin",
+                                NULL };
+
+        return call_usermodehelper(critical_overtemp_path, argv, envp, 0);
+}
+EXPORT_SYMBOL_GPL(wf_critical_overtemp);
+
+static int wf_thread_func(void *data)
+{
+        unsigned long next, delay;
+
+        next = jiffies;
+
+        DBG("wf: thread started\n");
+
+        while(!kthread_should_stop()) {
+                try_to_freeze();
+
+                if (time_after_eq(jiffies, next)) {
+                        wf_notify(WF_EVENT_TICK, NULL);
+                        if (wf_overtemp) {
+                                wf_overtemp_counter++;
+                                /* 10 seconds overtemp, notify userland */
+                                if (wf_overtemp_counter > 10)
+                                        wf_critical_overtemp();
+                                /* 30 seconds, shutdown */
+                                if (wf_overtemp_counter > 30) {
+                                        printk(KERN_ERR "windfarm: Overtemp "
+                                               "for more than 30"
+                                               " seconds, shutting down\n");
+                                        machine_power_off();
+                                }
+                        }
+                        next += HZ;
+                }
+
+                delay = next - jiffies;
+                if (delay <= HZ)
+                        schedule_timeout_interruptible(delay);
+
+                /* there should be no signal, but oh well */
+                if (signal_pending(current)) {
+                        printk(KERN_WARNING "windfarm: thread got sigl !\n");
+                        break;
+                }
+        }
+
+        DBG("wf: thread stopped\n");
+
+        return 0;
+}
+
+static void wf_start_thread(void)
+{
+        wf_thread = kthread_run(wf_thread_func, NULL, "kwindfarm");
+        if (IS_ERR(wf_thread)) {
+                printk(KERN_ERR "windfarm: failed to create thread,err %ld\n",
+                       PTR_ERR(wf_thread));
+                wf_thread = NULL;
+        }
+}
+
+
+static void wf_stop_thread(void)
+{
+        if (wf_thread)
+                kthread_stop(wf_thread);
+        wf_thread = NULL;
+}
+
+/*
+ * Controls
+ */
+
+static void wf_control_release(struct kref *kref)
+{
+        struct wf_control *ct = container_of(kref, struct wf_control, ref);
+
+        DBG("wf: Deleting control %s\n", ct->name);
+
+        if (ct->ops && ct->ops->release)
+                ct->ops->release(ct);
+        else
+                kfree(ct);
+}
+
+int wf_register_control(struct wf_control *new_ct)
+{
+        struct wf_control *ct;
+
+        down(&wf_lock);
+        list_for_each_entry(ct, &wf_controls, link) {
+                if (!strcmp(ct->name, new_ct->name)) {
+                        printk(KERN_WARNING "windfarm: trying to register"
+                               " duplicate control %s\n", ct->name);
+                        up(&wf_lock);
+                        return -EEXIST;
+                }
+        }
+        kref_init(&new_ct->ref);
+        list_add(&new_ct->link, &wf_controls);
+
+        DBG("wf: Registered control %s\n", new_ct->name);
+
+        wf_notify(WF_EVENT_NEW_CONTROL, new_ct);
+        up(&wf_lock);
+
+        return 0;
+}
+EXPORT_SYMBOL_GPL(wf_register_control);
+
+void wf_unregister_control(struct wf_control *ct)
+{
+        down(&wf_lock);
+        list_del(&ct->link);
+        up(&wf_lock);
+
+        DBG("wf: Unregistered control %s\n", ct->name);
+
+        kref_put(&ct->ref, wf_control_release);
+}
+EXPORT_SYMBOL_GPL(wf_unregister_control);
+
+struct wf_control * wf_find_control(const char *name)
+{
+        struct wf_control *ct;
+
+        down(&wf_lock);
+        list_for_each_entry(ct, &wf_controls, link) {
+                if (!strcmp(ct->name, name)) {
+                        if (wf_get_control(ct))
+                                ct = NULL;
+                        up(&wf_lock);
+                        return ct;
+                }
+        }
+        up(&wf_lock);
+        return NULL;
+}
+EXPORT_SYMBOL_GPL(wf_find_control);
+
+int wf_get_control(struct wf_control *ct)
+{
+        if (!try_module_get(ct->ops->owner))
+                return -ENODEV;
+        kref_get(&ct->ref);
+        return 0;
+}
+EXPORT_SYMBOL_GPL(wf_get_control);
+
+void wf_put_control(struct wf_control *ct)
+{
+        struct module *mod = ct->ops->owner;
+        kref_put(&ct->ref, wf_control_release);
+        module_put(mod);
+}
+EXPORT_SYMBOL_GPL(wf_put_control);
+
+
+/*
+ * Sensors
+ */
+
+
+static void wf_sensor_release(struct kref *kref)
+{
+        struct wf_sensor *sr = container_of(kref, struct wf_sensor, ref);
+
+        DBG("wf: Deleting sensor %s\n", sr->name);
+
+        if (sr->ops && sr->ops->release)
+                sr->ops->release(sr);
+        else
+                kfree(sr);
+}
+
+int wf_register_sensor(struct wf_sensor *new_sr)
+{
+        struct wf_sensor *sr;
+
+        down(&wf_lock);
+        list_for_each_entry(sr, &wf_sensors, link) {
+                if (!strcmp(sr->name, new_sr->name)) {
+                        printk(KERN_WARNING "windfarm: trying to register"
+                               " duplicate sensor %s\n", sr->name);
+                        up(&wf_lock);
+                        return -EEXIST;
+                }
+        }
+        kref_init(&new_sr->ref);
+        list_add(&new_sr->link, &wf_sensors);
+
+        DBG("wf: Registered sensor %s\n", new_sr->name);
+
+        wf_notify(WF_EVENT_NEW_SENSOR, new_sr);
+        up(&wf_lock);
+
+        return 0;
+}
+EXPORT_SYMBOL_GPL(wf_register_sensor);
+
+void wf_unregister_sensor(struct wf_sensor *sr)
+{
+        down(&wf_lock);
+        list_del(&sr->link);
+        up(&wf_lock);
+
+        DBG("wf: Unregistered sensor %s\n", sr->name);
+
+        wf_put_sensor(sr);
+}
+EXPORT_SYMBOL_GPL(wf_unregister_sensor);
+
+struct wf_sensor * wf_find_sensor(const char *name)
+{
+        struct wf_sensor *sr;
+
+        down(&wf_lock);
+        list_for_each_entry(sr, &wf_sensors, link) {
+                if (!strcmp(sr->name, name)) {
+                        if (wf_get_sensor(sr))
+                                sr = NULL;
+                        up(&wf_lock);
+                        return sr;
+                }
+        }
+        up(&wf_lock);
+        return NULL;
+}
+EXPORT_SYMBOL_GPL(wf_find_sensor);
+
+int wf_get_sensor(struct wf_sensor *sr)
+{
+        if (!try_module_get(sr->ops->owner))
+                return -ENODEV;
+        kref_get(&sr->ref);
+        return 0;
+}
+EXPORT_SYMBOL_GPL(wf_get_sensor);
+
+void wf_put_sensor(struct wf_sensor *sr)
+{
+        struct module *mod = sr->ops->owner;
+        kref_put(&sr->ref, wf_sensor_release);
+        module_put(mod);
+}
+EXPORT_SYMBOL_GPL(wf_put_sensor);
+
+
+/*
+ * Client & notification
+ */
+
+int wf_register_client(struct notifier_block *nb)
+{
+        int rc;
+        struct wf_control *ct;
+        struct wf_sensor *sr;
+
+        down(&wf_lock);
+        rc = notifier_chain_register(&wf_client_list, nb);
+        if (rc != 0)
+                goto bail;
+        wf_client_count++;
+        list_for_each_entry(ct, &wf_controls, link)
+                wf_notify(WF_EVENT_NEW_CONTROL, ct);
+        list_for_each_entry(sr, &wf_sensors, link)
+                wf_notify(WF_EVENT_NEW_SENSOR, sr);
+        if (wf_client_count == 1)
+                wf_start_thread();
+ bail:
+        up(&wf_lock);
+        return rc;
+}
+EXPORT_SYMBOL_GPL(wf_register_client);
+
+int wf_unregister_client(struct notifier_block *nb)
+{
+        down(&wf_lock);
+        notifier_chain_unregister(&wf_client_list, nb);
+        wf_client_count++;
+        if (wf_client_count == 0)
+                wf_stop_thread();
+        up(&wf_lock);
+
+        return 0;
+}
+EXPORT_SYMBOL_GPL(wf_unregister_client);
+
+void wf_set_overtemp(void)
+{
+        down(&wf_lock);
+        wf_overtemp++;
+        if (wf_overtemp == 1) {
+                printk(KERN_WARNING "windfarm: Overtemp condition detected !\n");
+                wf_overtemp_counter = 0;
+                wf_notify(WF_EVENT_OVERTEMP, NULL);
+        }
+        up(&wf_lock);
+}
+EXPORT_SYMBOL_GPL(wf_set_overtemp);
+
+void wf_clear_overtemp(void)
+{
+        down(&wf_lock);
+        WARN_ON(wf_overtemp == 0);
+        if (wf_overtemp == 0) {
+                up(&wf_lock);
+                return;
+        }
+        wf_overtemp--;
+        if (wf_overtemp == 0) {
+                printk(KERN_WARNING "windfarm: Overtemp condition cleared !\n");
+                wf_notify(WF_EVENT_NORMALTEMP, NULL);
+        }
+        up(&wf_lock);
+}
+EXPORT_SYMBOL_GPL(wf_clear_overtemp);
+
+int wf_is_overtemp(void)
+{
+        return (wf_overtemp != 0);
+}
+EXPORT_SYMBOL_GPL(wf_is_overtemp);
+
+static struct platform_device wf_platform_device = {
+        .name   = "windfarm",
+};
+
+static int __init windfarm_core_init(void)
+{
+        DBG("wf: core loaded\n");
+
+        platform_device_register(&wf_platform_device);
+        return 0;
+}
+
+static void __exit windfarm_core_exit(void)
+{
+        BUG_ON(wf_client_count != 0);
+
+        DBG("wf: core unloaded\n");
+
+        platform_device_unregister(&wf_platform_device);
+}
+
+
+module_init(windfarm_core_init);
+module_exit(windfarm_core_exit);
+
+MODULE_AUTHOR("Benjamin Herrenschmidt <benh@kernel.crashing.org>");
+MODULE_DESCRIPTION("Core component of PowerMac thermal control");
+MODULE_LICENSE("GPL");
+
diff --git a/drivers/macintosh/windfarm_cpufreq_clamp.c b/drivers/macintosh/windfarm_cpufreq_clamp.c
new file mode 100644
index 000000000000..607dbaca69c9
--- /dev/null
+++ b/drivers/macintosh/windfarm_cpufreq_clamp.c
@@ -0,0 +1,105 @@
+#include <linux/config.h>
+#include <linux/types.h>
+#include <linux/errno.h>
+#include <linux/kernel.h>
+#include <linux/delay.h>
+#include <linux/slab.h>
+#include <linux/init.h>
+#include <linux/wait.h>
+#include <linux/cpufreq.h>
+
+#include "windfarm.h"
+
+#define VERSION "0.3"
+
+static int clamped;
+static struct wf_control *clamp_control;
+
+static int clamp_notifier_call(struct notifier_block *self,
+                               unsigned long event, void *data)
+{
+        struct cpufreq_policy *p = data;
+        unsigned long max_freq;
+
+        if (event != CPUFREQ_ADJUST)
+                return 0;
+
+        max_freq = clamped ? (p->cpuinfo.min_freq) : (p->cpuinfo.max_freq);
+        cpufreq_verify_within_limits(p, 0, max_freq);
+
+        return 0;
+}
+
+static struct notifier_block clamp_notifier = {
+        .notifier_call = clamp_notifier_call,
+};
+
+static int clamp_set(struct wf_control *ct, s32 value)
+{
+        if (value)
+                printk(KERN_INFO "windfarm: Clamping CPU frequency to "
+                       "minimum !\n");
+        else
+                printk(KERN_INFO "windfarm: CPU frequency unclamped !\n");
+        clamped = value;
+        cpufreq_update_policy(0);
+        return 0;
+}
+
+static int clamp_get(struct wf_control *ct, s32 *value)
+{
+        *value = clamped;
+        return 0;
+}
+
+static s32 clamp_min(struct wf_control *ct)
+{
+        return 0;
+}
+
+static s32 clamp_max(struct wf_control *ct)
+{
+        return 1;
+}
+
+static struct wf_control_ops clamp_ops = {
+        .set_value      = clamp_set,
+        .get_value      = clamp_get,
+        .get_min        = clamp_min,
+        .get_max        = clamp_max,
+        .owner          = THIS_MODULE,
+};
+
+static int __init wf_cpufreq_clamp_init(void)
+{
+        struct wf_control *clamp;
+
+        clamp = kmalloc(sizeof(struct wf_control), GFP_KERNEL);
+        if (clamp == NULL)
+                return -ENOMEM;
+        cpufreq_register_notifier(&clamp_notifier, CPUFREQ_POLICY_NOTIFIER);
+        clamp->ops = &clamp_ops;
+        clamp->name = "cpufreq-clamp";
+        if (wf_register_control(clamp))
+                goto fail;
+        clamp_control = clamp;
+        return 0;
+ fail:
+        kfree(clamp);
+        return -ENODEV;
+}
+
+static void __exit wf_cpufreq_clamp_exit(void)
+{
+        if (clamp_control)
+                wf_unregister_control(clamp_control);
+}
+
+
+module_init(wf_cpufreq_clamp_init);
+module_exit(wf_cpufreq_clamp_exit);
+
+MODULE_AUTHOR("Benjamin Herrenschmidt <benh@kernel.crashing.org>");
+MODULE_DESCRIPTION("CPU frequency clamp for PowerMacs thermal control");
+MODULE_LICENSE("GPL");
+
diff --git a/drivers/macintosh/windfarm_lm75_sensor.c b/drivers/macintosh/windfarm_lm75_sensor.c
new file mode 100644
index 000000000000..a0a41ad0f2b5
--- /dev/null
+++ b/drivers/macintosh/windfarm_lm75_sensor.c
@@ -0,0 +1,263 @@
+/*
+ * Windfarm PowerMac thermal control. LM75 sensor
+ *
+ * (c) Copyright 2005 Benjamin Herrenschmidt, IBM Corp.
+ *                    <benh@kernel.crashing.org>
+ *
+ * Released under the term of the GNU GPL v2.
+ */
+
+#include <linux/types.h>
+#include <linux/errno.h>
+#include <linux/kernel.h>
+#include <linux/delay.h>
+#include <linux/slab.h>
+#include <linux/init.h>
+#include <linux/wait.h>
+#include <linux/i2c.h>
+#include <linux/i2c-dev.h>
+#include <asm/prom.h>
+#include <asm/machdep.h>
+#include <asm/io.h>
+#include <asm/system.h>
+#include <asm/sections.h>
+
+#include "windfarm.h"
+
+#define VERSION "0.1"
+
+#undef DEBUG
+
+#ifdef DEBUG
+#define DBG(args...)    printk(args)
+#else
+#define DBG(args...)    do { } while(0)
+#endif
+
+struct wf_lm75_sensor {
+        int                     ds1775 : 1;
+        int                     inited : 1;
+        struct  i2c_client      i2c;
+        struct  wf_sensor       sens;
+};
+#define wf_to_lm75(c) container_of(c, struct wf_lm75_sensor, sens)
+#define i2c_to_lm75(c) container_of(c, struct wf_lm75_sensor, i2c)
+
+static int wf_lm75_attach(struct i2c_adapter *adapter);
+static int wf_lm75_detach(struct i2c_client *client);
+
+static struct i2c_driver wf_lm75_driver = {
+        .owner          = THIS_MODULE,
+        .name           = "wf_lm75",
+        .flags          = I2C_DF_NOTIFY,
+        .attach_adapter = wf_lm75_attach,
+        .detach_client  = wf_lm75_detach,
+};
+
+static int wf_lm75_get(struct wf_sensor *sr, s32 *value)
+{
+        struct wf_lm75_sensor *lm = wf_to_lm75(sr);
+        s32 data;
+
+        if (lm->i2c.adapter == NULL)
+                return -ENODEV;
+
+        /* Init chip if necessary */
+        if (!lm->inited) {
+                u8 cfg_new, cfg = (u8)i2c_smbus_read_byte_data(&lm->i2c, 1);
+
+                DBG("wf_lm75: Initializing %s, cfg was: %02x\n",
+                    sr->name, cfg);
+
+                /* clear shutdown bit, keep other settings as left by
+                 * the firmware for now
+                 */
+                cfg_new = cfg & ~0x01;
+                i2c_smbus_write_byte_data(&lm->i2c, 1, cfg_new);
+                lm->inited = 1;
+
+                /* If we just powered it up, let's wait 200 ms */
+                msleep(200);
+        }
+
+        /* Read temperature register */
+        data = (s32)le16_to_cpu(i2c_smbus_read_word_data(&lm->i2c, 0));
+        data <<= 8;
+        *value = data;
+
+        return 0;
+}
+
+static void wf_lm75_release(struct wf_sensor *sr)
+{
+        struct wf_lm75_sensor *lm = wf_to_lm75(sr);
+
+        /* check if client is registered and detach from i2c */
+        if (lm->i2c.adapter) {
+                i2c_detach_client(&lm->i2c);
+                lm->i2c.adapter = NULL;
+        }
+
+        kfree(lm);
+}
+
+static struct wf_sensor_ops wf_lm75_ops = {
+        .get_value      = wf_lm75_get,
+        .release        = wf_lm75_release,
+        .owner          = THIS_MODULE,
+};
+
+static struct wf_lm75_sensor *wf_lm75_create(struct i2c_adapter *adapter,
+                                             u8 addr, int ds1775,
+                                             const char *loc)
+{
+        struct wf_lm75_sensor *lm;
+
+        DBG("wf_lm75: creating  %s device at address 0x%02x\n",
+            ds1775 ? "ds1775" : "lm75", addr);
+
+        lm = kmalloc(sizeof(struct wf_lm75_sensor), GFP_KERNEL);
+        if (lm == NULL)
+                return NULL;
+        memset(lm, 0, sizeof(struct wf_lm75_sensor));
+
+        /* Usual rant about sensor names not beeing very consistent in
+         * the device-tree, oh well ...
+         * Add more entries below as you deal with more setups
+         */
+        if (!strcmp(loc, "Hard drive") || !strcmp(loc, "DRIVE BAY"))
+                lm->sens.name = "hd-temp";
+        else
+                goto fail;
+
+        lm->inited = 0;
+        lm->sens.ops = &wf_lm75_ops;
+        lm->ds1775 = ds1775;
+        lm->i2c.addr = (addr >> 1) & 0x7f;
+        lm->i2c.adapter = adapter;
+        lm->i2c.driver = &wf_lm75_driver;
+        strncpy(lm->i2c.name, lm->sens.name, I2C_NAME_SIZE-1);
+
+        if (i2c_attach_client(&lm->i2c)) {
+                printk(KERN_ERR "windfarm: failed to attach %s %s to i2c\n",
+                       ds1775 ? "ds1775" : "lm75", lm->i2c.name);
+                goto fail;
+        }
+
+        if (wf_register_sensor(&lm->sens)) {
+                i2c_detach_client(&lm->i2c);
+                goto fail;
+        }
+
+        return lm;
+ fail:
+        kfree(lm);
+        return NULL;
+}
+
+static int wf_lm75_attach(struct i2c_adapter *adapter)
+{
+        u8 bus_id;
+        struct device_node *smu, *bus, *dev;
+
+        /* We currently only deal with LM75's hanging off the SMU
+         * i2c busses. If we extend that driver to other/older
+         * machines, we should split this function into SMU-i2c,
+         * keywest-i2c, PMU-i2c, ...
+         */
+
+        DBG("wf_lm75: adapter %s detected\n", adapter->name);
+
+        if (strncmp(adapter->name, "smu-i2c-", 8) != 0)
+                return 0;
+        smu = of_find_node_by_type(NULL, "smu");
+        if (smu == NULL)
+                return 0;
+
+        /* Look for the bus in the device-tree */
+        bus_id = (u8)simple_strtoul(adapter->name + 8, NULL, 16);
+
+        DBG("wf_lm75: bus ID is %x\n", bus_id);
+
+        /* Look for sensors subdir */
+        for (bus = NULL;
+             (bus = of_get_next_child(smu, bus)) != NULL;) {
+                u32 *reg;
+
+                if (strcmp(bus->name, "i2c"))
+                        continue;
+                reg = (u32 *)get_property(bus, "reg", NULL);
+                if (reg == NULL)
+                        continue;
+                if (bus_id == *reg)
+                        break;
+        }
+        of_node_put(smu);
+        if (bus == NULL) {
+                printk(KERN_WARNING "windfarm: SMU i2c bus 0x%x not found"
+                       " in device-tree !\n", bus_id);
+                return 0;
+        }
+
+        DBG("wf_lm75: bus found, looking for device...\n");
+
+        /* Now look for lm75(s) in there */
+        for (dev = NULL;
+             (dev = of_get_next_child(bus, dev)) != NULL;) {
+                const char *loc =
+                        get_property(dev, "hwsensor-location", NULL);
+                u32 *reg = (u32 *)get_property(dev, "reg", NULL);
+                DBG(" dev: %s... (loc: %p, reg: %p)\n", dev->name, loc, reg);
+                if (loc == NULL || reg == NULL)
+                        continue;
+                /* real lm75 */
+                if (device_is_compatible(dev, "lm75"))
+                        wf_lm75_create(adapter, *reg, 0, loc);
+                /* ds1775 (compatible, better resolution */
+                else if (device_is_compatible(dev, "ds1775"))
+                        wf_lm75_create(adapter, *reg, 1, loc);
+        }
+
+        of_node_put(bus);
+
+        return 0;
+}
+
+static int wf_lm75_detach(struct i2c_client *client)
+{
+        struct wf_lm75_sensor *lm = i2c_to_lm75(client);
+
+        DBG("wf_lm75: i2c detatch called for %s\n", lm->sens.name);
+
+        /* Mark client detached */
+        lm->i2c.adapter = NULL;
+
+        /* release sensor */
+        wf_unregister_sensor(&lm->sens);
+
+        return 0;
+}
+
+static int __init wf_lm75_sensor_init(void)
+{
+        int rc;
+
+        rc = i2c_add_driver(&wf_lm75_driver);
+        if (rc < 0)
+                return rc;
+        return 0;
+}
+
+static void __exit wf_lm75_sensor_exit(void)
+{
+        i2c_del_driver(&wf_lm75_driver);
+}
+
+
+module_init(wf_lm75_sensor_init);
+module_exit(wf_lm75_sensor_exit);
+
+MODULE_AUTHOR("Benjamin Herrenschmidt <benh@kernel.crashing.org>");
+MODULE_DESCRIPTION("LM75 sensor objects for PowerMacs thermal control");
+MODULE_LICENSE("GPL");
+
diff --git a/drivers/macintosh/windfarm_pid.c b/drivers/macintosh/windfarm_pid.c
new file mode 100644
index 000000000000..2e803b368757
--- /dev/null
+++ b/drivers/macintosh/windfarm_pid.c
@@ -0,0 +1,145 @@
+/*
+ * Windfarm PowerMac thermal control. Generic PID helpers
+ *
+ * (c) Copyright 2005 Benjamin Herrenschmidt, IBM Corp.
+ *                    <benh@kernel.crashing.org>
+ *
+ * Released under the term of the GNU GPL v2.
+ */
+
+#include <linux/types.h>
+#include <linux/errno.h>
+#include <linux/kernel.h>
+#include <linux/string.h>
+#include <linux/module.h>
+
+#include "windfarm_pid.h"
+
+#undef DEBUG
+
+#ifdef DEBUG
+#define DBG(args...)    printk(args)
+#else
+#define DBG(args...)    do { } while(0)
+#endif
+
+void wf_pid_init(struct wf_pid_state *st, struct wf_pid_param *param)
+{
+        memset(st, 0, sizeof(struct wf_pid_state));
+        st->param = *param;
+        st->first = 1;
+}
+EXPORT_SYMBOL_GPL(wf_pid_init);
+
+s32 wf_pid_run(struct wf_pid_state *st, s32 new_sample)
+{
+        s64     error, integ, deriv;
+        s32     target;
+        int     i, hlen = st->param.history_len;
+
+        /* Calculate error term */
+        error = new_sample - st->param.itarget;
+
+        /* Get samples into our history buffer */
+        if (st->first) {
+                for (i = 0; i < hlen; i++) {
+                        st->samples[i] = new_sample;
+                        st->errors[i] = error;
+                }
+                st->first = 0;
+                st->index = 0;
+        } else {
+                st->index = (st->index + 1) % hlen;
+                st->samples[st->index] = new_sample;
+                st->errors[st->index] = error;
+        }
+
+        /* Calculate integral term */
+        for (i = 0, integ = 0; i < hlen; i++)
+                integ += st->errors[(st->index + hlen - i) % hlen];
+        integ *= st->param.interval;
+
+        /* Calculate derivative term */
+        deriv = st->errors[st->index] -
+                st->errors[(st->index + hlen - 1) % hlen];
+        deriv /= st->param.interval;
+
+        /* Calculate target */
+        target = (s32)((integ * (s64)st->param.gr + deriv * (s64)st->param.gd +
+                  error * (s64)st->param.gp) >> 36);
+        if (st->param.additive)
+                target += st->target;
+        target = max(target, st->param.min);
+        target = min(target, st->param.max);
+        st->target = target;
+
+        return st->target;
+}
+EXPORT_SYMBOL_GPL(wf_pid_run);
+
+void wf_cpu_pid_init(struct wf_cpu_pid_state *st,
+                     struct wf_cpu_pid_param *param)
+{
+        memset(st, 0, sizeof(struct wf_cpu_pid_state));
+        st->param = *param;
+        st->first = 1;
+}
+EXPORT_SYMBOL_GPL(wf_cpu_pid_init);
+
+s32 wf_cpu_pid_run(struct wf_cpu_pid_state *st, s32 new_power, s32 new_temp)
+{
+        s64     error, integ, deriv, prop;
+        s32     target, sval, adj;
+        int     i, hlen = st->param.history_len;
+
+        /* Calculate error term */
+        error = st->param.pmaxadj - new_power;
+
+        /* Get samples into our history buffer */
+        if (st->first) {
+                for (i = 0; i < hlen; i++) {
+                        st->powers[i] = new_power;
+                        st->errors[i] = error;
+                }
+                st->temps[0] = st->temps[1] = new_temp;
+                st->first = 0;
+                st->index = st->tindex = 0;
+        } else {
+                st->index = (st->index + 1) % hlen;
+                st->powers[st->index] = new_power;
+                st->errors[st->index] = error;
+                st->tindex = (st->tindex + 1) % 2;
+                st->temps[st->tindex] = new_temp;
+        }
+
+        /* Calculate integral term */
+        for (i = 0, integ = 0; i < hlen; i++)
+                integ += st->errors[(st->index + hlen - i) % hlen];
+        integ *= st->param.interval;
+        integ *= st->param.gr;
+        sval = st->param.tmax - ((integ >> 20) & 0xffffffff);
+        adj = min(st->param.ttarget, sval);
+
+        DBG("integ: %lx, sval: %lx, adj: %lx\n", integ, sval, adj);
+
+        /* Calculate derivative term */
+        deriv = st->temps[st->tindex] -
+                st->temps[(st->tindex + 2 - 1) % 2];
+        deriv /= st->param.interval;
+        deriv *= st->param.gd;
+
+        /* Calculate proportional term */
+        prop = (new_temp - adj);
+        prop *= st->param.gp;
+
+        DBG("deriv: %lx, prop: %lx\n", deriv, prop);
+
+        /* Calculate target */
+        target = st->target + (s32)((deriv + prop) >> 36);
+        target = max(target, st->param.min);
+        target = min(target, st->param.max);
+        st->target = target;
+
+        return st->target;
+}
+EXPORT_SYMBOL_GPL(wf_cpu_pid_run);
diff --git a/drivers/macintosh/windfarm_pid.h b/drivers/macintosh/windfarm_pid.h
new file mode 100644
index 000000000000..a364c2a2499c
--- /dev/null
+++ b/drivers/macintosh/windfarm_pid.h
@@ -0,0 +1,84 @@
+/*
+ * Windfarm PowerMac thermal control. Generic PID helpers
+ *
+ * (c) Copyright 2005 Benjamin Herrenschmidt, IBM Corp.
+ *                    <benh@kernel.crashing.org>
+ *
+ * Released under the term of the GNU GPL v2.
+ *
+ * This is a pair of generic PID helpers that can be used by
+ * control loops. One is the basic PID implementation, the
+ * other one is more specifically tailored to the loops used
+ * for CPU control with 2 input sample types (temp and power)
+ */
+
+/*
+ * *** Simple PID ***
+ */
+
+#define WF_PID_MAX_HISTORY      32
+
+/* This parameter array is passed to the PID algorithm. Currently,
+ * we don't support changing parameters on the fly as it's not needed
+ * but could be implemented (with necessary adjustment of the history
+ * buffer
+ */
+struct wf_pid_param {
+        int     interval;       /* Interval between samples in seconds */
+        int     history_len;    /* Size of history buffer */
+        int     additive;       /* 1: target relative to previous value */
+        s32     gd, gp, gr;     /* PID gains */
+        s32     itarget;        /* PID input target */
+        s32     min,max;        /* min and max target values */
+};
+
+struct wf_pid_state {
+        int     first;                          /* first run of the loop */
+        int     index;                          /* index of current sample */
+        s32     target;                         /* current target value */
+        s32     samples[WF_PID_MAX_HISTORY];    /* samples history buffer */
+        s32     errors[WF_PID_MAX_HISTORY];     /* error history buffer */
+
+        struct wf_pid_param param;
+};
+
+extern void wf_pid_init(struct wf_pid_state *st, struct wf_pid_param *param);
+extern s32 wf_pid_run(struct wf_pid_state *st, s32 sample);
+
+
+/*
+ * *** CPU PID ***
+ */
+
+#define WF_CPU_PID_MAX_HISTORY  32
+
+/* This parameter array is passed to the CPU PID algorithm. Currently,
+ * we don't support changing parameters on the fly as it's not needed
+ * but could be implemented (with necessary adjustment of the history
+ * buffer
+ */
+struct wf_cpu_pid_param {
+        int     interval;       /* Interval between samples in seconds */
+        int     history_len;    /* Size of history buffer */
+        s32     gd, gp, gr;     /* PID gains */
+        s32     pmaxadj;        /* PID max power adjust */
+        s32     ttarget;        /* PID input target */
+        s32     tmax;           /* PID input max */
+        s32     min,max;        /* min and max target values */
+};
+
+struct wf_cpu_pid_state {
+        int     first;                          /* first run of the loop */
+        int     index;                          /* index of current power */
+        int     tindex;                         /* index of current temp */
+        s32     target;                         /* current target value */
+        s32     powers[WF_PID_MAX_HISTORY];     /* power history buffer */
+        s32     errors[WF_PID_MAX_HISTORY];     /* error history buffer */
+        s32     temps[2];                       /* temp. history buffer */
+
+        struct wf_cpu_pid_param param;
+};
+
+extern void wf_cpu_pid_init(struct wf_cpu_pid_state *st,
+                            struct wf_cpu_pid_param *param);
+extern s32 wf_cpu_pid_run(struct wf_cpu_pid_state *st, s32 power, s32 temp);
diff --git a/drivers/macintosh/windfarm_pm81.c b/drivers/macintosh/windfarm_pm81.c
new file mode 100644
index 000000000000..322c74b2687f
--- /dev/null
+++ b/drivers/macintosh/windfarm_pm81.c
@@ -0,0 +1,879 @@
+/*
+ * Windfarm PowerMac thermal control. iMac G5
+ *
+ * (c) Copyright 2005 Benjamin Herrenschmidt, IBM Corp.
+ *                    <benh@kernel.crashing.org>
+ *
+ * Released under the term of the GNU GPL v2.
+ *
+ * The algorithm used is the PID control algorithm, used the same
+ * way the published Darwin code does, using the same values that
+ * are present in the Darwin 8.2 snapshot property lists (note however
+ * that none of the code has been re-used, it's a complete re-implementation
+ *
+ * The various control loops found in Darwin config file are:
+ *
+ * PowerMac8,1 and PowerMac8,2
+ * ===========================
+ *
+ * System Fans control loop. Different based on models. In addition to the
+ * usual PID algorithm, the control loop gets 2 additional pairs of linear
+ * scaling factors (scale/offsets) expressed as 4.12 fixed point values
+ * signed offset, unsigned scale)
+ *
+ * The targets are modified such as:
+ *  - the linked control (second control) gets the target value as-is
+ *    (typically the drive fan)
+ *  - the main control (first control) gets the target value scaled with
+ *    the first pair of factors, and is then modified as below
+ *  - the value of the target of the CPU Fan control loop is retreived,
+ *    scaled with the second pair of factors, and the max of that and
+ *    the scaled target is applied to the main control.
+ *
+ * # model_id: 2
+ *   controls       : system-fan, drive-bay-fan
+ *   sensors        : hd-temp
+ *   PID params     : G_d = 0x15400000
+ *                    G_p = 0x00200000
+ *                    G_r = 0x000002fd
+ *                    History = 2 entries
+ *                    Input target = 0x3a0000
+ *                    Interval = 5s
+ *   linear-factors : offset = 0xff38 scale  = 0x0ccd
+ *                    offset = 0x0208 scale  = 0x07ae
+ *
+ * # model_id: 3
+ *   controls       : system-fan, drive-bay-fan
+ *   sensors        : hd-temp
+ *   PID params     : G_d = 0x08e00000
+ *                    G_p = 0x00566666
+ *                    G_r = 0x0000072b
+ *                    History = 2 entries
+ *                    Input target = 0x350000
+ *                    Interval = 5s
+ *   linear-factors : offset = 0xff38 scale  = 0x0ccd
+ *                    offset = 0x0000 scale  = 0x0000
+ *
+ * # model_id: 5
+ *   controls       : system-fan
+ *   sensors        : hd-temp
+ *   PID params     : G_d = 0x15400000
+ *                    G_p = 0x00233333
+ *                    G_r = 0x000002fd
+ *                    History = 2 entries
+ *                    Input target = 0x3a0000
+ *                    Interval = 5s
+ *   linear-factors : offset = 0x0000 scale  = 0x1000
+ *                    offset = 0x0091 scale  = 0x0bae
+ *
+ * CPU Fan control loop. The loop is identical for all models. it
+ * has an additional pair of scaling factor. This is used to scale the
+ * systems fan control loop target result (the one before it gets scaled
+ * by the System Fans control loop itself). Then, the max value of the
+ * calculated target value and system fan value is sent to the fans
+ *
+ *   controls       : cpu-fan
+ *   sensors        : cpu-temp cpu-power
+ *   PID params     : From SMU sdb partition
+ *   linear-factors : offset = 0xfb50 scale  = 0x1000
+ *
+ * CPU Slew control loop. Not implemented. The cpufreq driver in linux is
+ * completely separate for now, though we could find a way to link it, either
+ * as a client reacting to overtemp notifications, or directling monitoring
+ * the CPU temperature
+ *
+ * WARNING ! The CPU control loop requires the CPU tmax for the current
+ * operating point. However, we currently are completely separated from
+ * the cpufreq driver and thus do not know what the current operating
+ * point is. Fortunately, we also do not have any hardware supporting anything
+ * but operating point 0 at the moment, thus we just peek that value directly
+ * from the SDB partition. If we ever end up with actually slewing the system
+ * clock and thus changing operating points, we'll have to find a way to
+ * communicate with the CPU freq driver;
+ *
+ */
+
+#include <linux/types.h>
+#include <linux/errno.h>
+#include <linux/kernel.h>
+#include <linux/delay.h>
+#include <linux/slab.h>
+#include <linux/init.h>
+#include <linux/spinlock.h>
+#include <linux/wait.h>
+#include <linux/kmod.h>
+#include <linux/device.h>
+#include <linux/platform_device.h>
+#include <asm/prom.h>
+#include <asm/machdep.h>
+#include <asm/io.h>
+#include <asm/system.h>
+#include <asm/sections.h>
+#include <asm/smu.h>
+
+#include "windfarm.h"
+#include "windfarm_pid.h"
+
+#define VERSION "0.4"
+
+#undef DEBUG
+
+#ifdef DEBUG
+#define DBG(args...)    printk(args)
+#else
+#define DBG(args...)    do { } while(0)
+#endif
+
+/* define this to force CPU overtemp to 74 degree, useful for testing
+ * the overtemp code
+ */
+#undef HACKED_OVERTEMP
+
+static int wf_smu_mach_model;   /* machine model id */
+
+static struct device *wf_smu_dev;
+
+/* Controls & sensors */
+static struct wf_sensor *sensor_cpu_power;
+static struct wf_sensor *sensor_cpu_temp;
+static struct wf_sensor *sensor_hd_temp;
+static struct wf_control *fan_cpu_main;
+static struct wf_control *fan_hd;
+static struct wf_control *fan_system;
+static struct wf_control *cpufreq_clamp;
+
+/* Set to kick the control loop into life */
+static int wf_smu_all_controls_ok, wf_smu_all_sensors_ok, wf_smu_started;
+
+/* Failure handling.. could be nicer */
+#define FAILURE_FAN             0x01
+#define FAILURE_SENSOR          0x02
+#define FAILURE_OVERTEMP        0x04
+
+static unsigned int wf_smu_failure_state;
+static int wf_smu_readjust, wf_smu_skipping;
+
+/*
+ * ****** System Fans Control Loop ******
+ *
+ */
+
+/* Parameters for the System Fans control loop. Parameters
+ * not in this table such as interval, history size, ...
+ * are common to all versions and thus hard coded for now.
+ */
+struct wf_smu_sys_fans_param {
+        int     model_id;
+        s32     itarget;
+        s32     gd, gp, gr;
+
+        s16     offset0;
+        u16     scale0;
+        s16     offset1;
+        u16     scale1;
+};
+
+#define WF_SMU_SYS_FANS_INTERVAL        5
+#define WF_SMU_SYS_FANS_HISTORY_SIZE    2
+
+/* State data used by the system fans control loop
+ */
+struct wf_smu_sys_fans_state {
+        int                     ticks;
+        s32                     sys_setpoint;
+        s32                     hd_setpoint;
+        s16                     offset0;
+        u16                     scale0;
+        s16                     offset1;
+        u16                     scale1;
+        struct wf_pid_state     pid;
+};
+
+/*
+ * Configs for SMU Sytem Fan control loop
+ */
+static struct wf_smu_sys_fans_param wf_smu_sys_all_params[] = {
+        /* Model ID 2 */
+        {
+                .model_id       = 2,
+                .itarget        = 0x3a0000,
+                .gd             = 0x15400000,
+                .gp             = 0x00200000,
+                .gr             = 0x000002fd,
+                .offset0        = 0xff38,
+                .scale0         = 0x0ccd,
+                .offset1        = 0x0208,
+                .scale1         = 0x07ae,
+        },
+        /* Model ID 3 */
+        {
+                .model_id       = 2,
+                .itarget        = 0x350000,
+                .gd             = 0x08e00000,
+                .gp             = 0x00566666,
+                .gr             = 0x0000072b,
+                .offset0        = 0xff38,
+                .scale0         = 0x0ccd,
+                .offset1        = 0x0000,
+                .scale1         = 0x0000,
+        },
+        /* Model ID 5 */
+        {
+                .model_id       = 2,
+                .itarget        = 0x3a0000,
+                .gd             = 0x15400000,
+                .gp             = 0x00233333,
+                .gr             = 0x000002fd,
+                .offset0        = 0x0000,
+                .scale0         = 0x1000,
+                .offset1        = 0x0091,
+                .scale1         = 0x0bae,
+        },
+};
+#define WF_SMU_SYS_FANS_NUM_CONFIGS ARRAY_SIZE(wf_smu_sys_all_params)
+
+static struct wf_smu_sys_fans_state *wf_smu_sys_fans;
+
+/*
+ * ****** CPU Fans Control Loop ******
+ *
+ */
+
+
+#define WF_SMU_CPU_FANS_INTERVAL        1
+#define WF_SMU_CPU_FANS_MAX_HISTORY     16
+#define WF_SMU_CPU_FANS_SIBLING_SCALE   0x00001000
+#define WF_SMU_CPU_FANS_SIBLING_OFFSET  0xfffffb50
+
+/* State data used by the cpu fans control loop
+ */
+struct wf_smu_cpu_fans_state {
+        int                     ticks;
+        s32                     cpu_setpoint;
+        s32                     scale;
+        s32                     offset;
+        struct wf_cpu_pid_state pid;
+};
+
+static struct wf_smu_cpu_fans_state *wf_smu_cpu_fans;
+
+
+
+/*
+ * ***** Implementation *****
+ *
+ */
+
+static void wf_smu_create_sys_fans(void)
+{
+        struct wf_smu_sys_fans_param *param = NULL;
+        struct wf_pid_param pid_param;
+        int i;
+
+        /* First, locate the params for this model */
+        for (i = 0; i < WF_SMU_SYS_FANS_NUM_CONFIGS; i++)
+                if (wf_smu_sys_all_params[i].model_id == wf_smu_mach_model) {
+                        param = &wf_smu_sys_all_params[i];
+                        break;
+                }
+
+        /* No params found, put fans to max */
+        if (param == NULL) {
+                printk(KERN_WARNING "windfarm: System fan config not found "
+                       "for this machine model, max fan speed\n");
+                goto fail;
+        }
+
+        /* Alloc & initialize state */
+        wf_smu_sys_fans = kmalloc(sizeof(struct wf_smu_sys_fans_state),
+                                  GFP_KERNEL);
+        if (wf_smu_sys_fans == NULL) {
+                printk(KERN_WARNING "windfarm: Memory allocation error"
+                       " max fan speed\n");
+                goto fail;
+        }
+        wf_smu_sys_fans->ticks = 1;
+        wf_smu_sys_fans->scale0 = param->scale0;
+        wf_smu_sys_fans->offset0 = param->offset0;
+        wf_smu_sys_fans->scale1 = param->scale1;
+        wf_smu_sys_fans->offset1 = param->offset1;
+
+        /* Fill PID params */
+        pid_param.gd = param->gd;
+        pid_param.gp = param->gp;
+        pid_param.gr = param->gr;
+        pid_param.interval = WF_SMU_SYS_FANS_INTERVAL;
+        pid_param.history_len = WF_SMU_SYS_FANS_HISTORY_SIZE;
+        pid_param.itarget = param->itarget;
+        pid_param.min = fan_system->ops->get_min(fan_system);
+        pid_param.max = fan_system->ops->get_max(fan_system);
+        if (fan_hd) {
+                pid_param.min =
+                        max(pid_param.min,fan_hd->ops->get_min(fan_hd));
+                pid_param.max =
+                        min(pid_param.max,fan_hd->ops->get_max(fan_hd));
+        }
+        wf_pid_init(&wf_smu_sys_fans->pid, &pid_param);
+
+        DBG("wf: System Fan control initialized.\n");
+        DBG("    itarged=%d.%03d, min=%d RPM, max=%d RPM\n",
+            FIX32TOPRINT(pid_param.itarget), pid_param.min, pid_param.max);
+        return;
+
+ fail:
+
+        if (fan_system)
+                wf_control_set_max(fan_system);
+        if (fan_hd)
+                wf_control_set_max(fan_hd);
+}
+
+static void wf_smu_sys_fans_tick(struct wf_smu_sys_fans_state *st)
+{
+        s32 new_setpoint, temp, scaled, cputarget;
+        int rc;
+
+        if (--st->ticks != 0) {
+                if (wf_smu_readjust)
+                        goto readjust;
+                return;
+        }
+        st->ticks = WF_SMU_SYS_FANS_INTERVAL;
+
+        rc = sensor_hd_temp->ops->get_value(sensor_hd_temp, &temp);
+        if (rc) {
+                printk(KERN_WARNING "windfarm: HD temp sensor error %d\n",
+                       rc);
+                wf_smu_failure_state |= FAILURE_SENSOR;
+                return;
+        }
+
+        DBG("wf_smu: System Fans tick ! HD temp: %d.%03d\n",
+            FIX32TOPRINT(temp));
+
+        if (temp > (st->pid.param.itarget + 0x50000))
+                wf_smu_failure_state |= FAILURE_OVERTEMP;
+
+        new_setpoint = wf_pid_run(&st->pid, temp);
+
+        DBG("wf_smu: new_setpoint: %d RPM\n", (int)new_setpoint);
+
+        scaled = ((((s64)new_setpoint) * (s64)st->scale0) >> 12) + st->offset0;
+
+        DBG("wf_smu: scaled setpoint: %d RPM\n", (int)scaled);
+
+        cputarget = wf_smu_cpu_fans ? wf_smu_cpu_fans->pid.target : 0;
+        cputarget = ((((s64)cputarget) * (s64)st->scale1) >> 12) + st->offset1;
+        scaled = max(scaled, cputarget);
+        scaled = max(scaled, st->pid.param.min);
+        scaled = min(scaled, st->pid.param.max);
+
+        DBG("wf_smu: adjusted setpoint: %d RPM\n", (int)scaled);
+
+        if (st->sys_setpoint == scaled && new_setpoint == st->hd_setpoint)
+                return;
+        st->sys_setpoint = scaled;
+        st->hd_setpoint = new_setpoint;
+ readjust:
+        if (fan_system && wf_smu_failure_state == 0) {
+                rc = fan_system->ops->set_value(fan_system, st->sys_setpoint);
+                if (rc) {
+                        printk(KERN_WARNING "windfarm: Sys fan error %d\n",
+                               rc);
+                        wf_smu_failure_state |= FAILURE_FAN;
+                }
+        }
+        if (fan_hd && wf_smu_failure_state == 0) {
+                rc = fan_hd->ops->set_value(fan_hd, st->hd_setpoint);
+                if (rc) {
+                        printk(KERN_WARNING "windfarm: HD fan error %d\n",
+                               rc);
+                        wf_smu_failure_state |= FAILURE_FAN;
+                }
+        }
+}
+
+static void wf_smu_create_cpu_fans(void)
+{
+        struct wf_cpu_pid_param pid_param;
+        struct smu_sdbp_header *hdr;
+        struct smu_sdbp_cpupiddata *piddata;
+        struct smu_sdbp_fvt *fvt;
+        s32 tmax, tdelta, maxpow, powadj;
+
+        /* First, locate the PID params in SMU SBD */
+        hdr = smu_get_sdb_partition(SMU_SDB_CPUPIDDATA_ID, NULL);
+        if (hdr == 0) {
+                printk(KERN_WARNING "windfarm: CPU PID fan config not found "
+                       "max fan speed\n");
+                goto fail;
+        }
+        piddata = (struct smu_sdbp_cpupiddata *)&hdr[1];
+
+        /* Get the FVT params for operating point 0 (the only supported one
+         * for now) in order to get tmax
+         */
+        hdr = smu_get_sdb_partition(SMU_SDB_FVT_ID, NULL);
+        if (hdr) {
+                fvt = (struct smu_sdbp_fvt *)&hdr[1];
+                tmax = ((s32)fvt->maxtemp) << 16;
+        } else
+                tmax = 0x5e0000; /* 94 degree default */
+
+        /* Alloc & initialize state */
+        wf_smu_cpu_fans = kmalloc(sizeof(struct wf_smu_cpu_fans_state),
+                                  GFP_KERNEL);
+        if (wf_smu_cpu_fans == NULL)
+                goto fail;
+        wf_smu_cpu_fans->ticks = 1;
+
+        wf_smu_cpu_fans->scale = WF_SMU_CPU_FANS_SIBLING_SCALE;
+        wf_smu_cpu_fans->offset = WF_SMU_CPU_FANS_SIBLING_OFFSET;
+
+        /* Fill PID params */
+        pid_param.interval = WF_SMU_CPU_FANS_INTERVAL;
+        pid_param.history_len = piddata->history_len;
+        if (pid_param.history_len > WF_CPU_PID_MAX_HISTORY) {
+                printk(KERN_WARNING "windfarm: History size overflow on "
+                       "CPU control loop (%d)\n", piddata->history_len);
+                pid_param.history_len = WF_CPU_PID_MAX_HISTORY;
+        }
+        pid_param.gd = piddata->gd;
+        pid_param.gp = piddata->gp;
+        pid_param.gr = piddata->gr / pid_param.history_len;
+
+        tdelta = ((s32)piddata->target_temp_delta) << 16;
+        maxpow = ((s32)piddata->max_power) << 16;
+        powadj = ((s32)piddata->power_adj) << 16;
+
+        pid_param.tmax = tmax;
+        pid_param.ttarget = tmax - tdelta;
+        pid_param.pmaxadj = maxpow - powadj;
+
+        pid_param.min = fan_cpu_main->ops->get_min(fan_cpu_main);
+        pid_param.max = fan_cpu_main->ops->get_max(fan_cpu_main);
+
+        wf_cpu_pid_init(&wf_smu_cpu_fans->pid, &pid_param);
+
+        DBG("wf: CPU Fan control initialized.\n");
+        DBG("    ttarged=%d.%03d, tmax=%d.%03d, min=%d RPM, max=%d RPM\n",
+            FIX32TOPRINT(pid_param.ttarget), FIX32TOPRINT(pid_param.tmax),
+            pid_param.min, pid_param.max);
+
+        return;
+
+ fail:
+        printk(KERN_WARNING "windfarm: CPU fan config not found\n"
+               "for this machine model, max fan speed\n");
+
+        if (cpufreq_clamp)
+                wf_control_set_max(cpufreq_clamp);
+        if (fan_cpu_main)
+                wf_control_set_max(fan_cpu_main);
+}
+
+static void wf_smu_cpu_fans_tick(struct wf_smu_cpu_fans_state *st)
+{
+        s32 new_setpoint, temp, power, systarget;
+        int rc;
+
+        if (--st->ticks != 0) {
+                if (wf_smu_readjust)
+                        goto readjust;
+                return;
+        }
+        st->ticks = WF_SMU_CPU_FANS_INTERVAL;
+
+        rc = sensor_cpu_temp->ops->get_value(sensor_cpu_temp, &temp);
+        if (rc) {
+                printk(KERN_WARNING "windfarm: CPU temp sensor error %d\n",
+                       rc);
+                wf_smu_failure_state |= FAILURE_SENSOR;
+                return;
+        }
+
+        rc = sensor_cpu_power->ops->get_value(sensor_cpu_power, &power);
+        if (rc) {
+                printk(KERN_WARNING "windfarm: CPU power sensor error %d\n",
+                       rc);
+                wf_smu_failure_state |= FAILURE_SENSOR;
+                return;
+        }
+
+        DBG("wf_smu: CPU Fans tick ! CPU temp: %d.%03d, power: %d.%03d\n",
+            FIX32TOPRINT(temp), FIX32TOPRINT(power));
+
+#ifdef HACKED_OVERTEMP
+        if (temp > 0x4a0000)
+                wf_smu_failure_state |= FAILURE_OVERTEMP;
+#else
+        if (temp > st->pid.param.tmax)
+                wf_smu_failure_state |= FAILURE_OVERTEMP;
+#endif
+        new_setpoint = wf_cpu_pid_run(&st->pid, power, temp);
+
+        DBG("wf_smu: new_setpoint: %d RPM\n", (int)new_setpoint);
+
+        systarget = wf_smu_sys_fans ? wf_smu_sys_fans->pid.target : 0;
+        systarget = ((((s64)systarget) * (s64)st->scale) >> 12)
+                + st->offset;
+        new_setpoint = max(new_setpoint, systarget);
+        new_setpoint = max(new_setpoint, st->pid.param.min);
+        new_setpoint = min(new_setpoint, st->pid.param.max);
+
+        DBG("wf_smu: adjusted setpoint: %d RPM\n", (int)new_setpoint);
+
+        if (st->cpu_setpoint == new_setpoint)
+                return;
+        st->cpu_setpoint = new_setpoint;
+ readjust:
+        if (fan_cpu_main && wf_smu_failure_state == 0) {
+                rc = fan_cpu_main->ops->set_value(fan_cpu_main,
+                                                  st->cpu_setpoint);
+                if (rc) {
+                        printk(KERN_WARNING "windfarm: CPU main fan"
+                               " error %d\n", rc);
+                        wf_smu_failure_state |= FAILURE_FAN;
+                }
+        }
+}
+
+
+/*
+ * ****** Attributes ******
+ *
+ */
+
+#define BUILD_SHOW_FUNC_FIX(name, data)                         \
+static ssize_t show_##name(struct device *dev,                  \
+                           struct device_attribute *attr,       \
+                           char *buf)                           \
+{                                                               \
+        ssize_t r;                                              \
+        s32 val = 0;                                            \
+        data->ops->get_value(data, &val);                       \
+        r = sprintf(buf, "%d.%03d", FIX32TOPRINT(val));         \
+        return r;                                               \
+}                                                               \
+static DEVICE_ATTR(name,S_IRUGO,show_##name, NULL);
+
+
+#define BUILD_SHOW_FUNC_INT(name, data)                         \
+static ssize_t show_##name(struct device *dev,                  \
+                           struct device_attribute *attr,       \
+                           char *buf)                           \
+{                                                               \
+        s32 val = 0;                                            \
+        data->ops->get_value(data, &val);                       \
+        return sprintf(buf, "%d", val);                         \
+}                                                               \
+static DEVICE_ATTR(name,S_IRUGO,show_##name, NULL);
+
+BUILD_SHOW_FUNC_INT(cpu_fan, fan_cpu_main);
+BUILD_SHOW_FUNC_INT(sys_fan, fan_system);
+BUILD_SHOW_FUNC_INT(hd_fan, fan_hd);
+
+BUILD_SHOW_FUNC_FIX(cpu_temp, sensor_cpu_temp);
+BUILD_SHOW_FUNC_FIX(cpu_power, sensor_cpu_power);
+BUILD_SHOW_FUNC_FIX(hd_temp, sensor_hd_temp);
+
+/*
+ * ****** Setup / Init / Misc ... ******
+ *
+ */
+
+static void wf_smu_tick(void)
+{
+        unsigned int last_failure = wf_smu_failure_state;
+        unsigned int new_failure;
+
+        if (!wf_smu_started) {
+                DBG("wf: creating control loops !\n");
+                wf_smu_create_sys_fans();
+                wf_smu_create_cpu_fans();
+                wf_smu_started = 1;
+        }
+
+        /* Skipping ticks */
+        if (wf_smu_skipping && --wf_smu_skipping)
+                return;
+
+        wf_smu_failure_state = 0;
+        if (wf_smu_sys_fans)
+                wf_smu_sys_fans_tick(wf_smu_sys_fans);
+        if (wf_smu_cpu_fans)
+                wf_smu_cpu_fans_tick(wf_smu_cpu_fans);
+
+        wf_smu_readjust = 0;
+        new_failure = wf_smu_failure_state & ~last_failure;
+
+        /* If entering failure mode, clamp cpufreq and ramp all
+         * fans to full speed.
+         */
+        if (wf_smu_failure_state && !last_failure) {
+                if (cpufreq_clamp)
+                        wf_control_set_max(cpufreq_clamp);
+                if (fan_system)
+                        wf_control_set_max(fan_system);
+                if (fan_cpu_main)
+                        wf_control_set_max(fan_cpu_main);
+                if (fan_hd)
+                        wf_control_set_max(fan_hd);
+        }
+
+        /* If leaving failure mode, unclamp cpufreq and readjust
+         * all fans on next iteration
+         */
+        if (!wf_smu_failure_state && last_failure) {
+                if (cpufreq_clamp)
+                        wf_control_set_min(cpufreq_clamp);
+                wf_smu_readjust = 1;
+        }
+
+        /* Overtemp condition detected, notify and start skipping a couple
+         * ticks to let the temperature go down
+         */
+        if (new_failure & FAILURE_OVERTEMP) {
+                wf_set_overtemp();
+                wf_smu_skipping = 2;
+        }
+
+        /* We only clear the overtemp condition if overtemp is cleared
+         * _and_ no other failure is present. Since a sensor error will
+         * clear the overtemp condition (can't measure temperature) at
+         * the control loop levels, but we don't want to keep it clear
+         * here in this case
+         */
+        if (new_failure == 0 && last_failure & FAILURE_OVERTEMP)
+                wf_clear_overtemp();
+}
+
+static void wf_smu_new_control(struct wf_control *ct)
+{
+        if (wf_smu_all_controls_ok)
+                return;
+
+        if (fan_cpu_main == NULL && !strcmp(ct->name, "cpu-fan")) {
+                if (wf_get_control(ct) == 0) {
+                        fan_cpu_main = ct;
+                        device_create_file(wf_smu_dev, &dev_attr_cpu_fan);
+                }
+        }
+
+        if (fan_system == NULL && !strcmp(ct->name, "system-fan")) {
+                if (wf_get_control(ct) == 0) {
+                        fan_system = ct;
+                        device_create_file(wf_smu_dev, &dev_attr_sys_fan);
+                }
+        }
+
+        if (cpufreq_clamp == NULL && !strcmp(ct->name, "cpufreq-clamp")) {
+                if (wf_get_control(ct) == 0)
+                        cpufreq_clamp = ct;
+        }
+
+        /* Darwin property list says the HD fan is only for model ID
+         * 0, 1, 2 and 3
+         */
+
+        if (wf_smu_mach_model > 3) {
+                if (fan_system && fan_cpu_main && cpufreq_clamp)
+                        wf_smu_all_controls_ok = 1;
+                return;
+        }
+
+        if (fan_hd == NULL && !strcmp(ct->name, "drive-bay-fan")) {
+                if (wf_get_control(ct) == 0) {
+                        fan_hd = ct;
+                        device_create_file(wf_smu_dev, &dev_attr_hd_fan);
+                }
+        }
+
+        if (fan_system && fan_hd && fan_cpu_main && cpufreq_clamp)
+                wf_smu_all_controls_ok = 1;
+}
+
+static void wf_smu_new_sensor(struct wf_sensor *sr)
+{
+        if (wf_smu_all_sensors_ok)
+                return;
+
+        if (sensor_cpu_power == NULL && !strcmp(sr->name, "cpu-power")) {
+                if (wf_get_sensor(sr) == 0) {
+                        sensor_cpu_power = sr;
+                        device_create_file(wf_smu_dev, &dev_attr_cpu_power);
+                }
+        }
+
+        if (sensor_cpu_temp == NULL && !strcmp(sr->name, "cpu-temp")) {
+                if (wf_get_sensor(sr) == 0) {
+                        sensor_cpu_temp = sr;
+                        device_create_file(wf_smu_dev, &dev_attr_cpu_temp);
+                }
+        }
+
+        if (sensor_hd_temp == NULL && !strcmp(sr->name, "hd-temp")) {
+                if (wf_get_sensor(sr) == 0) {
+                        sensor_hd_temp = sr;
+                        device_create_file(wf_smu_dev, &dev_attr_hd_temp);
+                }
+        }
+
+        if (sensor_cpu_power && sensor_cpu_temp && sensor_hd_temp)
+                wf_smu_all_sensors_ok = 1;
+}
+
+
+static int wf_smu_notify(struct notifier_block *self,
+                               unsigned long event, void *data)
+{
+        switch(event) {
+        case WF_EVENT_NEW_CONTROL:
+                DBG("wf: new control %s detected\n",
+                    ((struct wf_control *)data)->name);
+                wf_smu_new_control(data);
+                wf_smu_readjust = 1;
+                break;
+        case WF_EVENT_NEW_SENSOR:
+                DBG("wf: new sensor %s detected\n",
+                    ((struct wf_sensor *)data)->name);
+                wf_smu_new_sensor(data);
+                break;
+        case WF_EVENT_TICK:
+                if (wf_smu_all_controls_ok && wf_smu_all_sensors_ok)
+                        wf_smu_tick();
+        }
+
+        return 0;
+}
+
+static struct notifier_block wf_smu_events = {
+        .notifier_call  = wf_smu_notify,
+};
+
+static int wf_init_pm(void)
+{
+        struct smu_sdbp_header *hdr;
+
+        hdr = smu_get_sdb_partition(SMU_SDB_SENSORTREE_ID, NULL);
+        if (hdr != 0) {
+                struct smu_sdbp_sensortree *st =
+                        (struct smu_sdbp_sensortree *)&hdr[1];
+                wf_smu_mach_model = st->model_id;
+        }
+
+        printk(KERN_INFO "windfarm: Initializing for iMacG5 model ID %d\n",
+               wf_smu_mach_model);
+
+        return 0;
+}
+
+static int wf_smu_probe(struct device *ddev)
+{
+        wf_smu_dev = ddev;
+
+        wf_register_client(&wf_smu_events);
+
+        return 0;
+}
+
+static int wf_smu_remove(struct device *ddev)
+{
+        wf_unregister_client(&wf_smu_events);
+
+        /* XXX We don't have yet a guarantee that our callback isn't
+         * in progress when returning from wf_unregister_client, so
+         * we add an arbitrary delay. I'll have to fix that in the core
+         */
+        msleep(1000);
+
+        /* Release all sensors */
+        /* One more crappy race: I don't think we have any guarantee here
+         * that the attribute callback won't race with the sensor beeing
+         * disposed of, and I'm not 100% certain what best way to deal
+         * with that except by adding locks all over... I'll do that
+         * eventually but heh, who ever rmmod this module anyway ?
+         */
+        if (sensor_cpu_power) {
+                device_remove_file(wf_smu_dev, &dev_attr_cpu_power);
+                wf_put_sensor(sensor_cpu_power);
+        }
+        if (sensor_cpu_temp) {
+                device_remove_file(wf_smu_dev, &dev_attr_cpu_temp);
+                wf_put_sensor(sensor_cpu_temp);
+        }
+        if (sensor_hd_temp) {
+                device_remove_file(wf_smu_dev, &dev_attr_hd_temp);
+                wf_put_sensor(sensor_hd_temp);
+        }
+
+        /* Release all controls */
+        if (fan_cpu_main) {
+                device_remove_file(wf_smu_dev, &dev_attr_cpu_fan);
+                wf_put_control(fan_cpu_main);
+        }
+        if (fan_hd) {
+                device_remove_file(wf_smu_dev, &dev_attr_hd_fan);
+                wf_put_control(fan_hd);
+        }
+        if (fan_system) {
+                device_remove_file(wf_smu_dev, &dev_attr_sys_fan);
+                wf_put_control(fan_system);
+        }
+        if (cpufreq_clamp)
+                wf_put_control(cpufreq_clamp);
+
+        /* Destroy control loops state structures */
+        if (wf_smu_sys_fans)
+                kfree(wf_smu_sys_fans);
+        if (wf_smu_cpu_fans)
+                kfree(wf_smu_cpu_fans);
+
+        wf_smu_dev = NULL;
+
+        return 0;
+}
+
+static struct device_driver wf_smu_driver = {
+        .name = "windfarm",
+        .bus = &platform_bus_type,
+        .probe = wf_smu_probe,
+        .remove = wf_smu_remove,
+};
+
+
+static int __init wf_smu_init(void)
+{
+        int rc = -ENODEV;
+
+        if (machine_is_compatible("PowerMac8,1") ||
+            machine_is_compatible("PowerMac8,2"))
+                rc = wf_init_pm();
+
+        if (rc == 0) {
+#ifdef MODULE
+                request_module("windfarm_smu_controls");
+                request_module("windfarm_smu_sensors");
+                request_module("windfarm_lm75_sensor");
+
+#endif /* MODULE */
+                driver_register(&wf_smu_driver);
+        }
+
+        return rc;
+}
+
+static void __exit wf_smu_exit(void)
+{
+
+        driver_unregister(&wf_smu_driver);
+}
+
+
+module_init(wf_smu_init);
+module_exit(wf_smu_exit);
+
+MODULE_AUTHOR("Benjamin Herrenschmidt <benh@kernel.crashing.org>");
+MODULE_DESCRIPTION("Thermal control logic for iMac G5");
+MODULE_LICENSE("GPL");
+
diff --git a/drivers/macintosh/windfarm_pm91.c b/drivers/macintosh/windfarm_pm91.c
new file mode 100644
index 000000000000..43243cf7410b
--- /dev/null
+++ b/drivers/macintosh/windfarm_pm91.c
@@ -0,0 +1,814 @@
+/*
+ * Windfarm PowerMac thermal control. SMU based 1 CPU desktop control loops
+ *
+ * (c) Copyright 2005 Benjamin Herrenschmidt, IBM Corp.
+ *                    <benh@kernel.crashing.org>
+ *
+ * Released under the term of the GNU GPL v2.
+ *
+ * The algorithm used is the PID control algorithm, used the same
+ * way the published Darwin code does, using the same values that
+ * are present in the Darwin 8.2 snapshot property lists (note however
+ * that none of the code has been re-used, it's a complete re-implementation
+ *
+ * The various control loops found in Darwin config file are:
+ *
+ * PowerMac9,1
+ * ===========
+ *
+ * Has 3 control loops: CPU fans is similar to PowerMac8,1 (though it doesn't
+ * try to play with other control loops fans). Drive bay is rather basic PID
+ * with one sensor and one fan. Slots area is a bit different as the Darwin
+ * driver is supposed to be capable of working in a special "AGP" mode which
+ * involves the presence of an AGP sensor and an AGP fan (possibly on the
+ * AGP card itself). I can't deal with that special mode as I don't have
+ * access to those additional sensor/fans for now (though ultimately, it would
+ * be possible to add sensor objects for them) so I'm only implementing the
+ * basic PCI slot control loop
+ */
+
+#include <linux/types.h>
+#include <linux/errno.h>
+#include <linux/kernel.h>
+#include <linux/delay.h>
+#include <linux/slab.h>
+#include <linux/init.h>
+#include <linux/spinlock.h>
+#include <linux/wait.h>
+#include <linux/kmod.h>
+#include <linux/device.h>
+#include <linux/platform_device.h>
+#include <asm/prom.h>
+#include <asm/machdep.h>
+#include <asm/io.h>
+#include <asm/system.h>
+#include <asm/sections.h>
+#include <asm/smu.h>
+
+#include "windfarm.h"
+#include "windfarm_pid.h"
+
+#define VERSION "0.4"
+
+#undef DEBUG
+
+#ifdef DEBUG
+#define DBG(args...)    printk(args)
+#else
+#define DBG(args...)    do { } while(0)
+#endif
+
+/* define this to force CPU overtemp to 74 degree, useful for testing
+ * the overtemp code
+ */
+#undef HACKED_OVERTEMP
+
+static struct device *wf_smu_dev;
+
+/* Controls & sensors */
+static struct wf_sensor *sensor_cpu_power;
+static struct wf_sensor *sensor_cpu_temp;
+static struct wf_sensor *sensor_hd_temp;
+static struct wf_sensor *sensor_slots_power;
+static struct wf_control *fan_cpu_main;
+static struct wf_control *fan_cpu_second;
+static struct wf_control *fan_cpu_third;
+static struct wf_control *fan_hd;
+static struct wf_control *fan_slots;
+static struct wf_control *cpufreq_clamp;
+
+/* Set to kick the control loop into life */
+static int wf_smu_all_controls_ok, wf_smu_all_sensors_ok, wf_smu_started;
+
+/* Failure handling.. could be nicer */
+#define FAILURE_FAN             0x01
+#define FAILURE_SENSOR          0x02
+#define FAILURE_OVERTEMP        0x04
+
+static unsigned int wf_smu_failure_state;
+static int wf_smu_readjust, wf_smu_skipping;
+
+/*
+ * ****** CPU Fans Control Loop ******
+ *
+ */
+
+
+#define WF_SMU_CPU_FANS_INTERVAL        1
+#define WF_SMU_CPU_FANS_MAX_HISTORY     16
+
+/* State data used by the cpu fans control loop
+ */
+struct wf_smu_cpu_fans_state {
+        int                     ticks;
+        s32                     cpu_setpoint;
+        struct wf_cpu_pid_state pid;
+};
+
+static struct wf_smu_cpu_fans_state *wf_smu_cpu_fans;
+
+
+
+/*
+ * ****** Drive Fan Control Loop ******
+ *
+ */
+
+struct wf_smu_drive_fans_state {
+        int                     ticks;
+        s32                     setpoint;
+        struct wf_pid_state     pid;
+};
+
+static struct wf_smu_drive_fans_state *wf_smu_drive_fans;
+
+/*
+ * ****** Slots Fan Control Loop ******
+ *
+ */
+
+struct wf_smu_slots_fans_state {
+        int                     ticks;
+        s32                     setpoint;
+        struct wf_pid_state     pid;
+};
+
+static struct wf_smu_slots_fans_state *wf_smu_slots_fans;
+
+/*
+ * ***** Implementation *****
+ *
+ */
+
+
+static void wf_smu_create_cpu_fans(void)
+{
+        struct wf_cpu_pid_param pid_param;
+        struct smu_sdbp_header *hdr;
+        struct smu_sdbp_cpupiddata *piddata;
+        struct smu_sdbp_fvt *fvt;
+        s32 tmax, tdelta, maxpow, powadj;
+
+        /* First, locate the PID params in SMU SBD */
+        hdr = smu_get_sdb_partition(SMU_SDB_CPUPIDDATA_ID, NULL);
+        if (hdr == 0) {
+                printk(KERN_WARNING "windfarm: CPU PID fan config not found "
+                       "max fan speed\n");
+                goto fail;
+        }
+        piddata = (struct smu_sdbp_cpupiddata *)&hdr[1];
+
+        /* Get the FVT params for operating point 0 (the only supported one
+         * for now) in order to get tmax
+         */
+        hdr = smu_get_sdb_partition(SMU_SDB_FVT_ID, NULL);
+        if (hdr) {
+                fvt = (struct smu_sdbp_fvt *)&hdr[1];
+                tmax = ((s32)fvt->maxtemp) << 16;
+        } else
+                tmax = 0x5e0000; /* 94 degree default */
+
+        /* Alloc & initialize state */
+        wf_smu_cpu_fans = kmalloc(sizeof(struct wf_smu_cpu_fans_state),
+                                  GFP_KERNEL);
+        if (wf_smu_cpu_fans == NULL)
+                goto fail;
+        wf_smu_cpu_fans->ticks = 1;
+
+        /* Fill PID params */
+        pid_param.interval = WF_SMU_CPU_FANS_INTERVAL;
+        pid_param.history_len = piddata->history_len;
+        if (pid_param.history_len > WF_CPU_PID_MAX_HISTORY) {
+                printk(KERN_WARNING "windfarm: History size overflow on "
+                       "CPU control loop (%d)\n", piddata->history_len);
+                pid_param.history_len = WF_CPU_PID_MAX_HISTORY;
+        }
+        pid_param.gd = piddata->gd;
+        pid_param.gp = piddata->gp;
+        pid_param.gr = piddata->gr / pid_param.history_len;
+
+        tdelta = ((s32)piddata->target_temp_delta) << 16;
+        maxpow = ((s32)piddata->max_power) << 16;
+        powadj = ((s32)piddata->power_adj) << 16;
+
+        pid_param.tmax = tmax;
+        pid_param.ttarget = tmax - tdelta;
+        pid_param.pmaxadj = maxpow - powadj;
+
+        pid_param.min = fan_cpu_main->ops->get_min(fan_cpu_main);
+        pid_param.max = fan_cpu_main->ops->get_max(fan_cpu_main);
+
+        wf_cpu_pid_init(&wf_smu_cpu_fans->pid, &pid_param);
+
+        DBG("wf: CPU Fan control initialized.\n");
+        DBG("    ttarged=%d.%03d, tmax=%d.%03d, min=%d RPM, max=%d RPM\n",
+            FIX32TOPRINT(pid_param.ttarget), FIX32TOPRINT(pid_param.tmax),
+            pid_param.min, pid_param.max);
+
+        return;
+
+ fail:
+        printk(KERN_WARNING "windfarm: CPU fan config not found\n"
+               "for this machine model, max fan speed\n");
+
+        if (cpufreq_clamp)
+                wf_control_set_max(cpufreq_clamp);
+        if (fan_cpu_main)
+                wf_control_set_max(fan_cpu_main);
+}
+
+static void wf_smu_cpu_fans_tick(struct wf_smu_cpu_fans_state *st)
+{
+        s32 new_setpoint, temp, power;
+        int rc;
+
+        if (--st->ticks != 0) {
+                if (wf_smu_readjust)
+                        goto readjust;
+                return;
+        }
+        st->ticks = WF_SMU_CPU_FANS_INTERVAL;
+
+        rc = sensor_cpu_temp->ops->get_value(sensor_cpu_temp, &temp);
+        if (rc) {
+                printk(KERN_WARNING "windfarm: CPU temp sensor error %d\n",
+                       rc);
+                wf_smu_failure_state |= FAILURE_SENSOR;
+                return;
+        }
+
+        rc = sensor_cpu_power->ops->get_value(sensor_cpu_power, &power);
+        if (rc) {
+                printk(KERN_WARNING "windfarm: CPU power sensor error %d\n",
+                       rc);
+                wf_smu_failure_state |= FAILURE_SENSOR;
+                return;
+        }
+
+        DBG("wf_smu: CPU Fans tick ! CPU temp: %d.%03d, power: %d.%03d\n",
+            FIX32TOPRINT(temp), FIX32TOPRINT(power));
+
+#ifdef HACKED_OVERTEMP
+        if (temp > 0x4a0000)
+                wf_smu_failure_state |= FAILURE_OVERTEMP;
+#else
+        if (temp > st->pid.param.tmax)
+                wf_smu_failure_state |= FAILURE_OVERTEMP;
+#endif
+        new_setpoint = wf_cpu_pid_run(&st->pid, power, temp);
+
+        DBG("wf_smu: new_setpoint: %d RPM\n", (int)new_setpoint);
+
+        if (st->cpu_setpoint == new_setpoint)
+                return;
+        st->cpu_setpoint = new_setpoint;
+ readjust:
+        if (fan_cpu_main && wf_smu_failure_state == 0) {
+                rc = fan_cpu_main->ops->set_value(fan_cpu_main,
+                                                  st->cpu_setpoint);
+                if (rc) {
+                        printk(KERN_WARNING "windfarm: CPU main fan"
+                               " error %d\n", rc);
+                        wf_smu_failure_state |= FAILURE_FAN;
+                }
+        }
+        if (fan_cpu_second && wf_smu_failure_state == 0) {
+                rc = fan_cpu_second->ops->set_value(fan_cpu_second,
+                                                    st->cpu_setpoint);
+                if (rc) {
+                        printk(KERN_WARNING "windfarm: CPU second fan"
+                               " error %d\n", rc);
+                        wf_smu_failure_state |= FAILURE_FAN;
+                }
+        }
+        if (fan_cpu_third && wf_smu_failure_state == 0) {
+                rc = fan_cpu_main->ops->set_value(fan_cpu_third,
+                                                  st->cpu_setpoint);
+                if (rc) {
+                        printk(KERN_WARNING "windfarm: CPU third fan"
+                               " error %d\n", rc);
+                        wf_smu_failure_state |= FAILURE_FAN;
+                }
+        }
+}
+
+static void wf_smu_create_drive_fans(void)
+{
+        struct wf_pid_param param = {
+                .interval       = 5,
+                .history_len    = 2,
+                .gd             = 0x01e00000,
+                .gp             = 0x00500000,
+                .gr             = 0x00000000,
+                .itarget        = 0x00200000,
+        };
+
+        /* Alloc & initialize state */
+        wf_smu_drive_fans = kmalloc(sizeof(struct wf_smu_drive_fans_state),
+                                        GFP_KERNEL);
+        if (wf_smu_drive_fans == NULL) {
+                printk(KERN_WARNING "windfarm: Memory allocation error"
+                       " max fan speed\n");
+                goto fail;
+        }
+        wf_smu_drive_fans->ticks = 1;
+
+        /* Fill PID params */
+        param.additive = (fan_hd->type == WF_CONTROL_RPM_FAN);
+        param.min = fan_hd->ops->get_min(fan_hd);
+        param.max = fan_hd->ops->get_max(fan_hd);
+        wf_pid_init(&wf_smu_drive_fans->pid, &param);
+
+        DBG("wf: Drive Fan control initialized.\n");
+        DBG("    itarged=%d.%03d, min=%d RPM, max=%d RPM\n",
+            FIX32TOPRINT(param.itarget), param.min, param.max);
+        return;
+
+ fail:
+        if (fan_hd)
+                wf_control_set_max(fan_hd);
+}
+
+static void wf_smu_drive_fans_tick(struct wf_smu_drive_fans_state *st)
+{
+        s32 new_setpoint, temp;
+        int rc;
+
+        if (--st->ticks != 0) {
+                if (wf_smu_readjust)
+                        goto readjust;
+                return;
+        }
+        st->ticks = st->pid.param.interval;
+
+        rc = sensor_hd_temp->ops->get_value(sensor_hd_temp, &temp);
+        if (rc) {
+                printk(KERN_WARNING "windfarm: HD temp sensor error %d\n",
+                       rc);
+                wf_smu_failure_state |= FAILURE_SENSOR;
+                return;
+        }
+
+        DBG("wf_smu: Drive Fans tick ! HD temp: %d.%03d\n",
+            FIX32TOPRINT(temp));
+
+        if (temp > (st->pid.param.itarget + 0x50000))
+                wf_smu_failure_state |= FAILURE_OVERTEMP;
+
+        new_setpoint = wf_pid_run(&st->pid, temp);
+
+        DBG("wf_smu: new_setpoint: %d\n", (int)new_setpoint);
+
+        if (st->setpoint == new_setpoint)
+                return;
+        st->setpoint = new_setpoint;
+ readjust:
+        if (fan_hd && wf_smu_failure_state == 0) {
+                rc = fan_hd->ops->set_value(fan_hd, st->setpoint);
+                if (rc) {
+                        printk(KERN_WARNING "windfarm: HD fan error %d\n",
+                               rc);
+                        wf_smu_failure_state |= FAILURE_FAN;
+                }
+        }
+}
+
+static void wf_smu_create_slots_fans(void)
+{
+        struct wf_pid_param param = {
+                .interval       = 1,
+                .history_len    = 8,
+                .gd             = 0x00000000,
+                .gp             = 0x00000000,
+                .gr             = 0x00020000,
+                .itarget        = 0x00000000
+        };
+
+        /* Alloc & initialize state */
+        wf_smu_slots_fans = kmalloc(sizeof(struct wf_smu_slots_fans_state),
+                                        GFP_KERNEL);
+        if (wf_smu_slots_fans == NULL) {
+                printk(KERN_WARNING "windfarm: Memory allocation error"
+                       " max fan speed\n");
+                goto fail;
+        }
+        wf_smu_slots_fans->ticks = 1;
+
+        /* Fill PID params */
+        param.additive = (fan_slots->type == WF_CONTROL_RPM_FAN);
+        param.min = fan_slots->ops->get_min(fan_slots);
+        param.max = fan_slots->ops->get_max(fan_slots);
+        wf_pid_init(&wf_smu_slots_fans->pid, &param);
+
+        DBG("wf: Slots Fan control initialized.\n");
+        DBG("    itarged=%d.%03d, min=%d RPM, max=%d RPM\n",
+            FIX32TOPRINT(param.itarget), param.min, param.max);
+        return;
+
+ fail:
+        if (fan_slots)
+                wf_control_set_max(fan_slots);
+}
+
+static void wf_smu_slots_fans_tick(struct wf_smu_slots_fans_state *st)
+{
+        s32 new_setpoint, power;
+        int rc;
+
+        if (--st->ticks != 0) {
+                if (wf_smu_readjust)
+                        goto readjust;
+                return;
+        }
+        st->ticks = st->pid.param.interval;
+
+        rc = sensor_slots_power->ops->get_value(sensor_slots_power, &power);
+        if (rc) {
+                printk(KERN_WARNING "windfarm: Slots power sensor error %d\n",
+                       rc);
+                wf_smu_failure_state |= FAILURE_SENSOR;
+                return;
+        }
+
+        DBG("wf_smu: Slots Fans tick ! Slots power: %d.%03d\n",
+            FIX32TOPRINT(power));
+
+#if 0 /* Check what makes a good overtemp condition */
+        if (power > (st->pid.param.itarget + 0x50000))
+                wf_smu_failure_state |= FAILURE_OVERTEMP;
+#endif
+
+        new_setpoint = wf_pid_run(&st->pid, power);
+
+        DBG("wf_smu: new_setpoint: %d\n", (int)new_setpoint);
+
+        if (st->setpoint == new_setpoint)
+                return;
+        st->setpoint = new_setpoint;
+ readjust:
+        if (fan_slots && wf_smu_failure_state == 0) {
+                rc = fan_slots->ops->set_value(fan_slots, st->setpoint);
+                if (rc) {
+                        printk(KERN_WARNING "windfarm: Slots fan error %d\n",
+                               rc);
+                        wf_smu_failure_state |= FAILURE_FAN;
+                }
+        }
+}
+
+
+/*
+ * ****** Attributes ******
+ *
+ */
+
+#define BUILD_SHOW_FUNC_FIX(name, data)                         \
+static ssize_t show_##name(struct device *dev,                  \
+                           struct device_attribute *attr,       \
+                           char *buf)                           \
+{                                                               \
+        ssize_t r;                                              \
+        s32 val = 0;                                            \
+        data->ops->get_value(data, &val);                       \
+        r = sprintf(buf, "%d.%03d", FIX32TOPRINT(val));         \
+        return r;                                               \
+}                                                               \
+static DEVICE_ATTR(name,S_IRUGO,show_##name, NULL);
+
+
+#define BUILD_SHOW_FUNC_INT(name, data)                         \
+static ssize_t show_##name(struct device *dev,                  \
+                           struct device_attribute *attr,       \
+                           char *buf)                           \
+{                                                               \
+        s32 val = 0;                                            \
+        data->ops->get_value(data, &val);                       \
+        return sprintf(buf, "%d", val);                         \
+}                                                               \
+static DEVICE_ATTR(name,S_IRUGO,show_##name, NULL);
+
+BUILD_SHOW_FUNC_INT(cpu_fan, fan_cpu_main);
+BUILD_SHOW_FUNC_INT(hd_fan, fan_hd);
+BUILD_SHOW_FUNC_INT(slots_fan, fan_slots);
+
+BUILD_SHOW_FUNC_FIX(cpu_temp, sensor_cpu_temp);
+BUILD_SHOW_FUNC_FIX(cpu_power, sensor_cpu_power);
+BUILD_SHOW_FUNC_FIX(hd_temp, sensor_hd_temp);
+BUILD_SHOW_FUNC_FIX(slots_power, sensor_slots_power);
+
+/*
+ * ****** Setup / Init / Misc ... ******
+ *
+ */
+
+static void wf_smu_tick(void)
+{
+        unsigned int last_failure = wf_smu_failure_state;
+        unsigned int new_failure;
+
+        if (!wf_smu_started) {
+                DBG("wf: creating control loops !\n");
+                wf_smu_create_drive_fans();
+                wf_smu_create_slots_fans();
+                wf_smu_create_cpu_fans();
+                wf_smu_started = 1;
+        }
+
+        /* Skipping ticks */
+        if (wf_smu_skipping && --wf_smu_skipping)
+                return;
+
+        wf_smu_failure_state = 0;
+        if (wf_smu_drive_fans)
+                wf_smu_drive_fans_tick(wf_smu_drive_fans);
+        if (wf_smu_slots_fans)
+                wf_smu_slots_fans_tick(wf_smu_slots_fans);
+        if (wf_smu_cpu_fans)
+                wf_smu_cpu_fans_tick(wf_smu_cpu_fans);
+
+        wf_smu_readjust = 0;
+        new_failure = wf_smu_failure_state & ~last_failure;
+
+        /* If entering failure mode, clamp cpufreq and ramp all
+         * fans to full speed.
+         */
+        if (wf_smu_failure_state && !last_failure) {
+                if (cpufreq_clamp)
+                        wf_control_set_max(cpufreq_clamp);
+                if (fan_cpu_main)
+                        wf_control_set_max(fan_cpu_main);
+                if (fan_cpu_second)
+                        wf_control_set_max(fan_cpu_second);
+                if (fan_cpu_third)
+                        wf_control_set_max(fan_cpu_third);
+                if (fan_hd)
+                        wf_control_set_max(fan_hd);
+                if (fan_slots)
+                        wf_control_set_max(fan_slots);
+        }
+
+        /* If leaving failure mode, unclamp cpufreq and readjust
+         * all fans on next iteration
+         */
+        if (!wf_smu_failure_state && last_failure) {
+                if (cpufreq_clamp)
+                        wf_control_set_min(cpufreq_clamp);
+                wf_smu_readjust = 1;
+        }
+
+        /* Overtemp condition detected, notify and start skipping a couple
+         * ticks to let the temperature go down
+         */
+        if (new_failure & FAILURE_OVERTEMP) {
+                wf_set_overtemp();
+                wf_smu_skipping = 2;
+        }
+
+        /* We only clear the overtemp condition if overtemp is cleared
+         * _and_ no other failure is present. Since a sensor error will
+         * clear the overtemp condition (can't measure temperature) at
+         * the control loop levels, but we don't want to keep it clear
+         * here in this case
+         */
+        if (new_failure == 0 && last_failure & FAILURE_OVERTEMP)
+                wf_clear_overtemp();
+}
+
+
+static void wf_smu_new_control(struct wf_control *ct)
+{
+        if (wf_smu_all_controls_ok)
+                return;
+
+        if (fan_cpu_main == NULL && !strcmp(ct->name, "cpu-rear-fan-0")) {
+                if (wf_get_control(ct) == 0) {
+                        fan_cpu_main = ct;
+                        device_create_file(wf_smu_dev, &dev_attr_cpu_fan);
+                }
+        }
+
+        if (fan_cpu_second == NULL && !strcmp(ct->name, "cpu-rear-fan-1")) {
+                if (wf_get_control(ct) == 0)
+                        fan_cpu_second = ct;
+        }
+
+        if (fan_cpu_third == NULL && !strcmp(ct->name, "cpu-front-fan-0")) {
+                if (wf_get_control(ct) == 0)
+                        fan_cpu_third = ct;
+        }
+
+        if (cpufreq_clamp == NULL && !strcmp(ct->name, "cpufreq-clamp")) {
+                if (wf_get_control(ct) == 0)
+                        cpufreq_clamp = ct;
+        }
+
+        if (fan_hd == NULL && !strcmp(ct->name, "drive-bay-fan")) {
+                if (wf_get_control(ct) == 0) {
+                        fan_hd = ct;
+                        device_create_file(wf_smu_dev, &dev_attr_hd_fan);
+                }
+        }
+
+        if (fan_slots == NULL && !strcmp(ct->name, "slots-fan")) {
+                if (wf_get_control(ct) == 0) {
+                        fan_slots = ct;
+                        device_create_file(wf_smu_dev, &dev_attr_slots_fan);
+                }
+        }
+
+        if (fan_cpu_main && (fan_cpu_second || fan_cpu_third) && fan_hd &&
+            fan_slots && cpufreq_clamp)
+                wf_smu_all_controls_ok = 1;
+}
+
+static void wf_smu_new_sensor(struct wf_sensor *sr)
+{
+        if (wf_smu_all_sensors_ok)
+                return;
+
+        if (sensor_cpu_power == NULL && !strcmp(sr->name, "cpu-power")) {
+                if (wf_get_sensor(sr) == 0) {
+                        sensor_cpu_power = sr;
+                        device_create_file(wf_smu_dev, &dev_attr_cpu_power);
+                }
+        }
+
+        if (sensor_cpu_temp == NULL && !strcmp(sr->name, "cpu-temp")) {
+                if (wf_get_sensor(sr) == 0) {
+                        sensor_cpu_temp = sr;
+                        device_create_file(wf_smu_dev, &dev_attr_cpu_temp);
+                }
+        }
+
+        if (sensor_hd_temp == NULL && !strcmp(sr->name, "hd-temp")) {
+                if (wf_get_sensor(sr) == 0) {
+                        sensor_hd_temp = sr;
+                        device_create_file(wf_smu_dev, &dev_attr_hd_temp);
+                }
+        }
+
+        if (sensor_slots_power == NULL && !strcmp(sr->name, "slots-power")) {
+                if (wf_get_sensor(sr) == 0) {
+                        sensor_slots_power = sr;
+                        device_create_file(wf_smu_dev, &dev_attr_slots_power);
+                }
+        }
+
+        if (sensor_cpu_power && sensor_cpu_temp &&
+            sensor_hd_temp && sensor_slots_power)
+                wf_smu_all_sensors_ok = 1;
+}
+
+
+static int wf_smu_notify(struct notifier_block *self,
+                               unsigned long event, void *data)
+{
+        switch(event) {
+        case WF_EVENT_NEW_CONTROL:
+                DBG("wf: new control %s detected\n",
+                    ((struct wf_control *)data)->name);
+                wf_smu_new_control(data);
+                wf_smu_readjust = 1;
+                break;
+        case WF_EVENT_NEW_SENSOR:
+                DBG("wf: new sensor %s detected\n",
+                    ((struct wf_sensor *)data)->name);
+                wf_smu_new_sensor(data);
+                break;
+        case WF_EVENT_TICK:
+                if (wf_smu_all_controls_ok && wf_smu_all_sensors_ok)
+                        wf_smu_tick();
+        }
+
+        return 0;
+}
+
+static struct notifier_block wf_smu_events = {
+        .notifier_call  = wf_smu_notify,
+};
+
+static int wf_init_pm(void)
+{
+        printk(KERN_INFO "windfarm: Initializing for Desktop G5 model\n");
+
+        return 0;
+}
+
+static int wf_smu_probe(struct device *ddev)
+{
+        wf_smu_dev = ddev;
+
+        wf_register_client(&wf_smu_events);
+
+        return 0;
+}
+
+static int wf_smu_remove(struct device *ddev)
+{
+        wf_unregister_client(&wf_smu_events);
+
+        /* XXX We don't have yet a guarantee that our callback isn't
+         * in progress when returning from wf_unregister_client, so
+         * we add an arbitrary delay. I'll have to fix that in the core
+         */
+        msleep(1000);
+
+        /* Release all sensors */
+        /* One more crappy race: I don't think we have any guarantee here
+         * that the attribute callback won't race with the sensor beeing
+         * disposed of, and I'm not 100% certain what best way to deal
+         * with that except by adding locks all over... I'll do that
+         * eventually but heh, who ever rmmod this module anyway ?
+         */
+        if (sensor_cpu_power) {
+                device_remove_file(wf_smu_dev, &dev_attr_cpu_power);
+                wf_put_sensor(sensor_cpu_power);
+        }
+        if (sensor_cpu_temp) {
+                device_remove_file(wf_smu_dev, &dev_attr_cpu_temp);
+                wf_put_sensor(sensor_cpu_temp);
+        }
+        if (sensor_hd_temp) {
+                device_remove_file(wf_smu_dev, &dev_attr_hd_temp);
+                wf_put_sensor(sensor_hd_temp);
+        }
+        if (sensor_slots_power) {
+                device_remove_file(wf_smu_dev, &dev_attr_slots_power);
+                wf_put_sensor(sensor_slots_power);
+        }
+
+        /* Release all controls */
+        if (fan_cpu_main) {
+                device_remove_file(wf_smu_dev, &dev_attr_cpu_fan);
+                wf_put_control(fan_cpu_main);
+        }
+        if (fan_cpu_second)
+                wf_put_control(fan_cpu_second);
+        if (fan_cpu_third)
+                wf_put_control(fan_cpu_third);
+        if (fan_hd) {
+                device_remove_file(wf_smu_dev, &dev_attr_hd_fan);
+                wf_put_control(fan_hd);
+        }
+        if (fan_slots) {
+                device_remove_file(wf_smu_dev, &dev_attr_slots_fan);
+                wf_put_control(fan_slots);
+        }
+        if (cpufreq_clamp)
+                wf_put_control(cpufreq_clamp);
+
+        /* Destroy control loops state structures */
+        if (wf_smu_slots_fans)
+                kfree(wf_smu_cpu_fans);
+        if (wf_smu_drive_fans)
+                kfree(wf_smu_cpu_fans);
+        if (wf_smu_cpu_fans)
+                kfree(wf_smu_cpu_fans);
+
+        wf_smu_dev = NULL;
+
+        return 0;
+}
+
+static struct device_driver wf_smu_driver = {
+        .name = "windfarm",
+        .bus = &platform_bus_type,
+        .probe = wf_smu_probe,
+        .remove = wf_smu_remove,
+};
+
+
+static int __init wf_smu_init(void)
+{
+        int rc = -ENODEV;
+
+        if (machine_is_compatible("PowerMac9,1"))
+                rc = wf_init_pm();
+
+        if (rc == 0) {
+#ifdef MODULE
+                request_module("windfarm_smu_controls");
+                request_module("windfarm_smu_sensors");
+                request_module("windfarm_lm75_sensor");
+
+#endif /* MODULE */
+                driver_register(&wf_smu_driver);
+        }
+
+        return rc;
+}
+
+static void __exit wf_smu_exit(void)
+{
+
+        driver_unregister(&wf_smu_driver);
+}
+
+
+module_init(wf_smu_init);
+module_exit(wf_smu_exit);
+
+MODULE_AUTHOR("Benjamin Herrenschmidt <benh@kernel.crashing.org>");
+MODULE_DESCRIPTION("Thermal control logic for PowerMac9,1");
+MODULE_LICENSE("GPL");
+
diff --git a/drivers/macintosh/windfarm_smu_controls.c b/drivers/macintosh/windfarm_smu_controls.c
new file mode 100644
index 000000000000..2c3158c81ff2
--- /dev/null
+++ b/drivers/macintosh/windfarm_smu_controls.c
@@ -0,0 +1,282 @@
+/*
+ * Windfarm PowerMac thermal control. SMU based controls
+ *
+ * (c) Copyright 2005 Benjamin Herrenschmidt, IBM Corp.
+ *                    <benh@kernel.crashing.org>
+ *
+ * Released under the term of the GNU GPL v2.
+ */
+
+#include <linux/types.h>
+#include <linux/errno.h>
+#include <linux/kernel.h>
+#include <linux/delay.h>
+#include <linux/slab.h>
+#include <linux/init.h>
+#include <linux/wait.h>
+#include <asm/prom.h>
+#include <asm/machdep.h>
+#include <asm/io.h>
+#include <asm/system.h>
+#include <asm/sections.h>
+#include <asm/smu.h>
+
+#include "windfarm.h"
+
+#define VERSION "0.3"
+
+#undef DEBUG
+
+#ifdef DEBUG
+#define DBG(args...)    printk(args)
+#else
+#define DBG(args...)    do { } while(0)
+#endif
+
+/*
+ * SMU fans control object
+ */
+
+static LIST_HEAD(smu_fans);
+
+struct smu_fan_control {
+        struct list_head        link;
+        int                     fan_type;       /* 0 = rpm, 1 = pwm */
+        u32                     reg;            /* index in SMU */
+        s32                     value;          /* current value */
+        s32                     min, max;       /* min/max values */
+        struct wf_control       ctrl;
+};
+#define to_smu_fan(c) container_of(c, struct smu_fan_control, ctrl)
+
+static int smu_set_fan(int pwm, u8 id, u16 value)
+{
+        struct smu_cmd cmd;
+        u8 buffer[16];
+        DECLARE_COMPLETION(comp);
+        int rc;
+
+        /* Fill SMU command structure */
+        cmd.cmd = SMU_CMD_FAN_COMMAND;
+        cmd.data_len = 14;
+        cmd.reply_len = 16;
+        cmd.data_buf = cmd.reply_buf = buffer;
+        cmd.status = 0;
+        cmd.done = smu_done_complete;
+        cmd.misc = &comp;
+
+        /* Fill argument buffer */
+        memset(buffer, 0, 16);
+        buffer[0] = pwm ? 0x10 : 0x00;
+        buffer[1] = 0x01 << id;
+        *((u16 *)&buffer[2 + id * 2]) = value;
+
+        rc = smu_queue_cmd(&cmd);
+        if (rc)
+                return rc;
+        wait_for_completion(&comp);
+        return cmd.status;
+}
+
+static void smu_fan_release(struct wf_control *ct)
+{
+        struct smu_fan_control *fct = to_smu_fan(ct);
+
+        kfree(fct);
+}
+
+static int smu_fan_set(struct wf_control *ct, s32 value)
+{
+        struct smu_fan_control *fct = to_smu_fan(ct);
+
+        if (value < fct->min)
+                value = fct->min;
+        if (value > fct->max)
+                value = fct->max;
+        fct->value = value;
+
+        return smu_set_fan(fct->fan_type, fct->reg, value);
+}
+
+static int smu_fan_get(struct wf_control *ct, s32 *value)
+{
+        struct smu_fan_control *fct = to_smu_fan(ct);
+        *value = fct->value; /* todo: read from SMU */
+        return 0;
+}
+
+static s32 smu_fan_min(struct wf_control *ct)
+{
+        struct smu_fan_control *fct = to_smu_fan(ct);
+        return fct->min;
+}
+
+static s32 smu_fan_max(struct wf_control *ct)
+{
+        struct smu_fan_control *fct = to_smu_fan(ct);
+        return fct->max;
+}
+
+static struct wf_control_ops smu_fan_ops = {
+        .set_value      = smu_fan_set,
+        .get_value      = smu_fan_get,
+        .get_min        = smu_fan_min,
+        .get_max        = smu_fan_max,
+        .release        = smu_fan_release,
+        .owner          = THIS_MODULE,
+};
+
+static struct smu_fan_control *smu_fan_create(struct device_node *node,
+                                              int pwm_fan)
+{
+        struct smu_fan_control *fct;
+        s32 *v; u32 *reg;
+        char *l;
+
+        fct = kmalloc(sizeof(struct smu_fan_control), GFP_KERNEL);
+        if (fct == NULL)
+                return NULL;
+        fct->ctrl.ops = &smu_fan_ops;
+        l = (char *)get_property(node, "location", NULL);
+        if (l == NULL)
+                goto fail;
+
+        fct->fan_type = pwm_fan;
+        fct->ctrl.type = pwm_fan ? WF_CONTROL_PWM_FAN : WF_CONTROL_RPM_FAN;
+
+        /* We use the name & location here the same way we do for SMU sensors,
+         * see the comment in windfarm_smu_sensors.c. The locations are a bit
+         * less consistent here between the iMac and the desktop models, but
+         * that is good enough for our needs for now at least.
+         *
+         * One problem though is that Apple seem to be inconsistent with case
+         * and the kernel doesn't have strcasecmp =P
+         */
+
+        fct->ctrl.name = NULL;
+
+        /* Names used on desktop models */
+        if (!strcmp(l, "Rear Fan 0") || !strcmp(l, "Rear Fan") ||
+            !strcmp(l, "Rear fan 0") || !strcmp(l, "Rear fan"))
+                fct->ctrl.name = "cpu-rear-fan-0";
+        else if (!strcmp(l, "Rear Fan 1") || !strcmp(l, "Rear fan 1"))
+                fct->ctrl.name = "cpu-rear-fan-1";
+        else if (!strcmp(l, "Front Fan 0") || !strcmp(l, "Front Fan") ||
+                 !strcmp(l, "Front fan 0") || !strcmp(l, "Front fan"))
+                fct->ctrl.name = "cpu-front-fan-0";
+        else if (!strcmp(l, "Front Fan 1") || !strcmp(l, "Front fan 1"))
+                fct->ctrl.name = "cpu-front-fan-1";
+        else if (!strcmp(l, "Slots Fan") || !strcmp(l, "Slots fan"))
+                fct->ctrl.name = "slots-fan";
+        else if (!strcmp(l, "Drive Bay") || !strcmp(l, "Drive bay"))
+                fct->ctrl.name = "drive-bay-fan";
+
+        /* Names used on iMac models */
+        if (!strcmp(l, "System Fan") || !strcmp(l, "System fan"))
+                fct->ctrl.name = "system-fan";
+        else if (!strcmp(l, "CPU Fan") || !strcmp(l, "CPU fan"))
+                fct->ctrl.name = "cpu-fan";
+        else if (!strcmp(l, "Hard Drive") || !strcmp(l, "Hard drive"))
+                fct->ctrl.name = "drive-bay-fan";
+
+        /* Unrecognized fan, bail out */
+        if (fct->ctrl.name == NULL)
+                goto fail;
+
+        /* Get min & max values*/
+        v = (s32 *)get_property(node, "min-value", NULL);
+        if (v == NULL)
+                goto fail;
+        fct->min = *v;
+        v = (s32 *)get_property(node, "max-value", NULL);
+        if (v == NULL)
+                goto fail;
+        fct->max = *v;
+
+        /* Get "reg" value */
+        reg = (u32 *)get_property(node, "reg", NULL);
+        if (reg == NULL)
+                goto fail;
+        fct->reg = *reg;
+
+        if (wf_register_control(&fct->ctrl))
+                goto fail;
+
+        return fct;
+ fail:
+        kfree(fct);
+        return NULL;
+}
+
+
+static int __init smu_controls_init(void)
+{
+        struct device_node *smu, *fans, *fan;
+
+        if (!smu_present())
+                return -ENODEV;
+
+        smu = of_find_node_by_type(NULL, "smu");
+        if (smu == NULL)
+                return -ENODEV;
+
+        /* Look for RPM fans */
+        for (fans = NULL; (fans = of_get_next_child(smu, fans)) != NULL;)
+                if (!strcmp(fans->name, "rpm-fans"))
+                        break;
+        for (fan = NULL;
+             fans && (fan = of_get_next_child(fans, fan)) != NULL;) {
+                struct smu_fan_control *fct;
+
+                fct = smu_fan_create(fan, 0);
+                if (fct == NULL) {
+                        printk(KERN_WARNING "windfarm: Failed to create SMU "
+                               "RPM fan %s\n", fan->name);
+                        continue;
+                }
+                list_add(&fct->link, &smu_fans);
+        }
+        of_node_put(fans);
+
+
+        /* Look for PWM fans */
+        for (fans = NULL; (fans = of_get_next_child(smu, fans)) != NULL;)
+                if (!strcmp(fans->name, "pwm-fans"))
+                        break;
+        for (fan = NULL;
+             fans && (fan = of_get_next_child(fans, fan)) != NULL;) {
+                struct smu_fan_control *fct;
+
+                fct = smu_fan_create(fan, 1);
+                if (fct == NULL) {
+                        printk(KERN_WARNING "windfarm: Failed to create SMU "
+                               "PWM fan %s\n", fan->name);
+                        continue;
+                }
+                list_add(&fct->link, &smu_fans);
+        }
+        of_node_put(fans);
+        of_node_put(smu);
+
+        return 0;
+}
+
+static void __exit smu_controls_exit(void)
+{
+        struct smu_fan_control *fct;
+
+        while (!list_empty(&smu_fans)) {
+                fct = list_entry(smu_fans.next, struct smu_fan_control, link);
+                list_del(&fct->link);
+                wf_unregister_control(&fct->ctrl);
+        }
+}
+
+
+module_init(smu_controls_init);
+module_exit(smu_controls_exit);
+
+MODULE_AUTHOR("Benjamin Herrenschmidt <benh@kernel.crashing.org>");
+MODULE_DESCRIPTION("SMU control objects for PowerMacs thermal control");
+MODULE_LICENSE("GPL");
+
diff --git a/drivers/macintosh/windfarm_smu_sensors.c b/drivers/macintosh/windfarm_smu_sensors.c
new file mode 100644
index 000000000000..b558cc209d49
--- /dev/null
+++ b/drivers/macintosh/windfarm_smu_sensors.c
@@ -0,0 +1,479 @@
+/*
+ * Windfarm PowerMac thermal control. SMU based sensors
+ *
+ * (c) Copyright 2005 Benjamin Herrenschmidt, IBM Corp.
+ *                    <benh@kernel.crashing.org>
+ *
+ * Released under the term of the GNU GPL v2.
+ */
+
+#include <linux/types.h>
+#include <linux/errno.h>
+#include <linux/kernel.h>
+#include <linux/delay.h>
+#include <linux/slab.h>
+#include <linux/init.h>
+#include <linux/wait.h>
+#include <asm/prom.h>
+#include <asm/machdep.h>
+#include <asm/io.h>
+#include <asm/system.h>
+#include <asm/sections.h>
+#include <asm/smu.h>
+
+#include "windfarm.h"
+
+#define VERSION "0.2"
+
+#undef DEBUG
+
+#ifdef DEBUG
+#define DBG(args...)    printk(args)
+#else
+#define DBG(args...)    do { } while(0)
+#endif
+
+/*
+ * Various SMU "partitions" calibration objects for which we
+ * keep pointers here for use by bits & pieces of the driver
+ */
+static struct smu_sdbp_cpuvcp *cpuvcp;
+static int  cpuvcp_version;
+static struct smu_sdbp_cpudiode *cpudiode;
+static struct smu_sdbp_slotspow *slotspow;
+static u8 *debugswitches;
+
+/*
+ * SMU basic sensors objects
+ */
+
+static LIST_HEAD(smu_ads);
+
+struct smu_ad_sensor {
+        struct list_head        link;
+        u32                     reg;            /* index in SMU */
+        struct wf_sensor        sens;
+};
+#define to_smu_ads(c) container_of(c, struct smu_ad_sensor, sens)
+
+static void smu_ads_release(struct wf_sensor *sr)
+{
+        struct smu_ad_sensor *ads = to_smu_ads(sr);
+
+        kfree(ads);
+}
+
+static int smu_read_adc(u8 id, s32 *value)
+{
+        struct smu_simple_cmd   cmd;
+        DECLARE_COMPLETION(comp);
+        int rc;
+
+        rc = smu_queue_simple(&cmd, SMU_CMD_READ_ADC, 1,
+                              smu_done_complete, &comp, id);
+        if (rc)
+                return rc;
+        wait_for_completion(&comp);
+        if (cmd.cmd.status != 0)
+                return cmd.cmd.status;
+        if (cmd.cmd.reply_len != 2) {
+                printk(KERN_ERR "winfarm: read ADC 0x%x returned %d bytes !\n",
+                       id, cmd.cmd.reply_len);
+                return -EIO;
+        }
+        *value = *((u16 *)cmd.buffer);
+        return 0;
+}
+
+static int smu_cputemp_get(struct wf_sensor *sr, s32 *value)
+{
+        struct smu_ad_sensor *ads = to_smu_ads(sr);
+        int rc;
+        s32 val;
+        s64 scaled;
+
+        rc = smu_read_adc(ads->reg, &val);
+        if (rc) {
+                printk(KERN_ERR "windfarm: read CPU temp failed, err %d\n",
+                       rc);
+                return rc;
+        }
+
+        /* Ok, we have to scale & adjust, taking units into account */
+        scaled = (s64)(((u64)val) * (u64)cpudiode->m_value);
+        scaled >>= 3;
+        scaled += ((s64)cpudiode->b_value) << 9;
+        *value = (s32)(scaled << 1);
+
+        return 0;
+}
+
+static int smu_cpuamp_get(struct wf_sensor *sr, s32 *value)
+{
+        struct smu_ad_sensor *ads = to_smu_ads(sr);
+        s32 val, scaled;
+        int rc;
+
+        rc = smu_read_adc(ads->reg, &val);
+        if (rc) {
+                printk(KERN_ERR "windfarm: read CPU current failed, err %d\n",
+                       rc);
+                return rc;
+        }
+
+        /* Ok, we have to scale & adjust, taking units into account */
+        scaled = (s32)(val * (u32)cpuvcp->curr_scale);
+        scaled += (s32)cpuvcp->curr_offset;
+        *value = scaled << 4;
+
+        return 0;
+}
+
+static int smu_cpuvolt_get(struct wf_sensor *sr, s32 *value)
+{
+        struct smu_ad_sensor *ads = to_smu_ads(sr);
+        s32 val, scaled;
+        int rc;
+
+        rc = smu_read_adc(ads->reg, &val);
+        if (rc) {
+                printk(KERN_ERR "windfarm: read CPU voltage failed, err %d\n",
+                       rc);
+                return rc;
+        }
+
+        /* Ok, we have to scale & adjust, taking units into account */
+        scaled = (s32)(val * (u32)cpuvcp->volt_scale);
+        scaled += (s32)cpuvcp->volt_offset;
+        *value = scaled << 4;
+
+        return 0;
+}
+
+static int smu_slotspow_get(struct wf_sensor *sr, s32 *value)
+{
+        struct smu_ad_sensor *ads = to_smu_ads(sr);
+        s32 val, scaled;
+        int rc;
+
+        rc = smu_read_adc(ads->reg, &val);
+        if (rc) {
+                printk(KERN_ERR "windfarm: read slots power failed, err %d\n",
+                       rc);
+                return rc;
+        }
+
+        /* Ok, we have to scale & adjust, taking units into account */
+        scaled = (s32)(val * (u32)slotspow->pow_scale);
+        scaled += (s32)slotspow->pow_offset;
+        *value = scaled << 4;
+
+        return 0;
+}
+
+
+static struct wf_sensor_ops smu_cputemp_ops = {
+        .get_value      = smu_cputemp_get,
+        .release        = smu_ads_release,
+        .owner          = THIS_MODULE,
+};
+static struct wf_sensor_ops smu_cpuamp_ops = {
+        .get_value      = smu_cpuamp_get,
+        .release        = smu_ads_release,
+        .owner          = THIS_MODULE,
+};
+static struct wf_sensor_ops smu_cpuvolt_ops = {
+        .get_value      = smu_cpuvolt_get,
+        .release        = smu_ads_release,
+        .owner          = THIS_MODULE,
+};
+static struct wf_sensor_ops smu_slotspow_ops = {
+        .get_value      = smu_slotspow_get,
+        .release        = smu_ads_release,
+        .owner          = THIS_MODULE,
+};
+
+
+static struct smu_ad_sensor *smu_ads_create(struct device_node *node)
+{
+        struct smu_ad_sensor *ads;
+        char *c, *l;
+        u32 *v;
+
+        ads = kmalloc(sizeof(struct smu_ad_sensor), GFP_KERNEL);
+        if (ads == NULL)
+                return NULL;
+        c = (char *)get_property(node, "device_type", NULL);
+        l = (char *)get_property(node, "location", NULL);
+        if (c == NULL || l == NULL)
+                goto fail;
+
+        /* We currently pick the sensors based on the OF name and location
+         * properties, while Darwin uses the sensor-id's.
+         * The problem with the IDs is that they are model specific while it
+         * looks like apple has been doing a reasonably good job at keeping
+         * the names and locations consistents so I'll stick with the names
+         * and locations for now.
+         */
+        if (!strcmp(c, "temp-sensor") &&
+            !strcmp(l, "CPU T-Diode")) {
+                ads->sens.ops = &smu_cputemp_ops;
+                ads->sens.name = "cpu-temp";
+        } else if (!strcmp(c, "current-sensor") &&
+                   !strcmp(l, "CPU Current")) {
+                ads->sens.ops = &smu_cpuamp_ops;
+                ads->sens.name = "cpu-current";
+        } else if (!strcmp(c, "voltage-sensor") &&
+                   !strcmp(l, "CPU Voltage")) {
+                ads->sens.ops = &smu_cpuvolt_ops;
+                ads->sens.name = "cpu-voltage";
+        } else if (!strcmp(c, "power-sensor") &&
+                   !strcmp(l, "Slots Power")) {
+                ads->sens.ops = &smu_slotspow_ops;
+                ads->sens.name = "slots-power";
+                if (slotspow == NULL) {
+                        DBG("wf: slotspow partition (%02x) not found\n",
+                            SMU_SDB_SLOTSPOW_ID);
+                        goto fail;
+                }
+        } else
+                goto fail;
+
+        v = (u32 *)get_property(node, "reg", NULL);
+        if (v == NULL)
+                goto fail;
+        ads->reg = *v;
+
+        if (wf_register_sensor(&ads->sens))
+                goto fail;
+        return ads;
+ fail:
+        kfree(ads);
+        return NULL;
+}
+
+/*
+ * SMU Power combo sensor object
+ */
+
+struct smu_cpu_power_sensor {
+        struct list_head        link;
+        struct wf_sensor        *volts;
+        struct wf_sensor        *amps;
+        int                     fake_volts : 1;
+        int                     quadratic : 1;
+        struct wf_sensor        sens;
+};
+#define to_smu_cpu_power(c) container_of(c, struct smu_cpu_power_sensor, sens)
+
+static struct smu_cpu_power_sensor *smu_cpu_power;
+
+static void smu_cpu_power_release(struct wf_sensor *sr)
+{
+        struct smu_cpu_power_sensor *pow = to_smu_cpu_power(sr);
+
+        if (pow->volts)
+                wf_put_sensor(pow->volts);
+        if (pow->amps)
+                wf_put_sensor(pow->amps);
+        kfree(pow);
+}
+
+static int smu_cpu_power_get(struct wf_sensor *sr, s32 *value)
+{
+        struct smu_cpu_power_sensor *pow = to_smu_cpu_power(sr);
+        s32 volts, amps, power;
+        u64 tmps, tmpa, tmpb;
+        int rc;
+
+        rc = pow->amps->ops->get_value(pow->amps, &amps);
+        if (rc)
+                return rc;
+
+        if (pow->fake_volts) {
+                *value = amps * 12 - 0x30000;
+                return 0;
+        }
+
+        rc = pow->volts->ops->get_value(pow->volts, &volts);
+        if (rc)
+                return rc;
+
+        power = (s32)((((u64)volts) * ((u64)amps)) >> 16);
+        if (!pow->quadratic) {
+                *value = power;
+                return 0;
+        }
+        tmps = (((u64)power) * ((u64)power)) >> 16;
+        tmpa = ((u64)cpuvcp->power_quads[0]) * tmps;
+        tmpb = ((u64)cpuvcp->power_quads[1]) * ((u64)power);
+        *value = (tmpa >> 28) + (tmpb >> 28) + (cpuvcp->power_quads[2] >> 12);
+
+        return 0;
+}
+
+static struct wf_sensor_ops smu_cpu_power_ops = {
+        .get_value      = smu_cpu_power_get,
+        .release        = smu_cpu_power_release,
+        .owner          = THIS_MODULE,
+};
+
+
+static struct smu_cpu_power_sensor *
+smu_cpu_power_create(struct wf_sensor *volts, struct wf_sensor *amps)
+{
+        struct smu_cpu_power_sensor *pow;
+
+        pow = kmalloc(sizeof(struct smu_cpu_power_sensor), GFP_KERNEL);
+        if (pow == NULL)
+                return NULL;
+        pow->sens.ops = &smu_cpu_power_ops;
+        pow->sens.name = "cpu-power";
+
+        wf_get_sensor(volts);
+        pow->volts = volts;
+        wf_get_sensor(amps);
+        pow->amps = amps;
+
+        /* Some early machines need a faked voltage */
+        if (debugswitches && ((*debugswitches) & 0x80)) {
+                printk(KERN_INFO "windfarm: CPU Power sensor using faked"
+                       " voltage !\n");
+                pow->fake_volts = 1;
+        } else
+                pow->fake_volts = 0;
+
+        /* Try to use quadratic transforms on PowerMac8,1 and 9,1 for now,
+         * I yet have to figure out what's up with 8,2 and will have to
+         * adjust for later, unless we can 100% trust the SDB partition...
+         */
+        if ((machine_is_compatible("PowerMac8,1") ||
+             machine_is_compatible("PowerMac8,2") ||
+             machine_is_compatible("PowerMac9,1")) &&
+            cpuvcp_version >= 2) {
+                pow->quadratic = 1;
+                DBG("windfarm: CPU Power using quadratic transform\n");
+        } else
+                pow->quadratic = 0;
+
+        if (wf_register_sensor(&pow->sens))
+                goto fail;
+        return pow;
+ fail:
+        kfree(pow);
+        return NULL;
+}
+
+static int smu_fetch_param_partitions(void)
+{
+        struct smu_sdbp_header *hdr;
+
+        /* Get CPU voltage/current/power calibration data */
+        hdr = smu_get_sdb_partition(SMU_SDB_CPUVCP_ID, NULL);
+        if (hdr == NULL) {
+                DBG("wf: cpuvcp partition (%02x) not found\n",
+                    SMU_SDB_CPUVCP_ID);
+                return -ENODEV;
+        }
+        cpuvcp = (struct smu_sdbp_cpuvcp *)&hdr[1];
+        /* Keep version around */
+        cpuvcp_version = hdr->version;
+
+        /* Get CPU diode calibration data */
+        hdr = smu_get_sdb_partition(SMU_SDB_CPUDIODE_ID, NULL);
+        if (hdr == NULL) {
+                DBG("wf: cpudiode partition (%02x) not found\n",
+                    SMU_SDB_CPUDIODE_ID);
+                return -ENODEV;
+        }
+        cpudiode = (struct smu_sdbp_cpudiode *)&hdr[1];
+
+        /* Get slots power calibration data if any */
+        hdr = smu_get_sdb_partition(SMU_SDB_SLOTSPOW_ID, NULL);
+        if (hdr != NULL)
+                slotspow = (struct smu_sdbp_slotspow *)&hdr[1];
+
+        /* Get debug switches if any */
+        hdr = smu_get_sdb_partition(SMU_SDB_DEBUG_SWITCHES_ID, NULL);
+        if (hdr != NULL)
+                debugswitches = (u8 *)&hdr[1];
+
+        return 0;
+}
+
+static int __init smu_sensors_init(void)
+{
+        struct device_node *smu, *sensors, *s;
+        struct smu_ad_sensor *volt_sensor = NULL, *curr_sensor = NULL;
+        int rc;
+
+        if (!smu_present())
+                return -ENODEV;
+
+        /* Get parameters partitions */
+        rc = smu_fetch_param_partitions();
+        if (rc)
+                return rc;
+
+        smu = of_find_node_by_type(NULL, "smu");
+        if (smu == NULL)
+                return -ENODEV;
+
+        /* Look for sensors subdir */
+        for (sensors = NULL;
+             (sensors = of_get_next_child(smu, sensors)) != NULL;)
+                if (!strcmp(sensors->name, "sensors"))
+                        break;
+
+        of_node_put(smu);
+
+        /* Create basic sensors */
+        for (s = NULL;
+             sensors && (s = of_get_next_child(sensors, s)) != NULL;) {
+                struct smu_ad_sensor *ads;
+
+                ads = smu_ads_create(s);
+                if (ads == NULL)
+                        continue;
+                list_add(&ads->link, &smu_ads);
+                /* keep track of cpu voltage & current */
+                if (!strcmp(ads->sens.name, "cpu-voltage"))
+                        volt_sensor = ads;
+                else if (!strcmp(ads->sens.name, "cpu-current"))
+                        curr_sensor = ads;
+        }
+
+        of_node_put(sensors);
+
+        /* Create CPU power sensor if possible */
+        if (volt_sensor && curr_sensor)
+                smu_cpu_power = smu_cpu_power_create(&volt_sensor->sens,
+                                                     &curr_sensor->sens);
+
+        return 0;
+}
+
+static void __exit smu_sensors_exit(void)
+{
+        struct smu_ad_sensor *ads;
+
+        /* dispose of power sensor */
+        if (smu_cpu_power)
+                wf_unregister_sensor(&smu_cpu_power->sens);
+
+        /* dispose of basic sensors */
+        while (!list_empty(&smu_ads)) {
+                ads = list_entry(smu_ads.next, struct smu_ad_sensor, link);
+                list_del(&ads->link);
+                wf_unregister_sensor(&ads->sens);
+        }
+}
+
+
+module_init(smu_sensors_init);
+module_exit(smu_sensors_exit);
+
+MODULE_AUTHOR("Benjamin Herrenschmidt <benh@kernel.crashing.org>");
+MODULE_DESCRIPTION("SMU sensor objects for PowerMacs thermal control");
+MODULE_LICENSE("GPL");
+
diff --git a/drivers/md/raid5.c b/drivers/md/raid5.c
index 6497295ebfb9..1223e98ecd70 100644
--- a/drivers/md/raid5.c
+++ b/drivers/md/raid5.c
@@ -1587,8 +1587,7 @@ static sector_t sync_request(mddev_t *mddev, sector_t sector_nr, int *skipped, i
                 /* make sure we don't swamp the stripe cache if someone else
                  * is trying to get access 
                  */
-                set_current_state(TASK_UNINTERRUPTIBLE);
-                schedule_timeout(1);
+                schedule_timeout_uninterruptible(1);
         }
         bitmap_start_sync(mddev->bitmap, sector_nr, &sync_blocks, 0);
         spin_lock(&sh->lock);   
diff --git a/drivers/md/raid6main.c b/drivers/md/raid6main.c
index 6437a95ffc1c..775786947701 100644
--- a/drivers/md/raid6main.c
+++ b/drivers/md/raid6main.c
@@ -1746,8 +1746,7 @@ static sector_t sync_request(mddev_t *mddev, sector_t sector_nr, int *skipped, i
                 /* make sure we don't swamp the stripe cache if someone else
                  * is trying to get access
                  */
-                set_current_state(TASK_UNINTERRUPTIBLE);
-                schedule_timeout(1);
+                schedule_timeout_uninterruptible(1);
         }
         bitmap_start_sync(mddev->bitmap, sector_nr, &sync_blocks, 0);
         spin_lock(&sh->lock);
diff --git a/drivers/media/dvb/bt8xx/dst.c b/drivers/media/dvb/bt8xx/dst.c
index 34a837a1abf4..b3c9d7327ac1 100644
--- a/drivers/media/dvb/bt8xx/dst.c
+++ b/drivers/media/dvb/bt8xx/dst.c
@@ -1331,9 +1331,7 @@ struct dst_state *dst_attach(struct dst_state *state, struct dvb_adapter *dvb_ad
 {
         /* check if the ASIC is there */
         if (dst_probe(state) < 0) {
-                if (state)
-                        kfree(state);
-
+                kfree(state);
                 return NULL;
         }
         /* determine settings based on type */
@@ -1349,9 +1347,7 @@ struct dst_state *dst_attach(struct dst_state *state, struct dvb_adapter *dvb_ad
                 break;
         default:
                 dprintk(verbose, DST_ERROR, 1, "unknown DST type. please report to the LinuxTV.org DVB mailinglist.");
-                if (state)
-                        kfree(state);
-
+                kfree(state);
                 return NULL;
         }
 
diff --git a/drivers/media/dvb/frontends/cx24110.c b/drivers/media/dvb/frontends/cx24110.c
index d4b97989e3ed..654d7dc879d9 100644
--- a/drivers/media/dvb/frontends/cx24110.c
+++ b/drivers/media/dvb/frontends/cx24110.c
@@ -27,6 +27,7 @@
 #include <linux/module.h>
 #include <linux/moduleparam.h>
 #include <linux/init.h>
+#include <linux/jiffies.h>
 
 #include "dvb_frontend.h"
 #include "cx24110.h"
diff --git a/drivers/media/dvb/frontends/dvb_dummy_fe.c b/drivers/media/dvb/frontends/dvb_dummy_fe.c
index 794be520d590..645946a992d9 100644
--- a/drivers/media/dvb/frontends/dvb_dummy_fe.c
+++ b/drivers/media/dvb/frontends/dvb_dummy_fe.c
@@ -148,7 +148,7 @@ struct dvb_frontend* dvb_dummy_fe_qpsk_attach()
         return &state->frontend;
 
 error:
-        if (state) kfree(state);
+        kfree(state);
         return NULL;
 }
 
@@ -171,7 +171,7 @@ struct dvb_frontend* dvb_dummy_fe_qam_attach()
         return &state->frontend;
 
 error:
-        if (state) kfree(state);
+        kfree(state);
         return NULL;
 }
 
diff --git a/drivers/media/dvb/frontends/l64781.c b/drivers/media/dvb/frontends/l64781.c
index faaad1ae8559..19b4bf7c21a7 100644
--- a/drivers/media/dvb/frontends/l64781.c
+++ b/drivers/media/dvb/frontends/l64781.c
@@ -559,7 +559,8 @@ struct dvb_frontend* l64781_attach(const struct l64781_config* config,
         return &state->frontend;
 
 error:
-        if (reg0x3e >= 0) l64781_writereg (state, 0x3e, reg0x3e);  /* restore reg 0x3e */
+        if (reg0x3e >= 0)
+                l64781_writereg (state, 0x3e, reg0x3e);  /* restore reg 0x3e */
         kfree(state);
         return NULL;
 }
diff --git a/drivers/media/dvb/frontends/lgdt330x.c b/drivers/media/dvb/frontends/lgdt330x.c
index 8dde72bd1046..7852b83b82d4 100644
--- a/drivers/media/dvb/frontends/lgdt330x.c
+++ b/drivers/media/dvb/frontends/lgdt330x.c
@@ -731,8 +731,7 @@ struct dvb_frontend* lgdt330x_attach(const struct lgdt330x_config* config,
         return &state->frontend;
 
 error:
-        if (state)
-                kfree(state);
+        kfree(state);
         dprintk("%s: ERROR\n",__FUNCTION__);
         return NULL;
 }
diff --git a/drivers/media/dvb/frontends/mt312.c b/drivers/media/dvb/frontends/mt312.c
index e38454901dd1..9c67f406d581 100644
--- a/drivers/media/dvb/frontends/mt312.c
+++ b/drivers/media/dvb/frontends/mt312.c
@@ -677,8 +677,7 @@ struct dvb_frontend* mt312_attach(const struct mt312_config* config,
         return &state->frontend;
 
 error:
-        if (state)
-                kfree(state);
+        kfree(state);
         return NULL;
 }
 
diff --git a/drivers/media/dvb/frontends/or51132.c b/drivers/media/dvb/frontends/or51132.c
index 817b044c7fd1..fc74c40d6477 100644
--- a/drivers/media/dvb/frontends/or51132.c
+++ b/drivers/media/dvb/frontends/or51132.c
@@ -577,8 +577,7 @@ struct dvb_frontend* or51132_attach(const struct or51132_config* config,
         return &state->frontend;
 
 error:
-        if (state)
-                kfree(state);
+        kfree(state);
         return NULL;
 }
 
diff --git a/drivers/media/video/arv.c b/drivers/media/video/arv.c
index 87fd3a7bb392..0823ddaf7004 100644
--- a/drivers/media/video/arv.c
+++ b/drivers/media/video/arv.c
@@ -865,10 +865,8 @@ out_dev:
 
 out_irq:
 #endif
-        for (i = 0; i < MAX_AR_HEIGHT; i++) {
-                if (ar->frame[i])
-                        kfree(ar->frame[i]);
-        }
+        for (i = 0; i < MAX_AR_HEIGHT; i++)
+                kfree(ar->frame[i]);
 
 out_line_buff:
 #if USE_INT
@@ -899,10 +897,8 @@ static void __exit ar_cleanup_module(void)
 #if USE_INT
         free_irq(M32R_IRQ_INT3, ar);
 #endif
-        for (i = 0; i < MAX_AR_HEIGHT; i++) {
-                if (ar->frame[i])
-                        kfree(ar->frame[i]);
-        }
+        for (i = 0; i < MAX_AR_HEIGHT; i++)
+                kfree(ar->frame[i]);
 #if USE_INT
         kfree(ar->line_buff);
 #endif
diff --git a/drivers/media/video/bttv-driver.c b/drivers/media/video/bttv-driver.c
index c062a017491e..d538a994ff04 100644
--- a/drivers/media/video/bttv-driver.c
+++ b/drivers/media/video/bttv-driver.c
@@ -1951,8 +1951,7 @@ static int setup_window(struct bttv_fh *fh, struct bttv *btv,
         }
 
         down(&fh->cap.lock);
-        if (fh->ov.clips)
-                kfree(fh->ov.clips);
+        kfree(fh->ov.clips);
         fh->ov.clips    = clips;
         fh->ov.nclips   = n;
 
@@ -2723,8 +2722,7 @@ static int bttv_do_ioctl(struct inode *inode, struct file *file,
                         fh->ov.w.height = fb->fmt.height;
                         btv->init.ov.w.width  = fb->fmt.width;
                         btv->init.ov.w.height = fb->fmt.height;
-                        if (fh->ov.clips)
-                                kfree(fh->ov.clips);
+                        kfree(fh->ov.clips);
                         fh->ov.clips = NULL;
                         fh->ov.nclips = 0;
 
diff --git a/drivers/media/video/indycam.c b/drivers/media/video/indycam.c
index 26dd06ec89a2..deeef125eb92 100644
--- a/drivers/media/video/indycam.c
+++ b/drivers/media/video/indycam.c
@@ -27,15 +27,15 @@
 
 #include "indycam.h"
 
-//#define INDYCAM_DEBUG
-
-#define INDYCAM_MODULE_VERSION "0.0.3"
+#define INDYCAM_MODULE_VERSION "0.0.5"
 
 MODULE_DESCRIPTION("SGI IndyCam driver");
 MODULE_VERSION(INDYCAM_MODULE_VERSION);
 MODULE_AUTHOR("Mikael Nousiainen <tmnousia@cc.hut.fi>");
 MODULE_LICENSE("GPL");
 
+// #define INDYCAM_DEBUG
+
 #ifdef INDYCAM_DEBUG
 #define dprintk(x...) printk("IndyCam: " x);
 #define indycam_regdump(client) indycam_regdump_debug(client)
@@ -46,14 +46,14 @@ MODULE_LICENSE("GPL");
 
 struct indycam {
         struct i2c_client *client;
-        int version;
+        u8 version;
 };
 
 static struct i2c_driver i2c_driver_indycam;
 
-static const unsigned char initseq[] = {
+static const u8 initseq[] = {
         INDYCAM_CONTROL_AGCENA,         /* INDYCAM_CONTROL */
-        INDYCAM_SHUTTER_DEFAULT,        /* INDYCAM_SHUTTER */
+        INDYCAM_SHUTTER_60,             /* INDYCAM_SHUTTER */
         INDYCAM_GAIN_DEFAULT,           /* INDYCAM_GAIN */
         0x00,                           /* INDYCAM_BRIGHTNESS (read-only) */
         INDYCAM_RED_BALANCE_DEFAULT,    /* INDYCAM_RED_BALANCE */
@@ -64,12 +64,11 @@ static const unsigned char initseq[] = {
 
 /* IndyCam register handling */
 
-static int indycam_read_reg(struct i2c_client *client, unsigned char reg,
-                             unsigned char *value)
+static int indycam_read_reg(struct i2c_client *client, u8 reg, u8 *value)
 {
         int ret;
 
-        if (reg == INDYCAM_RESET) {
+        if (reg == INDYCAM_REG_RESET) {
                 dprintk("indycam_read_reg(): "
                         "skipping write-only register %d\n", reg);
                 *value = 0;
@@ -77,24 +76,24 @@ static int indycam_read_reg(struct i2c_client *client, unsigned char reg,
         }
 
         ret = i2c_smbus_read_byte_data(client, reg);
+
         if (ret < 0) {
                 printk(KERN_ERR "IndyCam: indycam_read_reg(): read failed, "
                        "register = 0x%02x\n", reg);
                 return ret;
         }
 
-        *value = (unsigned char)ret;
+        *value = (u8)ret;
 
         return 0;
 }
 
-static int indycam_write_reg(struct i2c_client *client, unsigned char reg,
-                             unsigned char value)
+static int indycam_write_reg(struct i2c_client *client, u8 reg, u8 value)
 {
         int err;
 
-        if ((reg == INDYCAM_BRIGHTNESS)
-            || (reg == INDYCAM_VERSION)) {
+        if ((reg == INDYCAM_REG_BRIGHTNESS)
+            || (reg == INDYCAM_REG_VERSION)) {
                 dprintk("indycam_write_reg(): "
                         "skipping read-only register %d\n", reg);
                 return 0;
@@ -102,6 +101,7 @@ static int indycam_write_reg(struct i2c_client *client, unsigned char reg,
 
         dprintk("Writing Reg %d = 0x%02x\n", reg, value);
         err = i2c_smbus_write_byte_data(client, reg, value);
+
         if (err) {
                 printk(KERN_ERR "IndyCam: indycam_write_reg(): write failed, "
                        "register = 0x%02x, value = 0x%02x\n", reg, value);
@@ -109,13 +109,12 @@ static int indycam_write_reg(struct i2c_client *client, unsigned char reg,
         return err;
 }
 
-static int indycam_write_block(struct i2c_client *client, unsigned char reg,
-                                unsigned char length, unsigned char *data)
+static int indycam_write_block(struct i2c_client *client, u8 reg,
+                               u8 length, u8 *data)
 {
-        unsigned char i;
-        int err;
+        int i, err;
 
-        for (i = reg; i < length; i++) {
+        for (i = 0; i < length; i++) {
                 err = indycam_write_reg(client, reg + i, data[i]);
                 if (err)
                         return err;
@@ -130,7 +129,7 @@ static int indycam_write_block(struct i2c_client *client, unsigned char reg,
 static void indycam_regdump_debug(struct i2c_client *client)
 {
         int i;
-        unsigned char val;
+        u8 val;
 
         for (i = 0; i < 9; i++) {
                 indycam_read_reg(client, i, &val);
@@ -139,76 +138,144 @@ static void indycam_regdump_debug(struct i2c_client *client)
 }
 #endif
 
-static int indycam_get_controls(struct i2c_client *client,
-                                struct indycam_control *ctrl)
+static int indycam_get_control(struct i2c_client *client,
+                               struct indycam_control *ctrl)
 {
-        unsigned char ctrl_reg;
-
-        indycam_read_reg(client, INDYCAM_CONTROL, &ctrl_reg);
-        ctrl->agc = (ctrl_reg & INDYCAM_CONTROL_AGCENA)
-                ? INDYCAM_VALUE_ENABLED
-                : INDYCAM_VALUE_DISABLED;
-        ctrl->awb = (ctrl_reg & INDYCAM_CONTROL_AWBCTL)
-                ? INDYCAM_VALUE_ENABLED
-                : INDYCAM_VALUE_DISABLED;
-        indycam_read_reg(client, INDYCAM_SHUTTER,
-                         (unsigned char *)&ctrl->shutter);
-        indycam_read_reg(client, INDYCAM_GAIN,
-                         (unsigned char *)&ctrl->gain);
-        indycam_read_reg(client, INDYCAM_RED_BALANCE,
-                         (unsigned char *)&ctrl->red_balance);
-        indycam_read_reg(client, INDYCAM_BLUE_BALANCE,
-                         (unsigned char *)&ctrl->blue_balance);
-        indycam_read_reg(client, INDYCAM_RED_SATURATION,
-                         (unsigned char *)&ctrl->red_saturation);
-        indycam_read_reg(client, INDYCAM_BLUE_SATURATION,
-                         (unsigned char *)&ctrl->blue_saturation);
-        indycam_read_reg(client, INDYCAM_GAMMA,
-                         (unsigned char *)&ctrl->gamma);
+        struct indycam *camera = i2c_get_clientdata(client);
+        u8 reg;
+        int ret = 0;
+
+        switch (ctrl->type) {
+        case INDYCAM_CONTROL_AGC:
+        case INDYCAM_CONTROL_AWB:
+                ret = indycam_read_reg(client, INDYCAM_REG_CONTROL, &reg);
+                if (ret)
+                        return -EIO;
+                if (ctrl->type == INDYCAM_CONTROL_AGC)
+                        ctrl->value = (reg & INDYCAM_CONTROL_AGCENA)
+                                ? 1 : 0;
+                else
+                        ctrl->value = (reg & INDYCAM_CONTROL_AWBCTL)
+                                ? 1 : 0;
+                break;
+        case INDYCAM_CONTROL_SHUTTER:
+                ret = indycam_read_reg(client, INDYCAM_REG_SHUTTER, &reg);
+                if (ret)
+                        return -EIO;
+                ctrl->value = ((s32)reg == 0x00) ? 0xff : ((s32)reg - 1);
+                break;
+        case INDYCAM_CONTROL_GAIN:
+                ret = indycam_read_reg(client, INDYCAM_REG_GAIN, &reg);
+                if (ret)
+                        return -EIO;
+                ctrl->value = (s32)reg;
+                break;
+        case INDYCAM_CONTROL_RED_BALANCE:
+                ret = indycam_read_reg(client, INDYCAM_REG_RED_BALANCE, &reg);
+                if (ret)
+                        return -EIO;
+                ctrl->value = (s32)reg;
+                break;
+        case INDYCAM_CONTROL_BLUE_BALANCE:
+                ret = indycam_read_reg(client, INDYCAM_REG_BLUE_BALANCE, &reg);
+                if (ret)
+                        return -EIO;
+                ctrl->value = (s32)reg;
+                break;
+        case INDYCAM_CONTROL_RED_SATURATION:
+                ret = indycam_read_reg(client,
+                                       INDYCAM_REG_RED_SATURATION, &reg);
+                if (ret)
+                        return -EIO;
+                ctrl->value = (s32)reg;
+                break;
+        case INDYCAM_CONTROL_BLUE_SATURATION:
+                ret = indycam_read_reg(client,
+                                       INDYCAM_REG_BLUE_SATURATION, &reg);
+                if (ret)
+                        return -EIO;
+                ctrl->value = (s32)reg;
+                break;
+        case INDYCAM_CONTROL_GAMMA:
+                if (camera->version == CAMERA_VERSION_MOOSE) {
+                        ret = indycam_read_reg(client,
+                                               INDYCAM_REG_GAMMA, &reg);
+                        if (ret)
+                                return -EIO;
+                        ctrl->value = (s32)reg;
+                } else {
+                        ctrl->value = INDYCAM_GAMMA_DEFAULT;
+                }
+                break;
+        default:
+                ret = -EINVAL;
+        }
 
-        return 0;
+        return ret;
 }
 
-static int indycam_set_controls(struct i2c_client *client,
-                                struct indycam_control *ctrl)
+static int indycam_set_control(struct i2c_client *client,
+                               struct indycam_control *ctrl)
 {
-        unsigned char ctrl_reg;
+        struct indycam *camera = i2c_get_clientdata(client);
+        u8 reg;
+        int ret = 0;
+
+        switch (ctrl->type) {
+        case INDYCAM_CONTROL_AGC:
+        case INDYCAM_CONTROL_AWB:
+                ret = indycam_read_reg(client, INDYCAM_REG_CONTROL, &reg);
+                if (ret)
+                        break;
 
-        indycam_read_reg(client, INDYCAM_CONTROL, &ctrl_reg);
-        if (ctrl->agc != INDYCAM_VALUE_UNCHANGED) {
-                if (ctrl->agc)
-                        ctrl_reg |= INDYCAM_CONTROL_AGCENA;
-                else
-                        ctrl_reg &= ~INDYCAM_CONTROL_AGCENA;
-        }
-        if (ctrl->awb != INDYCAM_VALUE_UNCHANGED) {
-                if (ctrl->awb)
-                        ctrl_reg |= INDYCAM_CONTROL_AWBCTL;
-                else
-                        ctrl_reg &= ~INDYCAM_CONTROL_AWBCTL;
+                if (ctrl->type == INDYCAM_CONTROL_AGC) {
+                        if (ctrl->value)
+                                reg |= INDYCAM_CONTROL_AGCENA;
+                        else
+                                reg &= ~INDYCAM_CONTROL_AGCENA;
+                } else {
+                        if (ctrl->value)
+                                reg |= INDYCAM_CONTROL_AWBCTL;
+                        else
+                                reg &= ~INDYCAM_CONTROL_AWBCTL;
+                }
+
+                ret = indycam_write_reg(client, INDYCAM_REG_CONTROL, reg);
+                break;
+        case INDYCAM_CONTROL_SHUTTER:
+                reg = (ctrl->value == 0xff) ? 0x00 : (ctrl->value + 1);
+                ret = indycam_write_reg(client, INDYCAM_REG_SHUTTER, reg);
+                break;
+        case INDYCAM_CONTROL_GAIN:
+                ret = indycam_write_reg(client, INDYCAM_REG_GAIN, ctrl->value);
+                break;
+        case INDYCAM_CONTROL_RED_BALANCE:
+                ret = indycam_write_reg(client, INDYCAM_REG_RED_BALANCE,
+                                        ctrl->value);
+                break;
+        case INDYCAM_CONTROL_BLUE_BALANCE:
+                ret = indycam_write_reg(client, INDYCAM_REG_BLUE_BALANCE,
+                                        ctrl->value);
+                break;
+        case INDYCAM_CONTROL_RED_SATURATION:
+                ret = indycam_write_reg(client, INDYCAM_REG_RED_SATURATION,
+                                        ctrl->value);
+                break;
+        case INDYCAM_CONTROL_BLUE_SATURATION:
+                ret = indycam_write_reg(client, INDYCAM_REG_BLUE_SATURATION,
+                                        ctrl->value);
+                break;
+        case INDYCAM_CONTROL_GAMMA:
+                if (camera->version == CAMERA_VERSION_MOOSE) {
+                        ret = indycam_write_reg(client, INDYCAM_REG_GAMMA,
+                                                ctrl->value);
+                }
+                break;
+        default:
+                ret = -EINVAL;
         }
-        indycam_write_reg(client, INDYCAM_CONTROL, ctrl_reg);
-
-        if (ctrl->shutter >= 0)
-                indycam_write_reg(client, INDYCAM_SHUTTER, ctrl->shutter);
-        if (ctrl->gain >= 0)
-                indycam_write_reg(client, INDYCAM_GAIN, ctrl->gain);
-        if (ctrl->red_balance >= 0)
-                indycam_write_reg(client, INDYCAM_RED_BALANCE,
-                                  ctrl->red_balance);
-        if (ctrl->blue_balance >= 0)
-                indycam_write_reg(client, INDYCAM_BLUE_BALANCE,
-                                  ctrl->blue_balance);
-        if (ctrl->red_saturation >= 0)
-                indycam_write_reg(client, INDYCAM_RED_SATURATION,
-                                  ctrl->red_saturation);
-        if (ctrl->blue_saturation >= 0)
-                indycam_write_reg(client, INDYCAM_BLUE_SATURATION,
-                                  ctrl->blue_saturation);
-        if (ctrl->gamma >= 0)
-                indycam_write_reg(client, INDYCAM_GAMMA, ctrl->gamma);
 
-        return 0;
+        return ret;
 }
 
 /* I2C-interface */
@@ -247,7 +314,8 @@ static int indycam_attach(struct i2c_adapter *adap, int addr, int kind)
         if (err)
                 goto out_free_camera;
 
-        camera->version = i2c_smbus_read_byte_data(client, INDYCAM_VERSION);
+        camera->version = i2c_smbus_read_byte_data(client,
+                                                   INDYCAM_REG_VERSION);
         if (camera->version != CAMERA_VERSION_INDY &&
             camera->version != CAMERA_VERSION_MOOSE) {
                 err = -ENODEV;
@@ -260,8 +328,7 @@ static int indycam_attach(struct i2c_adapter *adap, int addr, int kind)
         indycam_regdump(client);
 
         // initialize
-        err = indycam_write_block(client, 0, sizeof(initseq),
-                                  (unsigned char *)&initseq);
+        err = indycam_write_block(client, 0, sizeof(initseq), (u8 *)&initseq);
         if (err) {
                 printk(KERN_ERR "IndyCam initalization failed\n");
                 err = -EIO;
@@ -271,11 +338,10 @@ static int indycam_attach(struct i2c_adapter *adap, int addr, int kind)
         indycam_regdump(client);
 
         // white balance
-        err = indycam_write_reg(client, INDYCAM_CONTROL,
+        err = indycam_write_reg(client, INDYCAM_REG_CONTROL,
                           INDYCAM_CONTROL_AGCENA | INDYCAM_CONTROL_AWBCTL);
         if (err) {
-                printk(KERN_ERR "IndyCam white balance "
-                       "initialization failed\n");
+                printk(KERN_ERR "IndyCam: White balancing camera failed\n");
                 err = -EIO;
                 goto out_detach_client;
         }
@@ -371,13 +437,11 @@ static int indycam_command(struct i2c_client *client, unsigned int cmd,
                 /* TODO: convert values for indycam_set_controls() */
                 break;
         }
-        case DECODER_INDYCAM_GET_CONTROLS: {
-                struct indycam_control *ctrl = arg;
-                indycam_get_controls(client, ctrl);
+        case DECODER_INDYCAM_GET_CONTROL: {
+                return indycam_get_control(client, arg);
         }
-        case DECODER_INDYCAM_SET_CONTROLS: {
-                struct indycam_control *ctrl = arg;
-                indycam_set_controls(client, ctrl);
+        case DECODER_INDYCAM_SET_CONTROL: {
+                return indycam_set_control(client, arg);
         }
         default:
                 return -EINVAL;
@@ -388,12 +452,12 @@ static int indycam_command(struct i2c_client *client, unsigned int cmd,
 
 static struct i2c_driver i2c_driver_indycam = {
         .owner          = THIS_MODULE,
-        .name           = "indycam",
-        .id             = I2C_DRIVERID_INDYCAM,
-        .flags          = I2C_DF_NOTIFY,
+        .name           = "indycam",
+        .id             = I2C_DRIVERID_INDYCAM,
+        .flags          = I2C_DF_NOTIFY,
         .attach_adapter = indycam_probe,
-        .detach_client  = indycam_detach,
-        .command        = indycam_command,
+        .detach_client  = indycam_detach,
+        .command        = indycam_command,
 };
 
 static int __init indycam_init(void)
diff --git a/drivers/media/video/indycam.h b/drivers/media/video/indycam.h
index d9ddb6b79a03..e6ee82063ed8 100644
--- a/drivers/media/video/indycam.h
+++ b/drivers/media/video/indycam.h
@@ -22,21 +22,21 @@
 #define INDYCAM_VERSION_MINOR(x)        ((x) & 0x0f)
 
 /* Register bus addresses */
-#define INDYCAM_CONTROL                 0x00
-#define INDYCAM_SHUTTER                 0x01
-#define INDYCAM_GAIN                    0x02
-#define INDYCAM_BRIGHTNESS              0x03 /* read-only */
-#define INDYCAM_RED_BALANCE             0x04
-#define INDYCAM_BLUE_BALANCE            0x05
-#define INDYCAM_RED_SATURATION          0x06
-#define INDYCAM_BLUE_SATURATION         0x07
-#define INDYCAM_GAMMA                   0x08
-#define INDYCAM_VERSION                 0x0e /* read-only */
-#define INDYCAM_RESET                   0x0f /* write-only */
-
-#define INDYCAM_LED                     0x46
-#define INDYCAM_ORIENTATION             0x47
-#define INDYCAM_BUTTON                  0x48
+#define INDYCAM_REG_CONTROL             0x00
+#define INDYCAM_REG_SHUTTER             0x01
+#define INDYCAM_REG_GAIN                0x02
+#define INDYCAM_REG_BRIGHTNESS          0x03 /* read-only */
+#define INDYCAM_REG_RED_BALANCE         0x04
+#define INDYCAM_REG_BLUE_BALANCE        0x05
+#define INDYCAM_REG_RED_SATURATION      0x06
+#define INDYCAM_REG_BLUE_SATURATION     0x07
+#define INDYCAM_REG_GAMMA               0x08
+#define INDYCAM_REG_VERSION             0x0e /* read-only */
+#define INDYCAM_REG_RESET               0x0f /* write-only */
+
+#define INDYCAM_REG_LED                 0x46
+#define INDYCAM_REG_ORIENTATION         0x47
+#define INDYCAM_REG_BUTTON              0x48
 
 /* Field definitions of registers */
 #define INDYCAM_CONTROL_AGCENA          (1<<0) /* automatic gain control */
@@ -59,13 +59,14 @@
 #define INDYCAM_ORIENTATION_BOTTOM_TO_TOP       0x40
 #define INDYCAM_BUTTON_RELEASED                 0x10
 
+/* Values for controls */
 #define INDYCAM_SHUTTER_MIN             0x00
 #define INDYCAM_SHUTTER_MAX             0xff
 #define INDYCAM_GAIN_MIN                0x00
 #define INDYCAM_GAIN_MAX                0xff
-#define INDYCAM_RED_BALANCE_MIN         0x00 /* the effect is the opposite? */
-#define INDYCAM_RED_BALANCE_MAX         0xff
-#define INDYCAM_BLUE_BALANCE_MIN        0x00 /* the effect is the opposite? */
+#define INDYCAM_RED_BALANCE_MIN         0x00
+#define INDYCAM_RED_BALANCE_MAX         0xff
+#define INDYCAM_BLUE_BALANCE_MIN        0x00
 #define INDYCAM_BLUE_BALANCE_MAX        0xff
 #define INDYCAM_RED_SATURATION_MIN      0x00
 #define INDYCAM_RED_SATURATION_MAX      0xff
@@ -74,34 +75,9 @@
 #define INDYCAM_GAMMA_MIN               0x00
 #define INDYCAM_GAMMA_MAX               0xff
 
-/* Driver interface definitions */
-
-#define INDYCAM_VALUE_ENABLED           1
-#define INDYCAM_VALUE_DISABLED          0
-#define INDYCAM_VALUE_UNCHANGED         -1
-
-/* When setting controls, a value of -1 leaves the control unchanged. */
-struct indycam_control {
-        int agc;        /* boolean */
-        int awb;        /* boolean */
-        int shutter;
-        int gain;
-        int red_balance;
-        int blue_balance;
-        int red_saturation;
-        int blue_saturation;
-        int gamma;
-};
-
-#define DECODER_INDYCAM_GET_CONTROLS    _IOR('d', 193, struct indycam_control)
-#define DECODER_INDYCAM_SET_CONTROLS    _IOW('d', 194, struct indycam_control)
-
-/* Default values for controls */
-
-#define INDYCAM_AGC_DEFAULT             INDYCAM_VALUE_ENABLED
-#define INDYCAM_AWB_DEFAULT             INDYCAM_VALUE_ENABLED
-
-#define INDYCAM_SHUTTER_DEFAULT         INDYCAM_SHUTTER_60
+#define INDYCAM_AGC_DEFAULT             1
+#define INDYCAM_AWB_DEFAULT             0
+#define INDYCAM_SHUTTER_DEFAULT         0xff
 #define INDYCAM_GAIN_DEFAULT            0x80
 #define INDYCAM_RED_BALANCE_DEFAULT     0x18
 #define INDYCAM_BLUE_BALANCE_DEFAULT    0xa4
@@ -109,4 +85,24 @@ struct indycam_control {
 #define INDYCAM_BLUE_SATURATION_DEFAULT 0xc0
 #define INDYCAM_GAMMA_DEFAULT           0x80
 
+/* Driver interface definitions */
+
+#define INDYCAM_CONTROL_AGC                     0       /* boolean */
+#define INDYCAM_CONTROL_AWB                     1       /* boolean */
+#define INDYCAM_CONTROL_SHUTTER                 2
+#define INDYCAM_CONTROL_GAIN                    3
+#define INDYCAM_CONTROL_RED_BALANCE             4
+#define INDYCAM_CONTROL_BLUE_BALANCE            5
+#define INDYCAM_CONTROL_RED_SATURATION          6
+#define INDYCAM_CONTROL_BLUE_SATURATION         7
+#define INDYCAM_CONTROL_GAMMA                   8
+
+struct indycam_control {
+        u8 type;
+        s32 value;
+};
+
+#define DECODER_INDYCAM_GET_CONTROL     _IOR('d', 193, struct indycam_control)
+#define DECODER_INDYCAM_SET_CONTROL     _IOW('d', 194, struct indycam_control)
+
 #endif
diff --git a/drivers/media/video/msp3400.c b/drivers/media/video/msp3400.c
index 262890cb20a7..e75e7948fd9d 100644
--- a/drivers/media/video/msp3400.c
+++ b/drivers/media/video/msp3400.c
@@ -741,8 +741,8 @@ static int msp34xx_sleep(struct msp3400c *msp, int timeout)
                         set_current_state(TASK_INTERRUPTIBLE);
                         schedule();
                 } else {
-                        set_current_state(TASK_INTERRUPTIBLE);
-                        schedule_timeout(msecs_to_jiffies(timeout));
+                        schedule_timeout_interruptible
+                                                (msecs_to_jiffies(timeout));
                 }
         }
 
diff --git a/drivers/media/video/saa7134/saa7134-tvaudio.c b/drivers/media/video/saa7134/saa7134-tvaudio.c
index badf2f9e3072..61a2d6b50eef 100644
--- a/drivers/media/video/saa7134/saa7134-tvaudio.c
+++ b/drivers/media/video/saa7134/saa7134-tvaudio.c
@@ -342,8 +342,8 @@ static int tvaudio_sleep(struct saa7134_dev *dev, int timeout)
                         set_current_state(TASK_INTERRUPTIBLE);
                         schedule();
                 } else {
-                        set_current_state(TASK_INTERRUPTIBLE);
-                        schedule_timeout(msecs_to_jiffies(timeout));
+                        schedule_timeout_interruptible
+                                                (msecs_to_jiffies(timeout));
                 }
         }
         remove_wait_queue(&dev->thread.wq, &wait);
diff --git a/drivers/media/video/saa7191.c b/drivers/media/video/saa7191.c
index 3ddbb62312be..cbca896e8cfa 100644
--- a/drivers/media/video/saa7191.c
+++ b/drivers/media/video/saa7191.c
@@ -26,71 +26,95 @@
 
 #include "saa7191.h"
 
-#define SAA7191_MODULE_VERSION "0.0.3"
+#define SAA7191_MODULE_VERSION  "0.0.5"
 
 MODULE_DESCRIPTION("Philips SAA7191 video decoder driver");
 MODULE_VERSION(SAA7191_MODULE_VERSION);
 MODULE_AUTHOR("Mikael Nousiainen <tmnousia@cc.hut.fi>");
 MODULE_LICENSE("GPL");
 
+// #define SAA7191_DEBUG
+
+#ifdef SAA7191_DEBUG
+#define dprintk(x...) printk("SAA7191: " x);
+#else
+#define dprintk(x...)
+#endif
+
+#define SAA7191_SYNC_COUNT      30
+#define SAA7191_SYNC_DELAY      100     /* milliseconds */
+
 struct saa7191 {
         struct i2c_client *client;
 
         /* the register values are stored here as the actual
          * I2C-registers are write-only */
-        unsigned char reg[25];
+        u8 reg[25];
 
-        unsigned char norm;
-        unsigned char input;
+        int input;
+        int norm;
 };
 
 static struct i2c_driver i2c_driver_saa7191;
 
-static const unsigned char initseq[] = {
+static const u8 initseq[] = {
         0,      /* Subaddress */
-        0x50,   /* SAA7191_REG_IDEL */
-        0x30,   /* SAA7191_REG_HSYB */
-        0x00,   /* SAA7191_REG_HSYS */
-        0xe8,   /* SAA7191_REG_HCLB */
-        0xb6,   /* SAA7191_REG_HCLS */
-        0xf4,   /* SAA7191_REG_HPHI */
-        0x01,   /* SAA7191_REG_LUMA - chrominance trap active (CVBS) */
-        0x00,   /* SAA7191_REG_HUEC */
-        0xf8,   /* SAA7191_REG_CKTQ */
-        0xf8,   /* SAA7191_REG_CKTS */
-        0x90,   /* SAA7191_REG_PLSE */
-        0x90,   /* SAA7191_REG_SESE */
-        0x00,   /* SAA7191_REG_GAIN */
-        0x0c,   /* SAA7191_REG_STDC - not SECAM, slow time constant */
-        0x78,   /* SAA7191_REG_IOCK - chrominance from CVBS, GPSW1 & 2 off */
-        0x99,   /* SAA7191_REG_CTL3 - automatic field detection */
-        0x00,   /* SAA7191_REG_CTL4 */
-        0x2c,   /* SAA7191_REG_CHCV */
+
+        0x50,   /* (0x50) SAA7191_REG_IDEL */
+
+        /* 50 Hz signal timing */
+        0x30,   /* (0x30) SAA7191_REG_HSYB */
+        0x00,   /* (0x00) SAA7191_REG_HSYS */
+        0xe8,   /* (0xe8) SAA7191_REG_HCLB */
+        0xb6,   /* (0xb6) SAA7191_REG_HCLS */
+        0xf4,   /* (0xf4) SAA7191_REG_HPHI */
+
+        /* control */
+        SAA7191_LUMA_APER_1,    /* (0x01) SAA7191_REG_LUMA - CVBS mode */
+        0x00,   /* (0x00) SAA7191_REG_HUEC */
+        0xf8,   /* (0xf8) SAA7191_REG_CKTQ */
+        0xf8,   /* (0xf8) SAA7191_REG_CKTS */
+        0x90,   /* (0x90) SAA7191_REG_PLSE */
+        0x90,   /* (0x90) SAA7191_REG_SESE */
+        0x00,   /* (0x00) SAA7191_REG_GAIN */
+        SAA7191_STDC_NFEN | SAA7191_STDC_HRMV,  /* (0x0c) SAA7191_REG_STDC
+                                                 * - not SECAM,
+                                                 * slow time constant */
+        SAA7191_IOCK_OEDC | SAA7191_IOCK_OEHS | SAA7191_IOCK_OEVS
+        | SAA7191_IOCK_OEDY,    /* (0x78) SAA7191_REG_IOCK
+                                 * - chroma from CVBS, GPSW1 & 2 off */
+        SAA7191_CTL3_AUFD | SAA7191_CTL3_SCEN | SAA7191_CTL3_OFTS
+        | SAA7191_CTL3_YDEL0,   /* (0x99) SAA7191_REG_CTL3
+                                 * - automatic field detection */
+        0x00,   /* (0x00) SAA7191_REG_CTL4 */
+        0x2c,   /* (0x2c) SAA7191_REG_CHCV - PAL nominal value */
         0x00,   /* unused */
         0x00,   /* unused */
-        0x34,   /* SAA7191_REG_HS6B */
-        0x0a,   /* SAA7191_REG_HS6S */
-        0xf4,   /* SAA7191_REG_HC6B */
-        0xce,   /* SAA7191_REG_HC6S */
-        0xf4,   /* SAA7191_REG_HP6I */
+
+        /* 60 Hz signal timing */
+        0x34,   /* (0x34) SAA7191_REG_HS6B */
+        0x0a,   /* (0x0a) SAA7191_REG_HS6S */
+        0xf4,   /* (0xf4) SAA7191_REG_HC6B */
+        0xce,   /* (0xce) SAA7191_REG_HC6S */
+        0xf4,   /* (0xf4) SAA7191_REG_HP6I */
 };
 
 /* SAA7191 register handling */
 
-static unsigned char saa7191_read_reg(struct i2c_client *client,
-                                      unsigned char reg)
+static u8 saa7191_read_reg(struct i2c_client *client,
+                           u8 reg)
 {
         return ((struct saa7191 *)i2c_get_clientdata(client))->reg[reg];
 }
 
 static int saa7191_read_status(struct i2c_client *client,
-                               unsigned char *value)
+                               u8 *value)
 {
         int ret;
 
         ret = i2c_master_recv(client, value, 1);
         if (ret < 0) {
-                printk(KERN_ERR "SAA7191: saa7191_read_status(): read failed");
+                printk(KERN_ERR "SAA7191: saa7191_read_status(): read failed\n");
                 return ret;
         }
 
@@ -98,17 +122,16 @@ static int saa7191_read_status(struct i2c_client *client,
 }
 
 
-static int saa7191_write_reg(struct i2c_client *client, unsigned char reg,
-                             unsigned char value)
+static int saa7191_write_reg(struct i2c_client *client, u8 reg,
+                             u8 value)
 {
-
         ((struct saa7191 *)i2c_get_clientdata(client))->reg[reg] = value;
         return i2c_smbus_write_byte_data(client, reg, value);
 }
 
 /* the first byte of data must be the first subaddress number (register) */
 static int saa7191_write_block(struct i2c_client *client,
-                               unsigned char length, unsigned char *data)
+                               u8 length, u8 *data)
 {
         int i;
         int ret;
@@ -121,7 +144,7 @@ static int saa7191_write_block(struct i2c_client *client,
         ret = i2c_master_send(client, data, length);
         if (ret < 0) {
                 printk(KERN_ERR "SAA7191: saa7191_write_block(): "
-                       "write failed");
+                       "write failed\n");
                 return ret;
         }
 
@@ -132,8 +155,9 @@ static int saa7191_write_block(struct i2c_client *client,
 
 static int saa7191_set_input(struct i2c_client *client, int input)
 {
-        unsigned char luma = saa7191_read_reg(client, SAA7191_REG_LUMA);
-        unsigned char iock = saa7191_read_reg(client, SAA7191_REG_IOCK);
+        struct saa7191 *decoder = i2c_get_clientdata(client);
+        u8 luma = saa7191_read_reg(client, SAA7191_REG_LUMA);
+        u8 iock = saa7191_read_reg(client, SAA7191_REG_IOCK);
         int err;
 
         switch (input) {
@@ -159,32 +183,20 @@ static int saa7191_set_input(struct i2c_client *client, int input)
         if (err)
                 return -EIO;
 
+        decoder->input = input;
+
         return 0;
 }
 
 static int saa7191_set_norm(struct i2c_client *client, int norm)
 {
         struct saa7191 *decoder = i2c_get_clientdata(client);
-        unsigned char stdc = saa7191_read_reg(client, SAA7191_REG_STDC);
-        unsigned char ctl3 = saa7191_read_reg(client, SAA7191_REG_CTL3);
-        unsigned char chcv = saa7191_read_reg(client, SAA7191_REG_CHCV);
+        u8 stdc = saa7191_read_reg(client, SAA7191_REG_STDC);
+        u8 ctl3 = saa7191_read_reg(client, SAA7191_REG_CTL3);
+        u8 chcv = saa7191_read_reg(client, SAA7191_REG_CHCV);
         int err;
 
         switch(norm) {
-        case SAA7191_NORM_AUTO: {
-                unsigned char status;
-
-                // does status depend on current norm ?
-                if (saa7191_read_status(client, &status))
-                        return -EIO;
-
-                stdc &= ~SAA7191_STDC_SECS;
-                ctl3 &= ~SAA7191_CTL3_FSEL;
-                ctl3 |= SAA7191_CTL3_AUFD;
-                chcv = (status & SAA7191_STATUS_FIDT)
-                               ? SAA7191_CHCV_NTSC : SAA7191_CHCV_PAL;
-                break;
-        }
         case SAA7191_NORM_PAL:
                 stdc &= ~SAA7191_STDC_SECS;
                 ctl3 &= ~(SAA7191_CTL3_AUFD | SAA7191_CTL3_FSEL);
@@ -217,60 +229,335 @@ static int saa7191_set_norm(struct i2c_client *client, int norm)
 
         decoder->norm = norm;
 
+        dprintk("ctl3: %02x stdc: %02x chcv: %02x\n", ctl3,
+                stdc, chcv);
+        dprintk("norm: %d\n", norm);
+
         return 0;
 }
 
-static int saa7191_get_controls(struct i2c_client *client,
-                                struct saa7191_control *ctrl)
+static int saa7191_wait_for_signal(struct i2c_client *client, u8 *status)
 {
-        unsigned char hue = saa7191_read_reg(client, SAA7191_REG_HUEC);
-        unsigned char stdc = saa7191_read_reg(client, SAA7191_REG_STDC);
+        int i = 0;
 
-        if (hue < 0x80) {
-                hue += 0x80;
-        } else {
-                hue -= 0x80;
+        dprintk("Checking for signal...\n");
+
+        for (i = 0; i < SAA7191_SYNC_COUNT; i++) {
+                if (saa7191_read_status(client, status))
+                        return -EIO;
+
+                if (((*status) & SAA7191_STATUS_HLCK) == 0) {
+                        dprintk("Signal found\n");
+                        return 0;
+                }
+
+                msleep(SAA7191_SYNC_DELAY);
         }
-        ctrl->hue = hue;
 
-        ctrl->vtrc = (stdc & SAA7191_STDC_VTRC)
-                ? SAA7191_VALUE_ENABLED : SAA7191_VALUE_DISABLED;
+        dprintk("No signal\n");
 
-        return 0;
+        return -EBUSY;
 }
 
-static int saa7191_set_controls(struct i2c_client *client,
-                                struct saa7191_control *ctrl)
+static int saa7191_autodetect_norm_extended(struct i2c_client *client)
 {
-        int err;
+        u8 stdc = saa7191_read_reg(client, SAA7191_REG_STDC);
+        u8 ctl3 = saa7191_read_reg(client, SAA7191_REG_CTL3);
+        u8 status;
+        int err = 0;
 
-        if (ctrl->hue >= 0) {
-                unsigned char hue = ctrl->hue & 0xff;
-                if (hue < 0x80) {
-                        hue += 0x80;
-                } else {
-                        hue -= 0x80;
+        dprintk("SAA7191 extended signal auto-detection...\n");
+
+        stdc &= ~SAA7191_STDC_SECS;
+        ctl3 &= ~(SAA7191_CTL3_FSEL);
+
+        err = saa7191_write_reg(client, SAA7191_REG_STDC, stdc);
+        if (err) {
+                err = -EIO;
+                goto out;
+        }
+        err = saa7191_write_reg(client, SAA7191_REG_CTL3, ctl3);
+        if (err) {
+                err = -EIO;
+                goto out;
+        }
+
+        ctl3 |= SAA7191_CTL3_AUFD;
+        err = saa7191_write_reg(client, SAA7191_REG_CTL3, ctl3);
+        if (err) {
+                err = -EIO;
+                goto out;
+        }
+
+        msleep(SAA7191_SYNC_DELAY);
+
+        err = saa7191_wait_for_signal(client, &status);
+        if (err)
+                goto out;
+
+        if (status & SAA7191_STATUS_FIDT) {
+                /* 60Hz signal -> NTSC */
+                dprintk("60Hz signal: NTSC\n");
+                return saa7191_set_norm(client, SAA7191_NORM_NTSC);
+        }
+
+        /* 50Hz signal */
+        dprintk("50Hz signal: Trying PAL...\n");
+
+        /* try PAL first */
+        err = saa7191_set_norm(client, SAA7191_NORM_PAL);
+        if (err)
+                goto out;
+
+        msleep(SAA7191_SYNC_DELAY);
+
+        err = saa7191_wait_for_signal(client, &status);
+        if (err)
+                goto out;
+
+        /* not 50Hz ? */
+        if (status & SAA7191_STATUS_FIDT) {
+                dprintk("No 50Hz signal\n");
+                err = -EAGAIN;
+                goto out;
+        }
+
+        if (status & SAA7191_STATUS_CODE) {
+                dprintk("PAL\n");
+                return 0;
+        }
+
+        dprintk("No color detected with PAL - Trying SECAM...\n");
+
+        /* no color detected ? -> try SECAM */
+        err = saa7191_set_norm(client,
+                               SAA7191_NORM_SECAM);
+        if (err)
+                goto out;
+
+        msleep(SAA7191_SYNC_DELAY);
+
+        err = saa7191_wait_for_signal(client, &status);
+        if (err)
+                goto out;
+
+        /* not 50Hz ? */
+        if (status & SAA7191_STATUS_FIDT) {
+                dprintk("No 50Hz signal\n");
+                err = -EAGAIN;
+                goto out;
+        }
+
+        if (status & SAA7191_STATUS_CODE) {
+                /* Color detected -> SECAM */
+                dprintk("SECAM\n");
+                return 0;
+        }
+
+        dprintk("No color detected with SECAM - Going back to PAL.\n");
+
+        /* still no color detected ?
+         * -> set norm back to PAL */
+        err = saa7191_set_norm(client,
+                               SAA7191_NORM_PAL);
+        if (err)
+                goto out;
+
+out:
+        ctl3 = saa7191_read_reg(client, SAA7191_REG_CTL3);
+        if (ctl3 & SAA7191_CTL3_AUFD) {
+                ctl3 &= ~(SAA7191_CTL3_AUFD);
+                err = saa7191_write_reg(client, SAA7191_REG_CTL3, ctl3);
+                if (err) {
+                        err = -EIO;
                 }
-                err = saa7191_write_reg(client, SAA7191_REG_HUEC, hue);
-                if (err)
-                        return -EIO;
         }
-        if (ctrl->vtrc >= 0) {
-                unsigned char stdc =
-                        saa7191_read_reg(client, SAA7191_REG_STDC);
 
-                if (ctrl->vtrc) {
-                        stdc |= SAA7191_STDC_VTRC;
-                } else {
-                        stdc &= ~SAA7191_STDC_VTRC;
+        return err;
+}
+
+static int saa7191_autodetect_norm(struct i2c_client *client)
+{
+        u8 status;
+
+        dprintk("SAA7191 signal auto-detection...\n");
+
+        dprintk("Reading status...\n");
+
+        if (saa7191_read_status(client, &status))
+                return -EIO;
+
+        dprintk("Checking for signal...\n");
+
+        /* no signal ? */
+        if (status & SAA7191_STATUS_HLCK) {
+                dprintk("No signal\n");
+                return -EBUSY;
+        }
+
+        dprintk("Signal found\n");
+
+        if (status & SAA7191_STATUS_FIDT) {
+                /* 60hz signal -> NTSC */
+                dprintk("NTSC\n");
+                return saa7191_set_norm(client, SAA7191_NORM_NTSC);
+        } else {
+                /* 50hz signal -> PAL */
+                dprintk("PAL\n");
+                return saa7191_set_norm(client, SAA7191_NORM_PAL);
+        }
+}
+
+static int saa7191_get_control(struct i2c_client *client,
+                               struct saa7191_control *ctrl)
+{
+        u8 reg;
+        int ret = 0;
+
+        switch (ctrl->type) {
+        case SAA7191_CONTROL_BANDPASS:
+        case SAA7191_CONTROL_BANDPASS_WEIGHT:
+        case SAA7191_CONTROL_CORING:
+                reg = saa7191_read_reg(client, SAA7191_REG_LUMA);
+                switch (ctrl->type) {
+                case SAA7191_CONTROL_BANDPASS:
+                        ctrl->value = ((s32)reg & SAA7191_LUMA_BPSS_MASK)
+                                >> SAA7191_LUMA_BPSS_SHIFT;
+                        break;
+                case SAA7191_CONTROL_BANDPASS_WEIGHT:
+                        ctrl->value = ((s32)reg & SAA7191_LUMA_APER_MASK)
+                                >> SAA7191_LUMA_APER_SHIFT;
+                        break;
+                case SAA7191_CONTROL_CORING:
+                        ctrl->value = ((s32)reg & SAA7191_LUMA_CORI_MASK)
+                                >> SAA7191_LUMA_CORI_SHIFT;
+                        break;
                 }
+                break;
+        case SAA7191_CONTROL_FORCE_COLOUR:
+        case SAA7191_CONTROL_CHROMA_GAIN:
+                reg = saa7191_read_reg(client, SAA7191_REG_GAIN);
+                if (ctrl->type == SAA7191_CONTROL_FORCE_COLOUR)
+                        ctrl->value = ((s32)reg & SAA7191_GAIN_COLO) ? 1 : 0;
+                else
+                        ctrl->value = ((s32)reg & SAA7191_GAIN_LFIS_MASK)
+                                >> SAA7191_GAIN_LFIS_SHIFT;
+                break;
+        case SAA7191_CONTROL_HUE:
+                reg = saa7191_read_reg(client, SAA7191_REG_HUEC);
+                if (reg < 0x80)
+                        reg += 0x80;
+                else
+                        reg -= 0x80;
+                ctrl->value = (s32)reg;
+                break;
+        case SAA7191_CONTROL_VTRC:
+                reg = saa7191_read_reg(client, SAA7191_REG_STDC);
+                ctrl->value = ((s32)reg & SAA7191_STDC_VTRC) ? 1 : 0;
+                break;
+        case SAA7191_CONTROL_LUMA_DELAY:
+                reg = saa7191_read_reg(client, SAA7191_REG_CTL3);
+                ctrl->value = ((s32)reg & SAA7191_CTL3_YDEL_MASK)
+                        >> SAA7191_CTL3_YDEL_SHIFT;
+                if (ctrl->value >= 4)
+                        ctrl->value -= 8;
+                break;
+        case SAA7191_CONTROL_VNR:
+                reg = saa7191_read_reg(client, SAA7191_REG_CTL4);
+                ctrl->value = ((s32)reg & SAA7191_CTL4_VNOI_MASK)
+                        >> SAA7191_CTL4_VNOI_SHIFT;
+                break;
+        default:
+                ret = -EINVAL;
+        }
 
-                err = saa7191_write_reg(client, SAA7191_REG_STDC, stdc);
-                if (err)
-                        return -EIO;
+        return ret;
+}
+
+static int saa7191_set_control(struct i2c_client *client,
+                               struct saa7191_control *ctrl)
+{
+        u8 reg;
+        int ret = 0;
+
+        switch (ctrl->type) {
+        case SAA7191_CONTROL_BANDPASS:
+        case SAA7191_CONTROL_BANDPASS_WEIGHT:
+        case SAA7191_CONTROL_CORING:
+                reg = saa7191_read_reg(client, SAA7191_REG_LUMA);
+                switch (ctrl->type) {
+                case SAA7191_CONTROL_BANDPASS:
+                        reg &= ~SAA7191_LUMA_BPSS_MASK;
+                        reg |= (ctrl->value << SAA7191_LUMA_BPSS_SHIFT)
+                                & SAA7191_LUMA_BPSS_MASK;
+                        break;
+                case SAA7191_CONTROL_BANDPASS_WEIGHT:
+                        reg &= ~SAA7191_LUMA_APER_MASK;
+                        reg |= (ctrl->value << SAA7191_LUMA_APER_SHIFT)
+                                & SAA7191_LUMA_APER_MASK;
+                        break;
+                case SAA7191_CONTROL_CORING:
+                        reg &= ~SAA7191_LUMA_CORI_MASK;
+                        reg |= (ctrl->value << SAA7191_LUMA_CORI_SHIFT)
+                                & SAA7191_LUMA_CORI_MASK;
+                        break;
+                }
+                ret = saa7191_write_reg(client, SAA7191_REG_LUMA, reg);
+                break;
+        case SAA7191_CONTROL_FORCE_COLOUR:
+        case SAA7191_CONTROL_CHROMA_GAIN:
+                reg = saa7191_read_reg(client, SAA7191_REG_GAIN);
+                if (ctrl->type == SAA7191_CONTROL_FORCE_COLOUR) {
+                        if (ctrl->value)
+                                reg |= SAA7191_GAIN_COLO;
+                        else
+                                reg &= ~SAA7191_GAIN_COLO;
+                } else {
+                        reg &= ~SAA7191_GAIN_LFIS_MASK;
+                        reg |= (ctrl->value << SAA7191_GAIN_LFIS_SHIFT)
+                                & SAA7191_GAIN_LFIS_MASK;
+                }
+                ret = saa7191_write_reg(client, SAA7191_REG_GAIN, reg);
+                break;
+        case SAA7191_CONTROL_HUE:
+                reg = ctrl->value & 0xff;
+                if (reg < 0x80)
+                        reg += 0x80;
+                else
+                        reg -= 0x80;
+                ret = saa7191_write_reg(client, SAA7191_REG_HUEC, reg);
+                break;
+        case SAA7191_CONTROL_VTRC:
+                reg = saa7191_read_reg(client, SAA7191_REG_STDC);
+                if (ctrl->value)
+                        reg |= SAA7191_STDC_VTRC;
+                else
+                        reg &= ~SAA7191_STDC_VTRC;
+                ret = saa7191_write_reg(client, SAA7191_REG_STDC, reg);
+                break;
+        case SAA7191_CONTROL_LUMA_DELAY: {
+                s32 value = ctrl->value;
+                if (value < 0)
+                        value += 8;
+                reg = saa7191_read_reg(client, SAA7191_REG_CTL3);
+                reg &= ~SAA7191_CTL3_YDEL_MASK;
+                reg |= (value << SAA7191_CTL3_YDEL_SHIFT)
+                        & SAA7191_CTL3_YDEL_MASK;
+                ret = saa7191_write_reg(client, SAA7191_REG_CTL3, reg);
+                break;
+        }
+        case SAA7191_CONTROL_VNR:
+                reg = saa7191_read_reg(client, SAA7191_REG_CTL4);
+                reg &= ~SAA7191_CTL4_VNOI_MASK;
+                reg |= (ctrl->value << SAA7191_CTL4_VNOI_SHIFT)
+                        & SAA7191_CTL4_VNOI_MASK;
+                ret = saa7191_write_reg(client, SAA7191_REG_CTL4, reg);
+                break;
+        default:
+                ret = -EINVAL;
         }
 
-        return 0;
+        return ret;
 }
 
 /* I2C-interface */
@@ -309,11 +596,7 @@ static int saa7191_attach(struct i2c_adapter *adap, int addr, int kind)
         if (err)
                 goto out_free_decoder;
 
-        decoder->input = SAA7191_INPUT_COMPOSITE;
-        decoder->norm = SAA7191_NORM_AUTO;
-
-        err = saa7191_write_block(client, sizeof(initseq),
-                                  (unsigned char *)initseq);
+        err = saa7191_write_block(client, sizeof(initseq), (u8 *)initseq);
         if (err) {
                 printk(KERN_ERR "SAA7191 initialization failed\n");
                 goto out_detach_client;
@@ -321,6 +604,14 @@ static int saa7191_attach(struct i2c_adapter *adap, int addr, int kind)
 
         printk(KERN_INFO "SAA7191 initialized\n");
 
+        decoder->input = SAA7191_INPUT_COMPOSITE;
+        decoder->norm = SAA7191_NORM_PAL;
+
+        err = saa7191_autodetect_norm(client);
+        if (err && (err != -EBUSY)) {
+                printk(KERN_ERR "SAA7191: Signal auto-detection failed\n");
+        }
+
         return 0;
 
 out_detach_client:
@@ -368,7 +659,7 @@ static int saa7191_command(struct i2c_client *client, unsigned int cmd,
         }
         case DECODER_GET_STATUS: {
                 int *iarg = arg;
-                unsigned char status;
+                u8 status;
                 int res = 0;
 
                 if (saa7191_read_status(client, &status)) {
@@ -404,7 +695,7 @@ static int saa7191_command(struct i2c_client *client, unsigned int cmd,
 
                 switch (*iarg) {
                 case VIDEO_MODE_AUTO:
-                        return saa7191_set_norm(client, SAA7191_NORM_AUTO);
+                        return saa7191_autodetect_norm(client);
                 case VIDEO_MODE_PAL:
                         return saa7191_set_norm(client, SAA7191_NORM_PAL);
                 case VIDEO_MODE_NTSC:
@@ -446,38 +737,48 @@ static int saa7191_command(struct i2c_client *client, unsigned int cmd,
                 int err;
 
                 val = (pic->hue >> 8) - 0x80;
+
                 err = saa7191_write_reg(client, SAA7191_REG_HUEC, val);
                 if (err)
                         return -EIO;
+
                 break;
         }
         case DECODER_SAA7191_GET_STATUS: {
                 struct saa7191_status *status = arg;
-                unsigned char status_reg;
+                u8 status_reg;
 
                 if (saa7191_read_status(client, &status_reg))
                         return -EIO;
+
                 status->signal = ((status_reg & SAA7191_STATUS_HLCK) == 0)
-                        ? SAA7191_VALUE_ENABLED : SAA7191_VALUE_DISABLED;
-                status->ntsc = (status_reg & SAA7191_STATUS_FIDT)
-                        ? SAA7191_VALUE_ENABLED : SAA7191_VALUE_DISABLED;
-                status->color = (status_reg & SAA7191_STATUS_CODE)
-                        ? SAA7191_VALUE_ENABLED : SAA7191_VALUE_DISABLED;
+                        ? 1 : 0;
+                status->signal_60hz = (status_reg & SAA7191_STATUS_FIDT)
+                        ? 1 : 0;
+                status->color = (status_reg & SAA7191_STATUS_CODE) ? 1 : 0;
 
                 status->input = decoder->input;
                 status->norm = decoder->norm;
+
+                break;
         }
         case DECODER_SAA7191_SET_NORM: {
                 int *norm = arg;
-                return saa7191_set_norm(client, *norm);
+
+                switch (*norm) {
+                case SAA7191_NORM_AUTO:
+                        return saa7191_autodetect_norm(client);
+                case SAA7191_NORM_AUTO_EXT:
+                        return saa7191_autodetect_norm_extended(client);
+                default:
+                        return saa7191_set_norm(client, *norm);
+                }
         }
-        case DECODER_SAA7191_GET_CONTROLS: {
-                struct saa7191_control *ctrl = arg;
-                return saa7191_get_controls(client, ctrl);
+        case DECODER_SAA7191_GET_CONTROL: {
+                return saa7191_get_control(client, arg);
         }
-        case DECODER_SAA7191_SET_CONTROLS: {
-                struct saa7191_control *ctrl = arg;
-                return saa7191_set_controls(client, ctrl);
+        case DECODER_SAA7191_SET_CONTROL: {
+                return saa7191_set_control(client, arg);
         }
         default:
                 return -EINVAL;
@@ -488,12 +789,12 @@ static int saa7191_command(struct i2c_client *client, unsigned int cmd,
 
 static struct i2c_driver i2c_driver_saa7191 = {
         .owner          = THIS_MODULE,
-        .name           = "saa7191",
-        .id             = I2C_DRIVERID_SAA7191,
-        .flags          = I2C_DF_NOTIFY,
+        .name           = "saa7191",
+        .id             = I2C_DRIVERID_SAA7191,
+        .flags          = I2C_DF_NOTIFY,
         .attach_adapter = saa7191_probe,
-        .detach_client  = saa7191_detach,
-        .command        = saa7191_command
+        .detach_client  = saa7191_detach,
+        .command        = saa7191_command
 };
 
 static int saa7191_init(void)
diff --git a/drivers/media/video/saa7191.h b/drivers/media/video/saa7191.h
index 272045031435..a2310da1940d 100644
--- a/drivers/media/video/saa7191.h
+++ b/drivers/media/video/saa7191.h
@@ -24,8 +24,8 @@
 #define SAA7191_REG_HPHI        0x05
 #define SAA7191_REG_LUMA        0x06
 #define SAA7191_REG_HUEC        0x07
-#define SAA7191_REG_CKTQ        0x08
-#define SAA7191_REG_CKTS        0x09
+#define SAA7191_REG_CKTQ        0x08 /* bits 3-7 */
+#define SAA7191_REG_CKTS        0x09 /* bits 3-7 */
 #define SAA7191_REG_PLSE        0x0a
 #define SAA7191_REG_SESE        0x0b
 #define SAA7191_REG_GAIN        0x0c
@@ -43,30 +43,82 @@
 
 /* Status Register definitions */
 #define SAA7191_STATUS_CODE     0x01    /* color detected flag */
-#define SAA7191_STATUS_FIDT     0x20    /* format type NTSC/PAL */
-#define SAA7191_STATUS_HLCK     0x40    /* PLL unlocked/locked */
+#define SAA7191_STATUS_FIDT     0x20    /* signal type 50/60 Hz */
+#define SAA7191_STATUS_HLCK     0x40    /* PLL unlocked(1)/locked(0) */
 #define SAA7191_STATUS_STTC     0x80    /* tv/vtr time constant */
 
 /* Luminance Control Register definitions */
+/* input mode select bit:
+ * 0=CVBS (chrominance trap active), 1=S-Video (trap bypassed) */
 #define SAA7191_LUMA_BYPS       0x80
-
-/* Chroma Gain Control Settings Register definitions */
-/* 0=automatic colour-killer enabled, 1=forced colour on */
+/* pre-filter (only when chrominance trap is active) */
+#define SAA7191_LUMA_PREF       0x40
+/* aperture bandpass to select different characteristics with maximums
+ * (bits 4-5) */
+#define SAA7191_LUMA_BPSS_MASK  0x30
+#define SAA7191_LUMA_BPSS_SHIFT 4
+#define SAA7191_LUMA_BPSS_3     0x30
+#define SAA7191_LUMA_BPSS_2     0x20
+#define SAA7191_LUMA_BPSS_1     0x10
+#define SAA7191_LUMA_BPSS_0     0x00
+/* coring range for high frequency components according to 8-bit luminance
+ * (bits 2-3)
+ * 0=coring off, n= (+-)n LSB */
+#define SAA7191_LUMA_CORI_MASK  0x0c
+#define SAA7191_LUMA_CORI_SHIFT 2
+#define SAA7191_LUMA_CORI_3     0x0c
+#define SAA7191_LUMA_CORI_2     0x08
+#define SAA7191_LUMA_CORI_1     0x04
+#define SAA7191_LUMA_CORI_0     0x00
+/* aperture bandpass filter weights high frequency components of luminance
+ * signal (bits 0-1)
+ * 0=factor 0, 1=0.25, 2=0.5, 3=1 */
+#define SAA7191_LUMA_APER_MASK  0x03
+#define SAA7191_LUMA_APER_SHIFT 0
+#define SAA7191_LUMA_APER_3     0x03
+#define SAA7191_LUMA_APER_2     0x02
+#define SAA7191_LUMA_APER_1     0x01
+#define SAA7191_LUMA_APER_0     0x00
+
+/* Chrominance Gain Control Settings Register definitions */
+/* colour on: 0=automatic colour-killer enabled, 1=forced colour on */
 #define SAA7191_GAIN_COLO       0x80
+/* chrominance gain control (AGC filter)
+ * 0=loop filter time constant slow, 1=medium, 2=fast, 3=actual gain */
+#define SAA7191_GAIN_LFIS_MASK  0x60
+#define SAA7191_GAIN_LFIS_SHIFT 5
+#define SAA7191_GAIN_LFIS_3     0x60
+#define SAA7191_GAIN_LFIS_2     0x40
+#define SAA7191_GAIN_LFIS_1     0x20
+#define SAA7191_GAIN_LFIS_0     0x00
 
 /* Standard/Mode Control Register definitions */
 /* tv/vtr mode bit: 0=TV mode (slow time constant),
  * 1=VTR mode (fast time constant) */
 #define SAA7191_STDC_VTRC       0x80
+/* SAA7191B-specific functions enable (RTCO, ODD and GPSW0 outputs)
+ * 0=outputs set to high-impedance (circuit equals SAA7191), 1=enabled */
+#define SAA7191_STDC_NFEN       0x08
+/* HREF generation: 0=like SAA7191, 1=HREF is 8xLLC2 clocks earlier */
+#define SAA7191_STDC_HRMV       0x04
+/* general purpose switch 0
+ * (not used with VINO afaik) */
+#define SAA7191_STDC_GPSW0      0x02
 /* SECAM mode bit: 0=other standards, 1=SECAM */
 #define SAA7191_STDC_SECS       0x01
-/* the bit fields above must be or'd with this value */
-#define SAA7191_STDC_VALUE      0x0c
 
 /* I/O and Clock Control Register definitions */
 /* horizontal clock PLL: 0=PLL closed,
  * 1=PLL circuit open and horizontal freq fixed */
 #define SAA7191_IOCK_HPLL       0x80
+/* colour-difference output enable (outputs UV0-UV7) */
+#define SAA7191_IOCK_OEDC       0x40
+/* H-sync output enable */
+#define SAA7191_IOCK_OEHS       0x20
+/* V-sync output enable */
+#define SAA7191_IOCK_OEVS       0x10
+/* luminance output enable (outputs Y0-Y7) */
+#define SAA7191_IOCK_OEDY       0x08
 /* S-VHS bit (chrominance from CVBS or from chrominance input):
  * 0=controlled by BYPS-bit, 1=from chrominance input */
 #define SAA7191_IOCK_CHRS       0x04
@@ -83,11 +135,40 @@
 /* field select: (if AUFD=0)
  * 0=50Hz (625 lines), 1=60Hz (525 lines) */
 #define SAA7191_CTL3_FSEL       0x40
-/* the bit fields above must be or'd with this value */
-#define SAA7191_CTL3_VALUE      0x19
+/* SECAM cross-colour reduction enable */
+#define SAA7191_CTL3_SXCR       0x20
+/* sync and clamping pulse enable (HCL and HSY outputs) */
+#define SAA7191_CTL3_SCEN       0x10
+/* output format: 0=4:1:1, 1=4:2:2 (4:2:2 for VINO) */
+#define SAA7191_CTL3_OFTS       0x08
+/* luminance delay compensation
+ * 0=0*2/LLC,  1=+1*2/LLC, 2=+2*2/LLC, 3=+3*2/LLC,
+ * 4=-4*2/LLC, 5=-3*2/LLC, 6=-2*2/LLC, 7=-1*2/LLC
+ * step size = 2/LLC = 67.8ns for 50Hz, 81.5ns for 60Hz */
+#define SAA7191_CTL3_YDEL_MASK  0x07
+#define SAA7191_CTL3_YDEL_SHIFT 0
+#define SAA7191_CTL3_YDEL2      0x04
+#define SAA7191_CTL3_YDEL1      0x02
+#define SAA7191_CTL3_YDEL0      0x01
+
+/* Miscellaneous Control #2 Register definitions */
+/* select HREF position
+ * 0=normal, HREF is matched to YUV output port,
+ * 1=HREF is matched to CVBS input port */
+#define SAA7191_CTL4_HRFS       0x04
+/* vertical noise reduction
+ * 0=normal, 1=searching window, 2=auto-deflection, 3=reduction bypassed */
+#define SAA7191_CTL4_VNOI_MASK  0x03
+#define SAA7191_CTL4_VNOI_SHIFT 0
+#define SAA7191_CTL4_VNOI_3     0x03
+#define SAA7191_CTL4_VNOI_2     0x02
+#define SAA7191_CTL4_VNOI_1     0x01
+#define SAA7191_CTL4_VNOI_0     0x00
 
 /* Chrominance Gain Control Register definitions
- * (nominal value for UV CCIR level) */
+ * - for QAM-modulated input signals, effects output amplitude
+ * (SECAM gain fixed)
+ * (nominal values for UV CCIR level) */
 #define SAA7191_CHCV_NTSC       0x2c
 #define SAA7191_CHCV_PAL        0x59
 
@@ -99,16 +180,13 @@
 #define SAA7191_NORM_PAL        1
 #define SAA7191_NORM_NTSC       2
 #define SAA7191_NORM_SECAM      3
-
-#define SAA7191_VALUE_ENABLED           1
-#define SAA7191_VALUE_DISABLED          0
-#define SAA7191_VALUE_UNCHANGED         -1
+#define SAA7191_NORM_AUTO_EXT   4       /* extended auto-detection */
 
 struct saa7191_status {
-        /* 0=no signal, 1=signal active*/
+        /* 0=no signal, 1=signal detected */
         int signal;
         /* 0=50hz (pal) signal, 1=60hz (ntsc) signal */
-        int ntsc;
+        int signal_60hz;
         /* 0=no color detected, 1=color detected */
         int color;
 
@@ -118,22 +196,60 @@ struct saa7191_status {
         int norm;
 };
 
-#define SAA7191_HUE_MIN         0x00
-#define SAA7191_HUE_MAX         0xff
-#define SAA7191_HUE_DEFAULT     0x80
+#define SAA7191_BANDPASS_MIN            0x00
+#define SAA7191_BANDPASS_MAX            0x03
+#define SAA7191_BANDPASS_DEFAULT        0x00
+
+#define SAA7191_BANDPASS_WEIGHT_MIN     0x00
+#define SAA7191_BANDPASS_WEIGHT_MAX     0x03
+#define SAA7191_BANDPASS_WEIGHT_DEFAULT 0x01
+
+#define SAA7191_CORING_MIN              0x00
+#define SAA7191_CORING_MAX              0x03
+#define SAA7191_CORING_DEFAULT          0x00
+
+#define SAA7191_HUE_MIN                 0x00
+#define SAA7191_HUE_MAX                 0xff
+#define SAA7191_HUE_DEFAULT             0x80
+
+#define SAA7191_VTRC_MIN                0x00
+#define SAA7191_VTRC_MAX                0x01
+#define SAA7191_VTRC_DEFAULT            0x00
+
+#define SAA7191_FORCE_COLOUR_MIN        0x00
+#define SAA7191_FORCE_COLOUR_MAX        0x01
+#define SAA7191_FORCE_COLOUR_DEFAULT    0x00
+
+#define SAA7191_CHROMA_GAIN_MIN         0x00
+#define SAA7191_CHROMA_GAIN_MAX         0x03
+#define SAA7191_CHROMA_GAIN_DEFAULT     0x00
+
+#define SAA7191_LUMA_DELAY_MIN          -0x04
+#define SAA7191_LUMA_DELAY_MAX          0x03
+#define SAA7191_LUMA_DELAY_DEFAULT      0x01
+
+#define SAA7191_VNR_MIN                 0x00
+#define SAA7191_VNR_MAX                 0x03
+#define SAA7191_VNR_DEFAULT             0x00
 
-#define SAA7191_VTRC_MIN        0x00
-#define SAA7191_VTRC_MAX        0x01
-#define SAA7191_VTRC_DEFAULT    0x00
+#define SAA7191_CONTROL_BANDPASS        0
+#define SAA7191_CONTROL_BANDPASS_WEIGHT 1
+#define SAA7191_CONTROL_CORING          2
+#define SAA7191_CONTROL_FORCE_COLOUR    3       /* boolean */
+#define SAA7191_CONTROL_CHROMA_GAIN     4
+#define SAA7191_CONTROL_HUE             5
+#define SAA7191_CONTROL_VTRC            6       /* boolean */
+#define SAA7191_CONTROL_LUMA_DELAY      7
+#define SAA7191_CONTROL_VNR             8
 
 struct saa7191_control {
-        int hue;
-        int vtrc;
+        u8 type;
+        s32 value;
 };
 
 #define DECODER_SAA7191_GET_STATUS      _IOR('d', 195, struct saa7191_status)
 #define DECODER_SAA7191_SET_NORM        _IOW('d', 196, int)
-#define DECODER_SAA7191_GET_CONTROLS    _IOR('d', 197, struct saa7191_control)
-#define DECODER_SAA7191_SET_CONTROLS    _IOW('d', 198, struct saa7191_control)
+#define DECODER_SAA7191_GET_CONTROL     _IOR('d', 197, struct saa7191_control)
+#define DECODER_SAA7191_SET_CONTROL     _IOW('d', 198, struct saa7191_control)
 
 #endif
diff --git a/drivers/media/video/v4l1-compat.c b/drivers/media/video/v4l1-compat.c
index 59bb71381a1b..d679ca23ded7 100644
--- a/drivers/media/video/v4l1-compat.c
+++ b/drivers/media/video/v4l1-compat.c
@@ -1006,10 +1006,8 @@ v4l_compat_translate_ioctl(struct inode         *inode,
                 break;
         }
 
-        if (cap2)
-                kfree(cap2);
-        if (fmt2)
-                kfree(fmt2);
+        kfree(cap2);
+        kfree(fmt2);
         return err;
 }
 
diff --git a/drivers/media/video/videocodec.c b/drivers/media/video/videocodec.c
index c9d5f1a873cc..839db622040d 100644
--- a/drivers/media/video/videocodec.c
+++ b/drivers/media/video/videocodec.c
@@ -353,8 +353,7 @@ videocodec_build_table (void)
         dprintk(3, "videocodec_build table: %d entries, %d bytes\n", i,
                 size);
 
-        if (videocodec_buf)
-                kfree(videocodec_buf);
+        kfree(videocodec_buf);
         videocodec_buf = (char *) kmalloc(size, GFP_KERNEL);
 
         i = 0;
@@ -471,8 +470,7 @@ videocodec_exit (void)
 {
 #ifdef CONFIG_PROC_FS
         remove_proc_entry("videocodecs", NULL);
-        if (videocodec_buf)
-                kfree(videocodec_buf);
+        kfree(videocodec_buf);
 #endif
 }
 
diff --git a/drivers/media/video/videodev.c b/drivers/media/video/videodev.c
index 06df15f75de9..83c49f9610d0 100644
--- a/drivers/media/video/videodev.c
+++ b/drivers/media/video/videodev.c
@@ -215,8 +215,7 @@ video_usercopy(struct inode *inode, struct file *file,
         }
 
 out:
-        if (mbuf)
-                kfree(mbuf);
+        kfree(mbuf);
         return err;
 }
 
diff --git a/drivers/media/video/vino.c b/drivers/media/video/vino.c
index ed4394e854ab..71b28e9e0850 100644
--- a/drivers/media/video/vino.c
+++ b/drivers/media/video/vino.c
@@ -12,15 +12,11 @@
 
 /*
  * TODO:
- * - remove "hacks" from memory allocation code and implement nopage()
+ * - remove "mark pages reserved-hacks" from memory allocation code
+ *   and implement nopage()
  * - check decimation, calculating and reporting image size when
  *   using decimation
- * - check vino_acquire_input(), vino_set_input() and channel
- *   ownership handling
- * - report VINO error-interrupts via ioctls ?
- * - implement picture controls (all implemented?)
- * - use macros for boolean values (?)
- * - implement user mode buffers and overlay (?)
+ * - implement read(), user mode buffers and overlay (?)
  */
 
 #include <linux/init.h>
@@ -60,18 +56,16 @@
  * debug info.
  * Note that the debug output also slows down the driver significantly */
 // #define VINO_DEBUG
+// #define VINO_DEBUG_INT
 
-#define VINO_MODULE_VERSION "0.0.3"
-#define VINO_VERSION_CODE KERNEL_VERSION(0, 0, 3)
+#define VINO_MODULE_VERSION "0.0.5"
+#define VINO_VERSION_CODE KERNEL_VERSION(0, 0, 5)
 
 MODULE_DESCRIPTION("SGI VINO Video4Linux2 driver");
 MODULE_VERSION(VINO_MODULE_VERSION);
 MODULE_AUTHOR("Mikael Nousiainen <tmnousia@cc.hut.fi>");
 MODULE_LICENSE("GPL");
 
-#define mem_map_reserve(p) set_bit(PG_reserved, &((p)->flags))
-#define mem_map_unreserve(p) clear_bit(PG_reserved, &((p)->flags))
-
 #ifdef VINO_DEBUG
 #define dprintk(x...) printk("VINO: " x);
 #else
@@ -91,15 +85,16 @@ MODULE_LICENSE("GPL");
 #define VINO_MIN_HEIGHT                 32
 
 #define VINO_CLIPPING_START_ODD_D1      1
-#define VINO_CLIPPING_START_ODD_PAL     1
-#define VINO_CLIPPING_START_ODD_NTSC    1
+#define VINO_CLIPPING_START_ODD_PAL     15
+#define VINO_CLIPPING_START_ODD_NTSC    12
 
 #define VINO_CLIPPING_START_EVEN_D1     2
-#define VINO_CLIPPING_START_EVEN_PAL    2
-#define VINO_CLIPPING_START_EVEN_NTSC   2
+#define VINO_CLIPPING_START_EVEN_PAL    15
+#define VINO_CLIPPING_START_EVEN_NTSC   12
 
 #define VINO_INPUT_CHANNEL_COUNT        3
 
+/* the number is the index for vino_inputs */
 #define VINO_INPUT_NONE                 -1
 #define VINO_INPUT_COMPOSITE            0
 #define VINO_INPUT_SVIDEO               1
@@ -107,15 +102,13 @@ MODULE_LICENSE("GPL");
 
 #define VINO_PAGE_RATIO                 (PAGE_SIZE / VINO_PAGE_SIZE)
 
-#define VINO_FIFO_THRESHOLD_DEFAULT     512
+#define VINO_FIFO_THRESHOLD_DEFAULT     16
 
-/*#define VINO_FRAMEBUFFER_SIZE         (VINO_PAL_WIDTH * VINO_PAL_HEIGHT * 4 \
-  + 2 * PAGE_SIZE)*/
 #define VINO_FRAMEBUFFER_SIZE           ((VINO_PAL_WIDTH \
                                           * VINO_PAL_HEIGHT * 4 \
                                           + 3 * PAGE_SIZE) & ~(PAGE_SIZE - 1))
 
-#define VINO_FRAMEBUFFER_MAX_COUNT      8
+#define VINO_FRAMEBUFFER_COUNT_MAX      8
 
 #define VINO_FRAMEBUFFER_UNUSED         0
 #define VINO_FRAMEBUFFER_IN_USE         1
@@ -131,24 +124,27 @@ MODULE_LICENSE("GPL");
 #define VINO_DUMMY_DESC_COUNT           4
 #define VINO_DESC_FETCH_DELAY           5       /* microseconds */
 
+#define VINO_MAX_FRAME_SKIP_COUNT       128
+
 /* the number is the index for vino_data_formats */
 #define VINO_DATA_FMT_NONE              -1
 #define VINO_DATA_FMT_GREY              0
 #define VINO_DATA_FMT_RGB332            1
 #define VINO_DATA_FMT_RGB32             2
 #define VINO_DATA_FMT_YUV               3
-//#define VINO_DATA_FMT_RGB24           4
 
 #define VINO_DATA_FMT_COUNT             4
 
+/* the number is the index for vino_data_norms */
 #define VINO_DATA_NORM_NONE             -1
 #define VINO_DATA_NORM_NTSC             0
 #define VINO_DATA_NORM_PAL              1
 #define VINO_DATA_NORM_SECAM            2
 #define VINO_DATA_NORM_D1               3
-/* The following is a special entry that can be used to
+/* The following are special entries that can be used to
  * autodetect the norm. */
-#define VINO_DATA_NORM_AUTO             0xff
+#define VINO_DATA_NORM_AUTO             0xfe
+#define VINO_DATA_NORM_AUTO_EXT         0xff
 
 #define VINO_DATA_NORM_COUNT            4
 
@@ -232,7 +228,7 @@ struct vino_framebuffer_fifo {
         unsigned int head;
         unsigned int tail;
 
-        unsigned int data[VINO_FRAMEBUFFER_MAX_COUNT];
+        unsigned int data[VINO_FRAMEBUFFER_COUNT_MAX];
 };
 
 struct vino_framebuffer_queue {
@@ -246,13 +242,20 @@ struct vino_framebuffer_queue {
         struct vino_framebuffer_fifo in;
         struct vino_framebuffer_fifo out;
 
-        struct vino_framebuffer *buffer[VINO_FRAMEBUFFER_MAX_COUNT];
+        struct vino_framebuffer *buffer[VINO_FRAMEBUFFER_COUNT_MAX];
 
         spinlock_t queue_lock;
         struct semaphore queue_sem;
         wait_queue_head_t frame_wait_queue;
 };
 
+struct vino_interrupt_data {
+        struct timeval timestamp;
+        unsigned int frame_counter;
+        unsigned int skip_count;
+        unsigned int skip;
+};
+
 struct vino_channel_settings {
         unsigned int channel;
 
@@ -285,6 +288,8 @@ struct vino_channel_settings {
 
         unsigned int users;
 
+        struct vino_interrupt_data int_data;
+
         /* V4L support */
         struct video_device *v4l_device;
 };
@@ -315,7 +320,7 @@ struct vino_settings {
 /* Module parameters */
 
 /*
- * Using vino_pixel_conversion the ARGB32-format pixels supplied
+ * Using vino_pixel_conversion the ABGR32-format pixels supplied
  * by the VINO chip can be converted to more common formats
  * like RGBA32 (or probably RGB24 in the future). This way we
  * can give out data that can be specified correctly with
@@ -329,7 +334,9 @@ struct vino_settings {
  * Use non-zero value to enable conversion.
  */
 static int vino_pixel_conversion = 0;
+
 module_param_named(pixelconv, vino_pixel_conversion, int, 0);
+
 MODULE_PARM_DESC(pixelconv,
                  "enable pixel conversion (non-zero value enables)");
 
@@ -345,15 +352,22 @@ static const char *vino_bus_name = "GIO64 bus";
 static const char *vino_v4l_device_name_a = "SGI VINO Channel A";
 static const char *vino_v4l_device_name_b = "SGI VINO Channel B";
 
+static void vino_capture_tasklet(unsigned long channel);
+
+DECLARE_TASKLET(vino_tasklet_a, vino_capture_tasklet, VINO_CHANNEL_A);
+DECLARE_TASKLET(vino_tasklet_b, vino_capture_tasklet, VINO_CHANNEL_B);
+
 static const struct vino_input vino_inputs[] = {
         {
                 .name           = "Composite",
-                .std            = V4L2_STD_NTSC | V4L2_STD_PAL | V4L2_STD_SECAM,
+                .std            = V4L2_STD_NTSC | V4L2_STD_PAL
+                | V4L2_STD_SECAM,
         },{
                 .name           = "S-Video",
-                .std            = V4L2_STD_NTSC | V4L2_STD_PAL | V4L2_STD_SECAM,
+                .std            = V4L2_STD_NTSC | V4L2_STD_PAL
+                | V4L2_STD_SECAM,
         },{
-                .name           = "D1 (IndyCam)",
+                .name           = "D1/IndyCam",
                 .std            = V4L2_STD_NTSC,
         }
 };
@@ -376,15 +390,10 @@ static const struct vino_data_format vino_data_formats[] = {
                 .colorspace     = V4L2_COLORSPACE_SRGB,
         },{
                 .description    = "YUV 4:2:2",
-                .bpp            = 4,
+                .bpp            = 2,
                 .pixelformat    = V4L2_PIX_FMT_YUYV, // XXX: swapped?
                 .colorspace     = V4L2_COLORSPACE_SMPTE170M,
-        }/*,{
-                .description    = "24-bit RGB",
-                .bpp            = 3,
-                .pixelformat    = V4L2_PIX_FMT_RGB24,
-                .colorspace     = V4L2_COLORSPACE_SRGB,
-                }*/
+        }
 };
 
 static const struct vino_data_norm vino_data_norms[] = {
@@ -397,18 +406,18 @@ static const struct vino_data_norm vino_data_norms[] = {
                 .width          = VINO_NTSC_WIDTH,
                 .height         = VINO_NTSC_HEIGHT,
                 .odd            = {
-                        .top    = VINO_CLIPPING_START_ODD_NTSC,
-                        .left   = 0,
+                        .top    = VINO_CLIPPING_START_ODD_NTSC,
+                        .left   = 0,
                         .bottom = VINO_CLIPPING_START_ODD_NTSC
                         + VINO_NTSC_HEIGHT / 2 - 1,
-                        .right  = VINO_NTSC_WIDTH,
+                        .right  = VINO_NTSC_WIDTH,
                 },
                 .even           = {
-                        .top    = VINO_CLIPPING_START_EVEN_NTSC,
-                        .left   = 0,
+                        .top    = VINO_CLIPPING_START_EVEN_NTSC,
+                        .left   = 0,
                         .bottom = VINO_CLIPPING_START_EVEN_NTSC
                         + VINO_NTSC_HEIGHT / 2 - 1,
-                        .right  = VINO_NTSC_WIDTH,
+                        .right  = VINO_NTSC_WIDTH,
                 },
         },{
                 .description    = "PAL",
@@ -419,18 +428,18 @@ static const struct vino_data_norm vino_data_norms[] = {
                 .width          = VINO_PAL_WIDTH,
                 .height         = VINO_PAL_HEIGHT,
                 .odd            = {
-                        .top    = VINO_CLIPPING_START_ODD_PAL,
-                        .left   = 0,
+                        .top    = VINO_CLIPPING_START_ODD_PAL,
+                        .left   = 0,
                         .bottom = VINO_CLIPPING_START_ODD_PAL
                         + VINO_PAL_HEIGHT / 2 - 1,
-                        .right  = VINO_PAL_WIDTH,
+                        .right  = VINO_PAL_WIDTH,
                 },
                 .even           = {
-                        .top    = VINO_CLIPPING_START_EVEN_PAL,
-                        .left   = 0,
+                        .top    = VINO_CLIPPING_START_EVEN_PAL,
+                        .left   = 0,
                         .bottom = VINO_CLIPPING_START_EVEN_PAL
                         + VINO_PAL_HEIGHT / 2 - 1,
-                        .right  = VINO_PAL_WIDTH,
+                        .right  = VINO_PAL_WIDTH,
                 },
         },{
                 .description    = "SECAM",
@@ -441,21 +450,21 @@ static const struct vino_data_norm vino_data_norms[] = {
                 .width          = VINO_PAL_WIDTH,
                 .height         = VINO_PAL_HEIGHT,
                 .odd            = {
-                        .top    = VINO_CLIPPING_START_ODD_PAL,
-                        .left   = 0,
+                        .top    = VINO_CLIPPING_START_ODD_PAL,
+                        .left   = 0,
                         .bottom = VINO_CLIPPING_START_ODD_PAL
                         + VINO_PAL_HEIGHT / 2 - 1,
-                        .right  = VINO_PAL_WIDTH,
+                        .right  = VINO_PAL_WIDTH,
                 },
                 .even           = {
-                        .top    = VINO_CLIPPING_START_EVEN_PAL,
-                        .left   = 0,
+                        .top    = VINO_CLIPPING_START_EVEN_PAL,
+                        .left   = 0,
                         .bottom = VINO_CLIPPING_START_EVEN_PAL
                         + VINO_PAL_HEIGHT / 2 - 1,
-                        .right  = VINO_PAL_WIDTH,
+                        .right  = VINO_PAL_WIDTH,
                 },
         },{
-                .description    = "NTSC (D1 input)",
+                .description    = "NTSC/D1",
                 .std            = V4L2_STD_NTSC,
                 .fps_min        = 6,
                 .fps_max        = 30,
@@ -463,18 +472,18 @@ static const struct vino_data_norm vino_data_norms[] = {
                 .width          = VINO_NTSC_WIDTH,
                 .height         = VINO_NTSC_HEIGHT,
                 .odd            = {
-                        .top    = VINO_CLIPPING_START_ODD_D1,
-                        .left   = 0,
+                        .top    = VINO_CLIPPING_START_ODD_D1,
+                        .left   = 0,
                         .bottom = VINO_CLIPPING_START_ODD_D1
                         + VINO_NTSC_HEIGHT / 2 - 1,
-                        .right  = VINO_NTSC_WIDTH,
+                        .right  = VINO_NTSC_WIDTH,
                 },
                 .even           = {
-                        .top    = VINO_CLIPPING_START_EVEN_D1,
-                        .left   = 0,
+                        .top    = VINO_CLIPPING_START_EVEN_D1,
+                        .left   = 0,
                         .bottom = VINO_CLIPPING_START_EVEN_D1
                         + VINO_NTSC_HEIGHT / 2 - 1,
-                        .right  = VINO_NTSC_WIDTH,
+                        .right  = VINO_NTSC_WIDTH,
                 },
         }
 };
@@ -491,7 +500,7 @@ struct v4l2_queryctrl vino_indycam_v4l2_controls[] = {
                 .step = 1,
                 .default_value = INDYCAM_AGC_DEFAULT,
                 .flags = 0,
-                .reserved = { 0, 0 },
+                .reserved = { INDYCAM_CONTROL_AGC, 0 },
         },{
                 .id = V4L2_CID_AUTO_WHITE_BALANCE,
                 .type = V4L2_CTRL_TYPE_BOOLEAN,
@@ -501,7 +510,7 @@ struct v4l2_queryctrl vino_indycam_v4l2_controls[] = {
                 .step = 1,
                 .default_value = INDYCAM_AWB_DEFAULT,
                 .flags = 0,
-                .reserved = { 0, 0 },
+                .reserved = { INDYCAM_CONTROL_AWB, 0 },
         },{
                 .id = V4L2_CID_GAIN,
                 .type = V4L2_CTRL_TYPE_INTEGER,
@@ -511,7 +520,7 @@ struct v4l2_queryctrl vino_indycam_v4l2_controls[] = {
                 .step = 1,
                 .default_value = INDYCAM_GAIN_DEFAULT,
                 .flags = 0,
-                .reserved = { 0, 0 },
+                .reserved = { INDYCAM_CONTROL_GAIN, 0 },
         },{
                 .id = V4L2_CID_PRIVATE_BASE,
                 .type = V4L2_CTRL_TYPE_INTEGER,
@@ -521,7 +530,7 @@ struct v4l2_queryctrl vino_indycam_v4l2_controls[] = {
                 .step = 1,
                 .default_value = INDYCAM_RED_SATURATION_DEFAULT,
                 .flags = 0,
-                .reserved = { 0, 0 },
+                .reserved = { INDYCAM_CONTROL_RED_SATURATION, 0 },
         },{
                 .id = V4L2_CID_PRIVATE_BASE + 1,
                 .type = V4L2_CTRL_TYPE_INTEGER,
@@ -531,7 +540,7 @@ struct v4l2_queryctrl vino_indycam_v4l2_controls[] = {
                 .step = 1,
                 .default_value = INDYCAM_BLUE_SATURATION_DEFAULT,
                 .flags = 0,
-                .reserved = { 0, 0 },
+                .reserved = { INDYCAM_CONTROL_BLUE_SATURATION, 0 },
         },{
                 .id = V4L2_CID_RED_BALANCE,
                 .type = V4L2_CTRL_TYPE_INTEGER,
@@ -541,7 +550,7 @@ struct v4l2_queryctrl vino_indycam_v4l2_controls[] = {
                 .step = 1,
                 .default_value = INDYCAM_RED_BALANCE_DEFAULT,
                 .flags = 0,
-                .reserved = { 0, 0 },
+                .reserved = { INDYCAM_CONTROL_RED_BALANCE, 0 },
         },{
                 .id = V4L2_CID_BLUE_BALANCE,
                 .type = V4L2_CTRL_TYPE_INTEGER,
@@ -551,7 +560,7 @@ struct v4l2_queryctrl vino_indycam_v4l2_controls[] = {
                 .step = 1,
                 .default_value = INDYCAM_BLUE_BALANCE_DEFAULT,
                 .flags = 0,
-                .reserved = { 0, 0 },
+                .reserved = { INDYCAM_CONTROL_BLUE_BALANCE, 0 },
         },{
                 .id = V4L2_CID_EXPOSURE,
                 .type = V4L2_CTRL_TYPE_INTEGER,
@@ -561,7 +570,7 @@ struct v4l2_queryctrl vino_indycam_v4l2_controls[] = {
                 .step = 1,
                 .default_value = INDYCAM_SHUTTER_DEFAULT,
                 .flags = 0,
-                .reserved = { 0, 0 },
+                .reserved = { INDYCAM_CONTROL_SHUTTER, 0 },
         },{
                 .id = V4L2_CID_GAMMA,
                 .type = V4L2_CTRL_TYPE_INTEGER,
@@ -571,11 +580,11 @@ struct v4l2_queryctrl vino_indycam_v4l2_controls[] = {
                 .step = 1,
                 .default_value = INDYCAM_GAMMA_DEFAULT,
                 .flags = 0,
-                .reserved = { 0, 0 },
+                .reserved = { INDYCAM_CONTROL_GAMMA, 0 },
         }
 };
 
-#define VINO_SAA7191_V4L2_CONTROL_COUNT         2
+#define VINO_SAA7191_V4L2_CONTROL_COUNT         9
 
 struct v4l2_queryctrl vino_saa7191_v4l2_controls[] = {
         {
@@ -587,9 +596,59 @@ struct v4l2_queryctrl vino_saa7191_v4l2_controls[] = {
                 .step = 1,
                 .default_value = SAA7191_HUE_DEFAULT,
                 .flags = 0,
-                .reserved = { 0, 0 },
+                .reserved = { SAA7191_CONTROL_HUE, 0 },
         },{
                 .id = V4L2_CID_PRIVATE_BASE,
+                .type = V4L2_CTRL_TYPE_INTEGER,
+                .name = "Luminance Bandpass",
+                .minimum = SAA7191_BANDPASS_MIN,
+                .maximum = SAA7191_BANDPASS_MAX,
+                .step = 1,
+                .default_value = SAA7191_BANDPASS_DEFAULT,
+                .flags = 0,
+                .reserved = { SAA7191_CONTROL_BANDPASS, 0 },
+        },{
+                .id = V4L2_CID_PRIVATE_BASE + 1,
+                .type = V4L2_CTRL_TYPE_INTEGER,
+                .name = "Luminance Bandpass Weight",
+                .minimum = SAA7191_BANDPASS_WEIGHT_MIN,
+                .maximum = SAA7191_BANDPASS_WEIGHT_MAX,
+                .step = 1,
+                .default_value = SAA7191_BANDPASS_WEIGHT_DEFAULT,
+                .flags = 0,
+                .reserved = { SAA7191_CONTROL_BANDPASS_WEIGHT, 0 },
+        },{
+                .id = V4L2_CID_PRIVATE_BASE + 2,
+                .type = V4L2_CTRL_TYPE_INTEGER,
+                .name = "HF Luminance Coring",
+                .minimum = SAA7191_CORING_MIN,
+                .maximum = SAA7191_CORING_MAX,
+                .step = 1,
+                .default_value = SAA7191_CORING_DEFAULT,
+                .flags = 0,
+                .reserved = { SAA7191_CONTROL_CORING, 0 },
+        },{
+                .id = V4L2_CID_PRIVATE_BASE + 3,
+                .type = V4L2_CTRL_TYPE_BOOLEAN,
+                .name = "Force Colour",
+                .minimum = SAA7191_FORCE_COLOUR_MIN,
+                .maximum = SAA7191_FORCE_COLOUR_MAX,
+                .step = 1,
+                .default_value = SAA7191_FORCE_COLOUR_DEFAULT,
+                .flags = 0,
+                .reserved = { SAA7191_CONTROL_FORCE_COLOUR, 0 },
+        },{
+                .id = V4L2_CID_PRIVATE_BASE + 4,
+                .type = V4L2_CTRL_TYPE_INTEGER,
+                .name = "Chrominance Gain Control",
+                .minimum = SAA7191_CHROMA_GAIN_MIN,
+                .maximum = SAA7191_CHROMA_GAIN_MAX,
+                .step = 1,
+                .default_value = SAA7191_CHROMA_GAIN_DEFAULT,
+                .flags = 0,
+                .reserved = { SAA7191_CONTROL_CHROMA_GAIN, 0 },
+        },{
+                .id = V4L2_CID_PRIVATE_BASE + 5,
                 .type = V4L2_CTRL_TYPE_BOOLEAN,
                 .name = "VTR Time Constant",
                 .minimum = SAA7191_VTRC_MIN,
@@ -597,7 +656,27 @@ struct v4l2_queryctrl vino_saa7191_v4l2_controls[] = {
                 .step = 1,
                 .default_value = SAA7191_VTRC_DEFAULT,
                 .flags = 0,
-                .reserved = { 0, 0 },
+                .reserved = { SAA7191_CONTROL_VTRC, 0 },
+        },{
+                .id = V4L2_CID_PRIVATE_BASE + 6,
+                .type = V4L2_CTRL_TYPE_INTEGER,
+                .name = "Luminance Delay Compensation",
+                .minimum = SAA7191_LUMA_DELAY_MIN,
+                .maximum = SAA7191_LUMA_DELAY_MAX,
+                .step = 1,
+                .default_value = SAA7191_LUMA_DELAY_DEFAULT,
+                .flags = 0,
+                .reserved = { SAA7191_CONTROL_LUMA_DELAY, 0 },
+        },{
+                .id = V4L2_CID_PRIVATE_BASE + 7,
+                .type = V4L2_CTRL_TYPE_INTEGER,
+                .name = "Vertical Noise Reduction",
+                .minimum = SAA7191_VNR_MIN,
+                .maximum = SAA7191_VNR_MAX,
+                .step = 1,
+                .default_value = SAA7191_VNR_DEFAULT,
+                .flags = 0,
+                .reserved = { SAA7191_CONTROL_VNR, 0 },
         }
 };
 
@@ -639,9 +718,10 @@ static struct i2c_algo_sgi_data i2c_sgi_vino_data =
  */
 static int i2c_vino_client_reg(struct i2c_client *client)
 {
+        unsigned long flags;
         int ret = 0;
 
-        spin_lock(&vino_drvdata->input_lock);
+        spin_lock_irqsave(&vino_drvdata->input_lock, flags);
         switch (client->driver->id) {
         case I2C_DRIVERID_SAA7191:
                 if (vino_drvdata->decoder.driver)
@@ -658,16 +738,17 @@ static int i2c_vino_client_reg(struct i2c_client *client)
         default:
                 ret = -ENODEV;
         }
-        spin_unlock(&vino_drvdata->input_lock);
+        spin_unlock_irqrestore(&vino_drvdata->input_lock, flags);
 
         return ret;
 }
 
 static int i2c_vino_client_unreg(struct i2c_client *client)
 {
+        unsigned long flags;
         int ret = 0;
 
-        spin_lock(&vino_drvdata->input_lock);
+        spin_lock_irqsave(&vino_drvdata->input_lock, flags);
         if (client == vino_drvdata->decoder.driver) {
                 if (vino_drvdata->decoder.owner != VINO_NO_CHANNEL)
                         ret = -EBUSY;
@@ -679,7 +760,7 @@ static int i2c_vino_client_unreg(struct i2c_client *client)
                 else
                         vino_drvdata->camera.driver = NULL;
         }
-        spin_unlock(&vino_drvdata->input_lock);
+        spin_unlock_irqrestore(&vino_drvdata->input_lock, flags);
 
         return ret;
 }
@@ -727,7 +808,7 @@ static void vino_free_buffer_with_count(struct vino_framebuffer *fb,
         dprintk("vino_free_buffer_with_count(): count = %d\n", count);
 
         for (i = 0; i < count; i++) {
-                mem_map_unreserve(virt_to_page(fb->desc_table.virtual[i]));
+                ClearPageReserved(virt_to_page(fb->desc_table.virtual[i]));
                 dma_unmap_single(NULL,
                                  fb->desc_table.dma_cpu[VINO_PAGE_RATIO * i],
                                  PAGE_SIZE, DMA_FROM_DEVICE);
@@ -805,7 +886,7 @@ static int vino_allocate_buffer(struct vino_framebuffer *fb,
                                 dma_data_addr + VINO_PAGE_SIZE * j;
                 }
 
-                mem_map_reserve(virt_to_page(fb->desc_table.virtual[i]));
+                SetPageReserved(virt_to_page(fb->desc_table.virtual[i]));
         }
 
         /* page_count needs to be set anyway, because the descriptor table has
@@ -892,7 +973,7 @@ static int vino_prepare_user_buffer(struct vino_framebuffer *fb,
                                 dma_data_addr + VINO_PAGE_SIZE * j;
                 }
 
-                mem_map_reserve(virt_to_page(fb->desc_table.virtual[i]));
+                SetPageReserved(virt_to_page(fb->desc_table.virtual[i]));
         }
 
         /* page_count needs to be set anyway, because the descriptor table has
@@ -933,7 +1014,7 @@ static void vino_sync_buffer(struct vino_framebuffer *fb)
 
 /* Framebuffer fifo functions (need to be locked externally) */
 
-static void vino_fifo_init(struct vino_framebuffer_fifo *f,
+static inline void vino_fifo_init(struct vino_framebuffer_fifo *f,
                            unsigned int length)
 {
         f->length = 0;
@@ -941,16 +1022,18 @@ static void vino_fifo_init(struct vino_framebuffer_fifo *f,
         f->head = 0;
         f->tail = 0;
 
-        if (length > VINO_FRAMEBUFFER_MAX_COUNT)
-                length = VINO_FRAMEBUFFER_MAX_COUNT;
+        if (length > VINO_FRAMEBUFFER_COUNT_MAX)
+                length = VINO_FRAMEBUFFER_COUNT_MAX;
 
         f->length = length;
 }
 
 /* returns true/false */
-static int vino_fifo_has_id(struct vino_framebuffer_fifo *f, unsigned int id)
+static inline int vino_fifo_has_id(struct vino_framebuffer_fifo *f,
+                                   unsigned int id)
 {
         unsigned int i;
+
         for (i = f->head; i == (f->tail - 1); i = (i + 1) % f->length) {
                 if (f->data[i] == id)
                         return 1;
@@ -959,13 +1042,15 @@ static int vino_fifo_has_id(struct vino_framebuffer_fifo *f, unsigned int id)
         return 0;
 }
 
+#if 0
 /* returns true/false */
-static int vino_fifo_full(struct vino_framebuffer_fifo *f)
+static inline int vino_fifo_full(struct vino_framebuffer_fifo *f)
 {
         return (f->used == f->length);
 }
+#endif
 
-static unsigned int vino_fifo_get_used(struct vino_framebuffer_fifo *f)
+static inline unsigned int vino_fifo_get_used(struct vino_framebuffer_fifo *f)
 {
         return f->used;
 }
@@ -1076,8 +1161,8 @@ static int vino_queue_init(struct vino_framebuffer_queue *q,
 
         down(&q->queue_sem);
 
-        if (*length > VINO_FRAMEBUFFER_MAX_COUNT)
-                *length = VINO_FRAMEBUFFER_MAX_COUNT;
+        if (*length > VINO_FRAMEBUFFER_COUNT_MAX)
+                *length = VINO_FRAMEBUFFER_COUNT_MAX;
 
         q->length = 0;
 
@@ -1313,6 +1398,7 @@ out:
         return ret;
 }
 
+#if 0
 static int vino_queue_get_total(struct vino_framebuffer_queue *q,
                                 unsigned int *total)
 {
@@ -1338,6 +1424,7 @@ out:
 
         return ret;
 }
+#endif
 
 static struct vino_framebuffer *vino_queue_peek(struct
                                                 vino_framebuffer_queue *q,
@@ -1471,12 +1558,14 @@ static void vino_update_line_size(struct vino_channel_settings *vcs)
 
         dprintk("update_line_size(): before: w = %d, d = %d, "
                 "line_size = %d\n", w, d, vcs->line_size);
+
         /* line size must be multiple of 8 bytes */
         lsize = (bpp * (w / d)) & ~7;
         w = (lsize / bpp) * d;
 
         vcs->clipping.right = vcs->clipping.left + w;
         vcs->line_size = lsize;
+
         dprintk("update_line_size(): after: w = %d, d = %d, "
                 "line_size = %d\n", w, d, vcs->line_size);
 }
@@ -1532,7 +1621,7 @@ static void vino_set_clipping(struct vino_channel_settings *vcs,
 }
 
 /* execute with input_lock locked */
-static void vino_set_default_clipping(struct vino_channel_settings *vcs)
+static inline void vino_set_default_clipping(struct vino_channel_settings *vcs)
 {
         vino_set_clipping(vcs, 0, 0, vino_data_norms[vcs->data_norm].width,
                           vino_data_norms[vcs->data_norm].height);
@@ -1556,8 +1645,7 @@ static void vino_set_scaling(struct vino_channel_settings *vcs,
 
         if (d < 1) {
                 d = 1;
-        }
-        if (d > 8) {
+        } else if (d > 8) {
                 d = 8;
         }
 
@@ -1570,7 +1658,7 @@ static void vino_set_scaling(struct vino_channel_settings *vcs,
 }
 
 /* execute with input_lock locked */
-static void vino_reset_scaling(struct vino_channel_settings *vcs)
+static inline void vino_set_default_scaling(struct vino_channel_settings *vcs)
 {
         vino_set_scaling(vcs, vcs->clipping.right - vcs->clipping.left,
                          vcs->clipping.bottom - vcs->clipping.top);
@@ -1649,7 +1737,8 @@ static void vino_set_framerate(struct vino_channel_settings *vcs,
 }
 
 /* execute with input_lock locked */
-static void vino_set_default_framerate(struct vino_channel_settings *vcs)
+static inline void vino_set_default_framerate(struct
+                                              vino_channel_settings *vcs)
 {
         vino_set_framerate(vcs, vino_data_norms[vcs->data_norm].fps_max);
 }
@@ -1687,6 +1776,9 @@ static int vino_dma_setup(struct vino_channel_settings *vcs,
          * should be more than enough time */
         udelay(VINO_DESC_FETCH_DELAY);
 
+        dprintk("vino_dma_setup(): start desc = %08x, next 4 desc = %08x\n",
+                ch->start_desc_tbl, ch->next_4_desc);
+
         /* set the alpha register */
         ch->alpha = vcs->alpha;
 
@@ -1700,9 +1792,6 @@ static int vino_dma_setup(struct vino_channel_settings *vcs,
                 VINO_CLIP_EVEN(norm->even.top +
                                vcs->clipping.bottom / 2 - 1) |
                 VINO_CLIP_X(vcs->clipping.right);
-        /* FIXME: end-of-field bug workaround
-                       VINO_CLIP_X(VINO_PAL_WIDTH);
-         */
 
         /* set the size of actual content in the buffer (DECIMATION !) */
         fb->data_size = ((vcs->clipping.right - vcs->clipping.left) /
@@ -1802,7 +1891,7 @@ static int vino_dma_setup(struct vino_channel_settings *vcs,
 }
 
 /* (execute only with vino_lock locked) */
-static void vino_dma_start(struct vino_channel_settings *vcs)
+static inline void vino_dma_start(struct vino_channel_settings *vcs)
 {
         u32 ctrl = vino->control;
 
@@ -1813,12 +1902,14 @@ static void vino_dma_start(struct vino_channel_settings *vcs)
 }
 
 /* (execute only with vino_lock locked) */
-static void vino_dma_stop(struct vino_channel_settings *vcs)
+static inline void vino_dma_stop(struct vino_channel_settings *vcs)
 {
         u32 ctrl = vino->control;
 
         ctrl &= (vcs->channel == VINO_CHANNEL_A) ?
                 ~VINO_CTRL_A_DMA_ENBL : ~VINO_CTRL_B_DMA_ENBL;
+        ctrl &= (vcs->channel == VINO_CHANNEL_A) ?
+                ~VINO_CTRL_A_INT : ~VINO_CTRL_B_INT;
         vino->control = ctrl;
         dprintk("vino_dma_stop():\n");
 }
@@ -1902,7 +1993,7 @@ static int vino_capture_next(struct vino_channel_settings *vcs, int start)
         struct vino_framebuffer *fb;
         unsigned int incoming, id;
         int err = 0;
-        unsigned long flags, flags2;
+        unsigned long flags;
 
         dprintk("vino_capture_next():\n");
 
@@ -1943,10 +2034,6 @@ static int vino_capture_next(struct vino_channel_settings *vcs, int start)
                 goto out;
         }
 
-        spin_lock_irqsave(&fb->state_lock, flags2);
-        fb->state = VINO_FRAMEBUFFER_UNUSED;
-        spin_unlock_irqrestore(&fb->state_lock, flags2);
-
         if (start) {
                 vcs->capturing = 1;
         }
@@ -1964,7 +2051,7 @@ out:
         return err;
 }
 
-static int vino_is_capturing(struct vino_channel_settings *vcs)
+static inline int vino_is_capturing(struct vino_channel_settings *vcs)
 {
         int ret;
         unsigned long flags;
@@ -2076,6 +2163,7 @@ static void vino_capture_stop(struct vino_channel_settings *vcs)
         dprintk("vino_capture_stop():\n");
 
         spin_lock_irqsave(&vcs->capture_lock, flags);
+
         /* unset capturing to stop queue processing */
         vcs->capturing = 0;
 
@@ -2121,6 +2209,7 @@ out:
         spin_unlock_irqrestore(&vcs->capture_lock, flags);
 }
 
+#if 0
 static int vino_capture_failed(struct vino_channel_settings *vcs)
 {
         struct vino_framebuffer *fb;
@@ -2165,9 +2254,31 @@ static int vino_capture_failed(struct vino_channel_settings *vcs)
 
         return 0;
 }
+#endif
+
+static void vino_skip_frame(struct vino_channel_settings *vcs)
+{
+        struct vino_framebuffer *fb;
+        unsigned long flags;
+        unsigned int id;
+
+        spin_lock_irqsave(&vcs->capture_lock, flags);
+        fb = vino_queue_peek(&vcs->fb_queue, &id);
+        if (!fb) {
+                spin_unlock_irqrestore(&vcs->capture_lock, flags);
+                dprintk("vino_skip_frame(): vino_queue_peek() failed!\n");
+                return;
+        }
+        spin_unlock_irqrestore(&vcs->capture_lock, flags);
+
+        spin_lock_irqsave(&fb->state_lock, flags);
+        fb->state = VINO_FRAMEBUFFER_UNUSED;
+        spin_unlock_irqrestore(&fb->state_lock, flags);
+
+        vino_capture_next(vcs, 0);
+}
 
-static void vino_frame_done(struct vino_channel_settings *vcs,
-                            unsigned int fc)
+static void vino_frame_done(struct vino_channel_settings *vcs)
 {
         struct vino_framebuffer *fb;
         unsigned long flags;
@@ -2181,8 +2292,9 @@ static void vino_frame_done(struct vino_channel_settings *vcs,
         }
         spin_unlock_irqrestore(&vcs->capture_lock, flags);
 
-        fb->frame_counter = fc;
-        do_gettimeofday(&fb->timestamp);
+        fb->frame_counter = vcs->int_data.frame_counter;
+        memcpy(&fb->timestamp, &vcs->int_data.timestamp,
+               sizeof(struct timeval));
 
         spin_lock_irqsave(&fb->state_lock, flags);
         if (fb->state == VINO_FRAMEBUFFER_IN_USE)
@@ -2194,72 +2306,175 @@ static void vino_frame_done(struct vino_channel_settings *vcs,
         vino_capture_next(vcs, 0);
 }
 
+static void vino_capture_tasklet(unsigned long channel) {
+        struct vino_channel_settings *vcs;
+
+        vcs = (channel == VINO_CHANNEL_A)
+                ? &vino_drvdata->a : &vino_drvdata->b;
+
+        if (vcs->int_data.skip)
+                vcs->int_data.skip_count++;
+
+        if (vcs->int_data.skip && (vcs->int_data.skip_count
+                                   <= VINO_MAX_FRAME_SKIP_COUNT)) {
+                vino_skip_frame(vcs);
+        } else {
+                vcs->int_data.skip_count = 0;
+                vino_frame_done(vcs);
+        }
+}
+
 static irqreturn_t vino_interrupt(int irq, void *dev_id, struct pt_regs *regs)
 {
-        u32 intr;
+        u32 ctrl, intr;
         unsigned int fc_a, fc_b;
-        int done_a = 0;
-        int done_b = 0;
+        int handled_a = 0, skip_a = 0, done_a = 0;
+        int handled_b = 0, skip_b = 0, done_b = 0;
+
+#ifdef VINO_DEBUG_INT
+        int loop = 0;
+        unsigned int line_count = vino->a.line_count,
+                page_index = vino->a.page_index,
+                field_counter = vino->a.field_counter,
+                start_desc_tbl = vino->a.start_desc_tbl,
+                next_4_desc = vino->a.next_4_desc;
+        unsigned int line_count_2,
+                page_index_2,
+                field_counter_2,
+                start_desc_tbl_2,
+                next_4_desc_2;
+#endif
 
         spin_lock(&vino_drvdata->vino_lock);
 
-        intr = vino->intr_status;
-        fc_a = vino->a.field_counter / 2;
-        fc_b = vino->b.field_counter / 2;
-
-        // TODO: handle error-interrupts in some special way ?
-
-        if (intr & VINO_INTSTAT_A) {
-                if (intr & VINO_INTSTAT_A_EOF) {
-                        vino_drvdata->a.field++;
-                        if (vino_drvdata->a.field > 1) {
+        while ((intr = vino->intr_status)) {
+                fc_a = vino->a.field_counter >> 1;
+                fc_b = vino->b.field_counter >> 1;
+
+                /* handle error-interrupts in some special way ?
+                 * --> skips frames */
+                if (intr & VINO_INTSTAT_A) {
+                        if (intr & VINO_INTSTAT_A_EOF) {
+                                vino_drvdata->a.field++;
+                                if (vino_drvdata->a.field > 1) {
+                                        vino_dma_stop(&vino_drvdata->a);
+                                        vino_clear_interrupt(&vino_drvdata->a);
+                                        vino_drvdata->a.field = 0;
+                                        done_a = 1;
+                                } else {
+                                        if (vino->a.page_index
+                                            != vino_drvdata->a.line_size) {
+                                                vino->a.line_count = 0;
+                                                vino->a.page_index =
+                                                        vino_drvdata->
+                                                        a.line_size;
+                                                vino->a.next_4_desc =
+                                                        vino->a.start_desc_tbl;
+                                        }
+                                }
+                                dprintk("channel A end-of-field "
+                                        "interrupt: %04x\n", intr);
+                        } else {
                                 vino_dma_stop(&vino_drvdata->a);
                                 vino_clear_interrupt(&vino_drvdata->a);
                                 vino_drvdata->a.field = 0;
-                                done_a = 1;
+                                skip_a = 1;
+                                dprintk("channel A error interrupt: %04x\n",
+                                        intr);
                         }
-                        dprintk("intr: channel A end-of-field interrupt: "
-                                "%04x\n", intr);
-                } else {
-                        vino_dma_stop(&vino_drvdata->a);
-                        vino_clear_interrupt(&vino_drvdata->a);
-                        done_a = 1;
-                        dprintk("channel A error interrupt: %04x\n", intr);
+
+#ifdef VINO_DEBUG_INT
+                        line_count_2 = vino->a.line_count;
+                        page_index_2 = vino->a.page_index;
+                        field_counter_2 = vino->a.field_counter;
+                        start_desc_tbl_2 = vino->a.start_desc_tbl;
+                        next_4_desc_2 = vino->a.next_4_desc;
+
+                        printk("intr = %04x, loop = %d, field = %d\n",
+                               intr, loop, vino_drvdata->a.field);
+                        printk("1- line count = %04d, page index = %04d, "
+                               "start = %08x, next = %08x\n"
+                               "   fieldc = %d, framec = %d\n",
+                               line_count, page_index, start_desc_tbl,
+                               next_4_desc, field_counter, fc_a);
+                        printk("12-line count = %04d, page index = %04d, "
+                               "   start = %08x, next = %08x\n",
+                               line_count_2, page_index_2, start_desc_tbl_2,
+                               next_4_desc_2);
+
+                        if (done_a)
+                                printk("\n");
+#endif
                 }
-        }
-        if (intr & VINO_INTSTAT_B) {
-                if (intr & VINO_INTSTAT_B_EOF) {
-                        vino_drvdata->b.field++;
-                        if (vino_drvdata->b.field > 1) {
+
+                if (intr & VINO_INTSTAT_B) {
+                        if (intr & VINO_INTSTAT_B_EOF) {
+                                vino_drvdata->b.field++;
+                                if (vino_drvdata->b.field > 1) {
+                                        vino_dma_stop(&vino_drvdata->b);
+                                        vino_clear_interrupt(&vino_drvdata->b);
+                                        vino_drvdata->b.field = 0;
+                                        done_b = 1;
+                                }
+                                dprintk("channel B end-of-field "
+                                        "interrupt: %04x\n", intr);
+                        } else {
                                 vino_dma_stop(&vino_drvdata->b);
                                 vino_clear_interrupt(&vino_drvdata->b);
                                 vino_drvdata->b.field = 0;
-                                done_b = 1;
+                                skip_b = 1;
+                                dprintk("channel B error interrupt: %04x\n",
+                                        intr);
                         }
-                        dprintk("intr: channel B end-of-field interrupt: "
-                                "%04x\n", intr);
-                } else {
-                        vino_dma_stop(&vino_drvdata->b);
-                        vino_clear_interrupt(&vino_drvdata->b);
-                        done_b = 1;
-                        dprintk("channel B error interrupt: %04x\n", intr);
                 }
-        }
 
-        /* always remember to clear interrupt status */
-        vino->intr_status = ~intr;
+                /* Always remember to clear interrupt status.
+                 * Disable VINO interrupts while we do this. */
+                ctrl = vino->control;
+                vino->control = ctrl & ~(VINO_CTRL_A_INT | VINO_CTRL_B_INT);
+                vino->intr_status = ~intr;
+                vino->control = ctrl;
 
-        spin_unlock(&vino_drvdata->vino_lock);
+                spin_unlock(&vino_drvdata->vino_lock);
 
-        if (done_a) {
-                vino_frame_done(&vino_drvdata->a, fc_a);
-                dprintk("channel A frame done, interrupt: %d\n", intr);
-        }
-        if (done_b) {
-                vino_frame_done(&vino_drvdata->b, fc_b);
-                dprintk("channel B frame done, interrupt: %d\n", intr);
+                if ((!handled_a) && (done_a || skip_a)) {
+                        if (!skip_a) {
+                                do_gettimeofday(&vino_drvdata->
+                                                a.int_data.timestamp);
+                                vino_drvdata->a.int_data.frame_counter = fc_a;
+                        }
+                        vino_drvdata->a.int_data.skip = skip_a;
+
+                        dprintk("channel A %s, interrupt: %d\n",
+                                skip_a ? "skipping frame" : "frame done",
+                                intr);
+                        tasklet_hi_schedule(&vino_tasklet_a);
+                        handled_a = 1;
+                }
+
+                if ((!handled_b) && (done_b || skip_b)) {
+                        if (!skip_b) {
+                                do_gettimeofday(&vino_drvdata->
+                                                b.int_data.timestamp);
+                                vino_drvdata->b.int_data.frame_counter = fc_b;
+                        }
+                        vino_drvdata->b.int_data.skip = skip_b;
+
+                        dprintk("channel B %s, interrupt: %d\n",
+                                skip_b ? "skipping frame" : "frame done",
+                                intr);
+                        tasklet_hi_schedule(&vino_tasklet_b);
+                        handled_b = 1;
+                }
+
+#ifdef VINO_DEBUG_INT
+                loop++;
+#endif
+                spin_lock(&vino_drvdata->vino_lock);
         }
 
+        spin_unlock(&vino_drvdata->vino_lock);
+
         return IRQ_HANDLED;
 }
 
@@ -2279,11 +2494,13 @@ static int vino_get_saa7191_input(int input)
         }
 }
 
-static int vino_get_saa7191_norm(int norm)
+static int vino_get_saa7191_norm(unsigned int data_norm)
 {
-        switch (norm) {
+        switch (data_norm) {
         case VINO_DATA_NORM_AUTO:
                 return SAA7191_NORM_AUTO;
+        case VINO_DATA_NORM_AUTO_EXT:
+                return SAA7191_NORM_AUTO_EXT;
         case VINO_DATA_NORM_PAL:
                 return SAA7191_NORM_PAL;
         case VINO_DATA_NORM_NTSC:
@@ -2297,6 +2514,57 @@ static int vino_get_saa7191_norm(int norm)
         }
 }
 
+static int vino_get_from_saa7191_norm(int saa7191_norm)
+{
+        switch (saa7191_norm) {
+        case SAA7191_NORM_PAL:
+                return VINO_DATA_NORM_PAL;
+        case SAA7191_NORM_NTSC:
+                return VINO_DATA_NORM_NTSC;
+        case SAA7191_NORM_SECAM:
+                return VINO_DATA_NORM_SECAM;
+        default:
+                printk(KERN_ERR "VINO: vino_get_from_saa7191_norm(): "
+                       "invalid norm!\n");
+                return VINO_DATA_NORM_NONE;
+        }
+}
+
+static int vino_saa7191_set_norm(unsigned int *data_norm)
+{
+        int saa7191_norm, new_data_norm;
+        int err = 0;
+
+        saa7191_norm = vino_get_saa7191_norm(*data_norm);
+
+        err = i2c_decoder_command(DECODER_SAA7191_SET_NORM,
+                                  &saa7191_norm);
+        if (err)
+                goto out;
+
+        if ((*data_norm == VINO_DATA_NORM_AUTO)
+            || (*data_norm == VINO_DATA_NORM_AUTO_EXT)) {
+                struct saa7191_status status;
+
+                err = i2c_decoder_command(DECODER_SAA7191_GET_STATUS,
+                                          &status);
+                if (err)
+                        goto out;
+
+                new_data_norm =
+                        vino_get_from_saa7191_norm(status.norm);
+                if (new_data_norm == VINO_DATA_NORM_NONE) {
+                        err = -EINVAL;
+                        goto out;
+                }
+
+                *data_norm = (unsigned int)new_data_norm;
+        }
+
+out:
+        return err;
+}
+
 /* execute with input_lock locked */
 static int vino_is_input_owner(struct vino_channel_settings *vcs)
 {
@@ -2313,11 +2581,12 @@ static int vino_is_input_owner(struct vino_channel_settings *vcs)
 
 static int vino_acquire_input(struct vino_channel_settings *vcs)
 {
+        unsigned long flags;
         int ret = 0;
 
         dprintk("vino_acquire_input():\n");
 
-        spin_lock(&vino_drvdata->input_lock);
+        spin_lock_irqsave(&vino_drvdata->input_lock, flags);
 
         /* First try D1 and then SAA7191 */
         if (vino_drvdata->camera.driver
@@ -2332,23 +2601,48 @@ static int vino_acquire_input(struct vino_channel_settings *vcs)
                 vcs->data_norm = VINO_DATA_NORM_D1;
         } else if (vino_drvdata->decoder.driver
                    && (vino_drvdata->decoder.owner == VINO_NO_CHANNEL)) {
+                int input, data_norm;
                 int saa7191_input;
-                int saa7191_norm;
 
                 if (i2c_use_client(vino_drvdata->decoder.driver)) {
                         ret = -ENODEV;
                         goto out;
                 }
 
-                vino_drvdata->decoder.owner = vcs->channel;
-                vcs->input = VINO_INPUT_COMPOSITE;
-                vcs->data_norm = VINO_DATA_NORM_PAL;
+                input = VINO_INPUT_COMPOSITE;
+
+                saa7191_input = vino_get_saa7191_input(input);
+                ret = i2c_decoder_command(DECODER_SET_INPUT,
+                                          &saa7191_input);
+                if (ret) {
+                        ret = -EINVAL;
+                        goto out;
+                }
+
+                spin_unlock_irqrestore(&vino_drvdata->input_lock, flags);
 
-                saa7191_input = vino_get_saa7191_input(vcs->input);
-                i2c_decoder_command(DECODER_SET_INPUT, &saa7191_input);
+                /* Don't hold spinlocks while auto-detecting norm
+                 * as it may take a while... */
 
-                saa7191_norm = vino_get_saa7191_norm(vcs->data_norm);
-                i2c_decoder_command(DECODER_SAA7191_SET_NORM, &saa7191_norm);
+                data_norm = VINO_DATA_NORM_AUTO_EXT;
+
+                ret = vino_saa7191_set_norm(&data_norm);
+                if ((ret == -EBUSY) || (ret == -EAGAIN)) {
+                        data_norm = VINO_DATA_NORM_PAL;
+                        ret = vino_saa7191_set_norm(&data_norm);
+                }
+
+                spin_lock_irqsave(&vino_drvdata->input_lock, flags);
+
+                if (ret) {
+                        ret = -EINVAL;
+                        goto out;
+                }
+
+                vino_drvdata->decoder.owner = vcs->channel;
+
+                vcs->input = input;
+                vcs->data_norm = data_norm;
         } else {
                 vcs->input = (vcs->channel == VINO_CHANNEL_A) ?
                         vino_drvdata->b.input : vino_drvdata->a.input;
@@ -2361,15 +2655,14 @@ static int vino_acquire_input(struct vino_channel_settings *vcs)
                 goto out;
         }
 
-        if (vino_is_input_owner(vcs)) {
-                vino_set_default_clipping(vcs);
-                vino_set_default_framerate(vcs);
-        }
+        vino_set_default_clipping(vcs);
+        vino_set_default_scaling(vcs);
+        vino_set_default_framerate(vcs);
 
         dprintk("vino_acquire_input(): %s\n", vino_inputs[vcs->input].name);
 
 out:
-        spin_unlock(&vino_drvdata->input_lock);
+        spin_unlock_irqrestore(&vino_drvdata->input_lock, flags);
 
         return ret;
 }
@@ -2378,16 +2671,17 @@ static int vino_set_input(struct vino_channel_settings *vcs, int input)
 {
         struct vino_channel_settings *vcs2 = (vcs->channel == VINO_CHANNEL_A) ?
                 &vino_drvdata->b : &vino_drvdata->a;
+        unsigned long flags;
         int ret = 0;
 
         dprintk("vino_set_input():\n");
 
-        spin_lock(&vino_drvdata->input_lock);
+        spin_lock_irqsave(&vino_drvdata->input_lock, flags);
 
         if (vcs->input == input)
                 goto out;
 
-        switch(input) {
+        switch (input) {
         case VINO_INPUT_COMPOSITE:
         case VINO_INPUT_SVIDEO:
                 if (!vino_drvdata->decoder.driver) {
@@ -2404,19 +2698,43 @@ static int vino_set_input(struct vino_channel_settings *vcs, int input)
                 }
 
                 if (vino_drvdata->decoder.owner == vcs->channel) {
+                        int data_norm;
                         int saa7191_input;
-                        int saa7191_norm;
 
-                        vcs->input = input;
-                        vcs->data_norm = VINO_DATA_NORM_PAL;
+                        saa7191_input = vino_get_saa7191_input(input);
+                        ret = i2c_decoder_command(DECODER_SET_INPUT,
+                                                  &saa7191_input);
+                        if (ret) {
+                                vino_drvdata->decoder.owner = VINO_NO_CHANNEL;
+                                ret = -EINVAL;
+                                goto out;
+                        }
+
+                        spin_unlock_irqrestore(&vino_drvdata->input_lock, flags);
+
+                        /* Don't hold spinlocks while auto-detecting norm
+                         * as it may take a while... */
+
+                        data_norm = VINO_DATA_NORM_AUTO_EXT;
+
+                        ret = vino_saa7191_set_norm(&data_norm);
+                        if ((ret  == -EBUSY) || (ret == -EAGAIN)) {
+                                data_norm = VINO_DATA_NORM_PAL;
+                                ret = vino_saa7191_set_norm(&data_norm);
+                        }
 
-                        saa7191_input = vino_get_saa7191_input(vcs->input);
-                        i2c_decoder_command(DECODER_SET_INPUT, &saa7191_input);
-                        saa7191_norm = vino_get_saa7191_norm(vcs->data_norm);
-                        i2c_decoder_command(DECODER_SAA7191_SET_NORM,
-                                            &saa7191_norm);
+                        spin_lock_irqsave(&vino_drvdata->input_lock, flags);
+
+                        if (ret) {
+                                vino_drvdata->decoder.owner = VINO_NO_CHANNEL;
+                                ret = -EINVAL;
+                                goto out;
+                        }
+
+                        vcs->input = input;
+                        vcs->data_norm = data_norm;
                 } else {
-                        if (vcs2->input != input) {
+                        if (input != vcs2->input) {
                                 ret = -EBUSY;
                                 goto out;
                         }
@@ -2471,12 +2789,13 @@ static int vino_set_input(struct vino_channel_settings *vcs, int input)
         }
 
         vino_set_default_clipping(vcs);
+        vino_set_default_scaling(vcs);
         vino_set_default_framerate(vcs);
 
         dprintk("vino_set_input(): %s\n", vino_inputs[vcs->input].name);
 
 out:
-        spin_unlock(&vino_drvdata->input_lock);
+        spin_unlock_irqrestore(&vino_drvdata->input_lock, flags);
 
         return ret;
 }
@@ -2485,10 +2804,11 @@ static void vino_release_input(struct vino_channel_settings *vcs)
 {
         struct vino_channel_settings *vcs2 = (vcs->channel == VINO_CHANNEL_A) ?
                 &vino_drvdata->b : &vino_drvdata->a;
+        unsigned long flags;
 
         dprintk("vino_release_input():\n");
 
-        spin_lock(&vino_drvdata->input_lock);
+        spin_lock_irqsave(&vino_drvdata->input_lock, flags);
 
         /* Release ownership of the channel
          * and if the other channel takes input from
@@ -2511,34 +2831,61 @@ static void vino_release_input(struct vino_channel_settings *vcs)
         }
         vcs->input = VINO_INPUT_NONE;
 
-        spin_unlock(&vino_drvdata->input_lock);
+        spin_unlock_irqrestore(&vino_drvdata->input_lock, flags);
 }
 
 /* execute with input_lock locked */
 static int vino_set_data_norm(struct vino_channel_settings *vcs,
-                              unsigned int data_norm)
+                              unsigned int data_norm,
+                              unsigned long *flags)
 {
-        int saa7191_norm;
+        int err = 0;
+
+        if (data_norm == vcs->data_norm)
+                return 0;
 
         switch (vcs->input) {
         case VINO_INPUT_D1:
                 /* only one "norm" supported */
-                if (data_norm != VINO_DATA_NORM_D1)
+                if ((data_norm != VINO_DATA_NORM_D1)
+                    && (data_norm != VINO_DATA_NORM_AUTO)
+                    && (data_norm != VINO_DATA_NORM_AUTO_EXT))
                         return -EINVAL;
                 break;
         case VINO_INPUT_COMPOSITE:
-        case VINO_INPUT_SVIDEO:
+        case VINO_INPUT_SVIDEO: {
+                if ((data_norm != VINO_DATA_NORM_PAL)
+                    && (data_norm != VINO_DATA_NORM_NTSC)
+                    && (data_norm != VINO_DATA_NORM_SECAM)
+                    && (data_norm != VINO_DATA_NORM_AUTO)
+                    && (data_norm != VINO_DATA_NORM_AUTO_EXT))
+                        return -EINVAL;
 
-                saa7191_norm = vino_get_saa7191_norm(data_norm);
+                spin_unlock_irqrestore(&vino_drvdata->input_lock, *flags);
+
+                /* Don't hold spinlocks while setting norm
+                 * as it may take a while... */
+
+                err = vino_saa7191_set_norm(&data_norm);
+
+                spin_lock_irqsave(&vino_drvdata->input_lock, *flags);
+
+                if (err)
+                        goto out;
 
-                i2c_decoder_command(DECODER_SAA7191_SET_NORM, &saa7191_norm);
                 vcs->data_norm = data_norm;
+
+                vino_set_default_clipping(vcs);
+                vino_set_default_scaling(vcs);
+                vino_set_default_framerate(vcs);
                 break;
+        }
         default:
                 return -EINVAL;
         }
 
-        return 0;
+out:
+        return err;
 }
 
 /* V4L2 helper functions */
@@ -2558,8 +2905,9 @@ static int vino_find_data_format(__u32 pixelformat)
 static int vino_enum_data_norm(struct vino_channel_settings *vcs, __u32 index)
 {
         int data_norm = VINO_DATA_NORM_NONE;
+        unsigned long flags;
 
-        spin_lock(&vino_drvdata->input_lock);
+        spin_lock_irqsave(&vino_drvdata->input_lock, flags);
         switch(vcs->input) {
         case VINO_INPUT_COMPOSITE:
         case VINO_INPUT_SVIDEO:
@@ -2577,7 +2925,7 @@ static int vino_enum_data_norm(struct vino_channel_settings *vcs, __u32 index)
                 }
                 break;
         }
-        spin_unlock(&vino_drvdata->input_lock);
+        spin_unlock_irqrestore(&vino_drvdata->input_lock, flags);
 
         return data_norm;
 }
@@ -2585,8 +2933,9 @@ static int vino_enum_data_norm(struct vino_channel_settings *vcs, __u32 index)
 static int vino_enum_input(struct vino_channel_settings *vcs, __u32 index)
 {
         int input = VINO_INPUT_NONE;
+        unsigned long flags;
 
-        spin_lock(&vino_drvdata->input_lock);
+        spin_lock_irqsave(&vino_drvdata->input_lock, flags);
         if (vino_drvdata->decoder.driver && vino_drvdata->camera.driver) {
                 switch (index) {
                 case 0:
@@ -2615,7 +2964,7 @@ static int vino_enum_input(struct vino_channel_settings *vcs, __u32 index)
                         break;
                 }
         }
-        spin_unlock(&vino_drvdata->input_lock);
+        spin_unlock_irqrestore(&vino_drvdata->input_lock, flags);
 
         return input;
 }
@@ -2704,15 +3053,16 @@ static int vino_v4l2_enuminput(struct vino_channel_settings *vcs,
 }
 
 static int vino_v4l2_g_input(struct vino_channel_settings *vcs,
-                             struct v4l2_input *i)
+                             unsigned int *i)
 {
         __u32 index;
         int input;
+        unsigned long flags;
 
-        spin_lock(&vino_drvdata->input_lock);
+        spin_lock_irqsave(&vino_drvdata->input_lock, flags);
         input = vcs->input;
         index = vino_find_input_index(vcs);
-        spin_unlock(&vino_drvdata->input_lock);
+        spin_unlock_irqrestore(&vino_drvdata->input_lock, flags);
 
         dprintk("input = %d\n", input);
 
@@ -2720,23 +3070,18 @@ static int vino_v4l2_g_input(struct vino_channel_settings *vcs,
                 return -EINVAL;
         }
 
-        memset(i, 0, sizeof(struct v4l2_input));
-
-        i->index = index;
-        i->type = V4L2_INPUT_TYPE_CAMERA;
-        i->std = vino_inputs[input].std;
-        strcpy(i->name, vino_inputs[input].name);
+        *i = index;
 
         return 0;
 }
 
 static int vino_v4l2_s_input(struct vino_channel_settings *vcs,
-                             struct v4l2_input *i)
+                             unsigned int *i)
 {
         int input;
-        dprintk("requested input = %d\n", i->index);
+        dprintk("requested input = %d\n", *i);
 
-        input = vino_enum_input(vcs, i->index);
+        input = vino_enum_input(vcs, *i);
         if (input == VINO_INPUT_NONE)
                 return -EINVAL;
 
@@ -2747,7 +3092,9 @@ static int vino_v4l2_enumstd(struct vino_channel_settings *vcs,
                              struct v4l2_standard *s)
 {
         int index = s->index;
-        int data_norm = vino_enum_data_norm(vcs, index);
+        int data_norm;
+
+        data_norm = vino_enum_data_norm(vcs, index);
         dprintk("standard index = %d\n", index);
 
         if (data_norm == VINO_DATA_NORM_NONE)
@@ -2771,13 +3118,55 @@ static int vino_v4l2_enumstd(struct vino_channel_settings *vcs,
         return 0;
 }
 
+static int vino_v4l2_querystd(struct vino_channel_settings *vcs,
+                              v4l2_std_id *std)
+{
+        unsigned long flags;
+        int err = 0;
+
+        spin_lock_irqsave(&vino_drvdata->input_lock, flags);
+
+        switch (vcs->input) {
+        case VINO_INPUT_D1:
+                *std = vino_inputs[vcs->input].std;
+                break;
+        case VINO_INPUT_COMPOSITE:
+        case VINO_INPUT_SVIDEO: {
+                struct saa7191_status status;
+
+                i2c_decoder_command(DECODER_SAA7191_GET_STATUS, &status);
+
+                if (status.signal) {
+                        if (status.signal_60hz) {
+                                *std = V4L2_STD_NTSC;
+                        } else {
+                                *std = V4L2_STD_PAL | V4L2_STD_SECAM;
+                        }
+                } else {
+                        *std = vino_inputs[vcs->input].std;
+                }
+                break;
+        }
+        default:
+                err = -EINVAL;
+        }
+
+        spin_unlock_irqrestore(&vino_drvdata->input_lock, flags);
+
+        return err;
+}
+
 static int vino_v4l2_g_std(struct vino_channel_settings *vcs,
                            v4l2_std_id *std)
 {
-        spin_lock(&vino_drvdata->input_lock);
-        dprintk("current standard = %d\n", vcs->data_norm);
+        unsigned long flags;
+
+        spin_lock_irqsave(&vino_drvdata->input_lock, flags);
+
         *std = vino_data_norms[vcs->data_norm].std;
-        spin_unlock(&vino_drvdata->input_lock);
+        dprintk("current standard = %d\n", vcs->data_norm);
+
+        spin_unlock_irqrestore(&vino_drvdata->input_lock, flags);
 
         return 0;
 }
@@ -2785,13 +3174,18 @@ static int vino_v4l2_g_std(struct vino_channel_settings *vcs,
 static int vino_v4l2_s_std(struct vino_channel_settings *vcs,
                            v4l2_std_id *std)
 {
+        unsigned long flags;
         int ret = 0;
 
-        spin_lock(&vino_drvdata->input_lock);
+        spin_lock_irqsave(&vino_drvdata->input_lock, flags);
+
+        if (!vino_is_input_owner(vcs)) {
+                ret = -EBUSY;
+                goto out;
+        }
 
         /* check if the standard is valid for the current input */
-        if (vino_is_input_owner(vcs)
-            && (vino_inputs[vcs->input].std & (*std))) {
+        if ((*std) & vino_inputs[vcs->input].std) {
                 dprintk("standard accepted\n");
 
                 /* change the video norm for SAA7191
@@ -2800,24 +3194,33 @@ static int vino_v4l2_s_std(struct vino_channel_settings *vcs,
                 if (vcs->input == VINO_INPUT_D1)
                         goto out;
 
-                if ((*std) & V4L2_STD_PAL) {
-                        vino_set_data_norm(vcs, VINO_DATA_NORM_PAL);
-                        vcs->data_norm = VINO_DATA_NORM_PAL;
+                if (((*std) & V4L2_STD_PAL)
+                    && ((*std) & V4L2_STD_NTSC)
+                    && ((*std) & V4L2_STD_SECAM)) {
+                        ret = vino_set_data_norm(vcs, VINO_DATA_NORM_AUTO_EXT,
+                                                 &flags);
+                } else if ((*std) & V4L2_STD_PAL) {
+                        ret = vino_set_data_norm(vcs, VINO_DATA_NORM_PAL,
+                                                 &flags);
                 } else if ((*std) & V4L2_STD_NTSC) {
-                        vino_set_data_norm(vcs, VINO_DATA_NORM_NTSC);
-                        vcs->data_norm = VINO_DATA_NORM_NTSC;
+                        ret = vino_set_data_norm(vcs, VINO_DATA_NORM_NTSC,
+                                                 &flags);
                 } else if ((*std) & V4L2_STD_SECAM) {
-                        vino_set_data_norm(vcs, VINO_DATA_NORM_SECAM);
-                        vcs->data_norm = VINO_DATA_NORM_SECAM;
+                        ret = vino_set_data_norm(vcs, VINO_DATA_NORM_SECAM,
+                                                 &flags);
                 } else {
                         ret = -EINVAL;
                 }
+
+                if (ret) {
+                        ret = -EINVAL;
+                }
         } else {
                 ret = -EINVAL;
         }
 
 out:
-        spin_unlock(&vino_drvdata->input_lock);
+        spin_unlock_irqrestore(&vino_drvdata->input_lock, flags);
 
         return ret;
 }
@@ -2855,6 +3258,7 @@ static int vino_v4l2_try_fmt(struct vino_channel_settings *vcs,
                              struct v4l2_format *f)
 {
         struct vino_channel_settings tempvcs;
+        unsigned long flags;
 
         switch (f->type) {
         case V4L2_BUF_TYPE_VIDEO_CAPTURE: {
@@ -2863,13 +3267,13 @@ static int vino_v4l2_try_fmt(struct vino_channel_settings *vcs,
                 dprintk("requested: w = %d, h = %d\n",
                        pf->width, pf->height);
 
-                spin_lock(&vino_drvdata->input_lock);
+                spin_lock_irqsave(&vino_drvdata->input_lock, flags);
                 memcpy(&tempvcs, vcs, sizeof(struct vino_channel_settings));
-                spin_unlock(&vino_drvdata->input_lock);
+                spin_unlock_irqrestore(&vino_drvdata->input_lock, flags);
 
                 tempvcs.data_format = vino_find_data_format(pf->pixelformat);
                 if (tempvcs.data_format == VINO_DATA_FMT_NONE) {
-                        tempvcs.data_format = VINO_DATA_FMT_RGB32;
+                        tempvcs.data_format = VINO_DATA_FMT_GREY;
                         pf->pixelformat =
                                 vino_data_formats[tempvcs.data_format].
                                 pixelformat;
@@ -2908,10 +3312,13 @@ static int vino_v4l2_try_fmt(struct vino_channel_settings *vcs,
 static int vino_v4l2_g_fmt(struct vino_channel_settings *vcs,
                            struct v4l2_format *f)
 {
+        unsigned long flags;
+
         switch (f->type) {
         case V4L2_BUF_TYPE_VIDEO_CAPTURE: {
                 struct v4l2_pix_format *pf = &f->fmt.pix;
-                spin_lock(&vino_drvdata->input_lock);
+
+                spin_lock_irqsave(&vino_drvdata->input_lock, flags);
 
                 pf->width = (vcs->clipping.right - vcs->clipping.left) /
                         vcs->decimation;
@@ -2930,7 +3337,7 @@ static int vino_v4l2_g_fmt(struct vino_channel_settings *vcs,
 
                 pf->priv = 0;
 
-                spin_unlock(&vino_drvdata->input_lock);
+                spin_unlock_irqrestore(&vino_drvdata->input_lock, flags);
                 break;
         }
         case V4L2_BUF_TYPE_VIDEO_OVERLAY:
@@ -2945,20 +3352,18 @@ static int vino_v4l2_s_fmt(struct vino_channel_settings *vcs,
                            struct v4l2_format *f)
 {
         int data_format;
+        unsigned long flags;
 
         switch (f->type) {
         case V4L2_BUF_TYPE_VIDEO_CAPTURE: {
                 struct v4l2_pix_format *pf = &f->fmt.pix;
-                spin_lock(&vino_drvdata->input_lock);
 
-                if (!vino_is_input_owner(vcs)) {
-                        spin_unlock(&vino_drvdata->input_lock);
-                        return -EINVAL;
-                }
+                spin_lock_irqsave(&vino_drvdata->input_lock, flags);
 
                 data_format = vino_find_data_format(pf->pixelformat);
+
                 if (data_format == VINO_DATA_FMT_NONE) {
-                        vcs->data_format = VINO_DATA_FMT_RGB32;
+                        vcs->data_format = VINO_DATA_FMT_GREY;
                         pf->pixelformat =
                                 vino_data_formats[vcs->data_format].
                                 pixelformat;
@@ -2985,7 +3390,7 @@ static int vino_v4l2_s_fmt(struct vino_channel_settings *vcs,
 
                 pf->priv = 0;
 
-                spin_unlock(&vino_drvdata->input_lock);
+                spin_unlock_irqrestore(&vino_drvdata->input_lock, flags);
                 break;
         }
         case V4L2_BUF_TYPE_VIDEO_OVERLAY:
@@ -3000,12 +3405,15 @@ static int vino_v4l2_cropcap(struct vino_channel_settings *vcs,
                              struct v4l2_cropcap *ccap)
 {
         const struct vino_data_norm *norm;
+        unsigned long flags;
 
         switch (ccap->type) {
         case V4L2_BUF_TYPE_VIDEO_CAPTURE:
-                spin_lock(&vino_drvdata->input_lock);
+                spin_lock_irqsave(&vino_drvdata->input_lock, flags);
+
                 norm = &vino_data_norms[vcs->data_norm];
-                spin_unlock(&vino_drvdata->input_lock);
+
+                spin_unlock_irqrestore(&vino_drvdata->input_lock, flags);
 
                 ccap->bounds.left = 0;
                 ccap->bounds.top = 0;
@@ -3028,16 +3436,18 @@ static int vino_v4l2_cropcap(struct vino_channel_settings *vcs,
 static int vino_v4l2_g_crop(struct vino_channel_settings *vcs,
                             struct v4l2_crop *c)
 {
+        unsigned long flags;
+
         switch (c->type) {
         case V4L2_BUF_TYPE_VIDEO_CAPTURE:
-                spin_lock(&vino_drvdata->input_lock);
+                spin_lock_irqsave(&vino_drvdata->input_lock, flags);
 
                 c->c.left = vcs->clipping.left;
                 c->c.top = vcs->clipping.top;
                 c->c.width = vcs->clipping.right - vcs->clipping.left;
                 c->c.height = vcs->clipping.bottom - vcs->clipping.top;
 
-                spin_unlock(&vino_drvdata->input_lock);
+                spin_unlock_irqrestore(&vino_drvdata->input_lock, flags);
                 break;
         case V4L2_BUF_TYPE_VIDEO_OVERLAY:
         default:
@@ -3050,18 +3460,16 @@ static int vino_v4l2_g_crop(struct vino_channel_settings *vcs,
 static int vino_v4l2_s_crop(struct vino_channel_settings *vcs,
                             struct v4l2_crop *c)
 {
+        unsigned long flags;
+
         switch (c->type) {
         case V4L2_BUF_TYPE_VIDEO_CAPTURE:
-                spin_lock(&vino_drvdata->input_lock);
+                spin_lock_irqsave(&vino_drvdata->input_lock, flags);
 
-                if (!vino_is_input_owner(vcs)) {
-                        spin_unlock(&vino_drvdata->input_lock);
-                        return -EINVAL;
-                }
                 vino_set_clipping(vcs, c->c.left, c->c.top,
                                   c->c.width, c->c.height);
 
-                spin_unlock(&vino_drvdata->input_lock);
+                spin_unlock_irqrestore(&vino_drvdata->input_lock, flags);
                 break;
         case V4L2_BUF_TYPE_VIDEO_OVERLAY:
         default:
@@ -3074,6 +3482,8 @@ static int vino_v4l2_s_crop(struct vino_channel_settings *vcs,
 static int vino_v4l2_g_parm(struct vino_channel_settings *vcs,
                             struct v4l2_streamparm *sp)
 {
+        unsigned long flags;
+
         switch (sp->type) {
         case V4L2_BUF_TYPE_VIDEO_CAPTURE: {
                 struct v4l2_captureparm *cp = &sp->parm.capture;
@@ -3082,9 +3492,11 @@ static int vino_v4l2_g_parm(struct vino_channel_settings *vcs,
                 cp->capability = V4L2_CAP_TIMEPERFRAME;
                 cp->timeperframe.numerator = 1;
 
-                spin_lock(&vino_drvdata->input_lock);
+                spin_lock_irqsave(&vino_drvdata->input_lock, flags);
+
                 cp->timeperframe.denominator = vcs->fps;
-                spin_unlock(&vino_drvdata->input_lock);
+
+                spin_unlock_irqrestore(&vino_drvdata->input_lock, flags);
 
                 // TODO: cp->readbuffers = xxx;
                 break;
@@ -3100,15 +3512,13 @@ static int vino_v4l2_g_parm(struct vino_channel_settings *vcs,
 static int vino_v4l2_s_parm(struct vino_channel_settings *vcs,
                             struct v4l2_streamparm *sp)
 {
+        unsigned long flags;
+
         switch (sp->type) {
         case V4L2_BUF_TYPE_VIDEO_CAPTURE: {
                 struct v4l2_captureparm *cp = &sp->parm.capture;
 
-                spin_lock(&vino_drvdata->input_lock);
-                if (!vino_is_input_owner(vcs)) {
-                        spin_unlock(&vino_drvdata->input_lock);
-                        return -EINVAL;
-                }
+                spin_lock_irqsave(&vino_drvdata->input_lock, flags);
 
                 if ((cp->timeperframe.numerator == 0) ||
                     (cp->timeperframe.denominator == 0)) {
@@ -3118,7 +3528,8 @@ static int vino_v4l2_s_parm(struct vino_channel_settings *vcs,
                         vino_set_framerate(vcs, cp->timeperframe.denominator /
                                            cp->timeperframe.numerator);
                 }
-                spin_unlock(&vino_drvdata->input_lock);
+
+                spin_unlock_irqrestore(&vino_drvdata->input_lock, flags);
 
                 // TODO: set buffers according to cp->readbuffers
                 break;
@@ -3145,21 +3556,23 @@ static int vino_v4l2_reqbufs(struct vino_channel_settings *vcs,
                         return -EINVAL;
                 }
 
-                if (vino_is_capturing(vcs)) {
-                        dprintk("busy, capturing\n");
-                        return -EBUSY;
-                }
-
                 dprintk("count = %d\n", rb->count);
                 if (rb->count > 0) {
+                        if (vino_is_capturing(vcs)) {
+                                dprintk("busy, capturing\n");
+                                return -EBUSY;
+                        }
+
                         if (vino_queue_has_mapped_buffers(&vcs->fb_queue)) {
                                 dprintk("busy, buffers still mapped\n");
                                 return -EBUSY;
                         } else {
+                                vcs->streaming = 0;
                                 vino_queue_free(&vcs->fb_queue);
                                 vino_queue_init(&vcs->fb_queue, &rb->count);
                         }
                 } else {
+                        vcs->streaming = 0;
                         vino_capture_stop(vcs);
                         vino_queue_free(&vcs->fb_queue);
                 }
@@ -3302,12 +3715,12 @@ static int vino_v4l2_dqbuf(struct vino_channel_settings *vcs,
                 err = vino_queue_get_incoming(&vcs->fb_queue, &incoming);
                 if (err) {
                         dprintk("vino_queue_get_incoming() failed\n");
-                        return -EIO;
+                        return -EINVAL;
                 }
                 err = vino_queue_get_outgoing(&vcs->fb_queue, &outgoing);
                 if (err) {
                         dprintk("vino_queue_get_outgoing() failed\n");
-                        return -EIO;
+                        return -EINVAL;
                 }
 
                 dprintk("incoming = %d, outgoing = %d\n", incoming, outgoing);
@@ -3327,8 +3740,10 @@ static int vino_v4l2_dqbuf(struct vino_channel_settings *vcs,
                         if (err) {
                                 err = vino_wait_for_frame(vcs);
                                 if (err) {
-                                        /* interrupted */
-                                        vino_capture_failed(vcs);
+                                        /* interrupted or
+                                         * no frames captured because
+                                         * of frame skipping */
+                                        // vino_capture_failed(vcs);
                                         return -EIO;
                                 }
                         }
@@ -3341,10 +3756,12 @@ static int vino_v4l2_dqbuf(struct vino_channel_settings *vcs,
                 }
 
                 err = vino_check_buffer(vcs, fb);
+
+                vino_v4l2_get_buffer_status(vcs, fb, b);
+
                 if (err)
                         return -EIO;
 
-                vino_v4l2_get_buffer_status(vcs, fb, b);
                 break;
         }
         case V4L2_BUF_TYPE_VIDEO_OVERLAY:
@@ -3401,8 +3818,8 @@ static int vino_v4l2_streamoff(struct vino_channel_settings *vcs)
         if (!vcs->streaming)
                 return 0;
 
-        vino_capture_stop(vcs);
         vcs->streaming = 0;
+        vino_capture_stop(vcs);
 
         return 0;
 }
@@ -3410,10 +3827,11 @@ static int vino_v4l2_streamoff(struct vino_channel_settings *vcs)
 static int vino_v4l2_queryctrl(struct vino_channel_settings *vcs,
                                struct v4l2_queryctrl *queryctrl)
 {
+        unsigned long flags;
         int i;
         int err = 0;
 
-        spin_lock(&vino_drvdata->input_lock);
+        spin_lock_irqsave(&vino_drvdata->input_lock, flags);
 
         switch (vcs->input) {
         case VINO_INPUT_D1:
@@ -3423,6 +3841,7 @@ static int vino_v4l2_queryctrl(struct vino_channel_settings *vcs,
                                 memcpy(queryctrl,
                                        &vino_indycam_v4l2_controls[i],
                                        sizeof(struct v4l2_queryctrl));
+                                queryctrl->reserved[0] = 0;
                                 goto found;
                         }
                 }
@@ -3437,6 +3856,7 @@ static int vino_v4l2_queryctrl(struct vino_channel_settings *vcs,
                                 memcpy(queryctrl,
                                        &vino_saa7191_v4l2_controls[i],
                                        sizeof(struct v4l2_queryctrl));
+                                queryctrl->reserved[0] = 0;
                                 goto found;
                         }
                 }
@@ -3448,7 +3868,7 @@ static int vino_v4l2_queryctrl(struct vino_channel_settings *vcs,
         }
 
  found:
-        spin_unlock(&vino_drvdata->input_lock);
+        spin_unlock_irqrestore(&vino_drvdata->input_lock, flags);
 
         return err;
 }
@@ -3456,70 +3876,72 @@ static int vino_v4l2_queryctrl(struct vino_channel_settings *vcs,
 static int vino_v4l2_g_ctrl(struct vino_channel_settings *vcs,
                             struct v4l2_control *control)
 {
-        struct indycam_control indycam_ctrl;
-        struct saa7191_control saa7191_ctrl;
+        unsigned long flags;
+        int i;
         int err = 0;
 
-        spin_lock(&vino_drvdata->input_lock);
+        spin_lock_irqsave(&vino_drvdata->input_lock, flags);
 
         switch (vcs->input) {
-        case VINO_INPUT_D1:
-                i2c_camera_command(DECODER_INDYCAM_GET_CONTROLS,
-                                   &indycam_ctrl);
+        case VINO_INPUT_D1: {
+                struct indycam_control indycam_ctrl;
 
-                switch(control->id) {
-                case V4L2_CID_AUTOGAIN:
-                        control->value = indycam_ctrl.agc;
-                        break;
-                case V4L2_CID_AUTO_WHITE_BALANCE:
-                        control->value = indycam_ctrl.awb;
-                        break;
-                case V4L2_CID_GAIN:
-                        control->value = indycam_ctrl.gain;
-                        break;
-                case V4L2_CID_PRIVATE_BASE:
-                        control->value = indycam_ctrl.red_saturation;
-                        break;
-                case V4L2_CID_PRIVATE_BASE + 1:
-                        control->value = indycam_ctrl.blue_saturation;
-                        break;
-                case V4L2_CID_RED_BALANCE:
-                        control->value = indycam_ctrl.red_balance;
-                        break;
-                case V4L2_CID_BLUE_BALANCE:
-                        control->value = indycam_ctrl.blue_balance;
-                        break;
-                case V4L2_CID_EXPOSURE:
-                        control->value = indycam_ctrl.shutter;
-                        break;
-                case V4L2_CID_GAMMA:
-                        control->value = indycam_ctrl.gamma;
-                        break;
-                default:
+                for (i = 0; i < VINO_INDYCAM_V4L2_CONTROL_COUNT; i++) {
+                        if (vino_indycam_v4l2_controls[i].id ==
+                            control->id) {
+                                goto found1;
+                        }
+                }
+
+                err = -EINVAL;
+                goto out;
+
+found1:
+                indycam_ctrl.type = vino_indycam_v4l2_controls[i].reserved[0];
+
+                err = i2c_camera_command(DECODER_INDYCAM_GET_CONTROL,
+                                         &indycam_ctrl);
+                if (err) {
                         err = -EINVAL;
+                        goto out;
                 }
+
+                control->value = indycam_ctrl.value;
                 break;
+        }
         case VINO_INPUT_COMPOSITE:
-        case VINO_INPUT_SVIDEO:
-                i2c_decoder_command(DECODER_SAA7191_GET_CONTROLS,
-                                   &saa7191_ctrl);
+        case VINO_INPUT_SVIDEO: {
+                struct saa7191_control saa7191_ctrl;
 
-                switch(control->id) {
-                case V4L2_CID_HUE:
-                        control->value = saa7191_ctrl.hue;
-                        break;
-                case V4L2_CID_PRIVATE_BASE:
-                        control->value = saa7191_ctrl.vtrc;
-                        break;
-                default:
+                for (i = 0; i < VINO_SAA7191_V4L2_CONTROL_COUNT; i++) {
+                        if (vino_saa7191_v4l2_controls[i].id ==
+                            control->id) {
+                                goto found2;
+                        }
+                }
+
+                err = -EINVAL;
+                goto out;
+
+found2:
+                saa7191_ctrl.type = vino_saa7191_v4l2_controls[i].reserved[0];
+
+                err = i2c_decoder_command(DECODER_SAA7191_GET_CONTROL,
+                                          &saa7191_ctrl);
+                if (err) {
                         err = -EINVAL;
+                        goto out;
                 }
+
+                control->value = saa7191_ctrl.value;
                 break;
+        }
         default:
                 err =  -EINVAL;
         }
 
-        spin_unlock(&vino_drvdata->input_lock);
+out:
+        spin_unlock_irqrestore(&vino_drvdata->input_lock, flags);
 
         return err;
 }
@@ -3527,15 +3949,21 @@ static int vino_v4l2_g_ctrl(struct vino_channel_settings *vcs,
 static int vino_v4l2_s_ctrl(struct vino_channel_settings *vcs,
                             struct v4l2_control *control)
 {
-        struct indycam_control indycam_ctrl;
-        struct saa7191_control saa7191_ctrl;
+        unsigned long flags;
         int i;
         int err = 0;
 
-        spin_lock(&vino_drvdata->input_lock);
+        spin_lock_irqsave(&vino_drvdata->input_lock, flags);
+
+        if (!vino_is_input_owner(vcs)) {
+                err = -EBUSY;
+                goto out;
+        }
 
         switch (vcs->input) {
-        case VINO_INPUT_D1:
+        case VINO_INPUT_D1: {
+                struct indycam_control indycam_ctrl;
+
                 for (i = 0; i < VINO_INDYCAM_V4L2_CONTROL_COUNT; i++) {
                         if (vino_indycam_v4l2_controls[i].id ==
                             control->id) {
@@ -3544,65 +3972,31 @@ static int vino_v4l2_s_ctrl(struct vino_channel_settings *vcs,
                                     && (control->value <=
                                         vino_indycam_v4l2_controls[i].
                                         maximum)) {
-                                        goto ok1;
+                                        goto found1;
                                 } else {
                                         err = -ERANGE;
-                                        goto error;
+                                        goto out;
                                 }
                         }
                 }
+
                 err = -EINVAL;
-                goto error;
+                goto out;
 
-ok1:
-                indycam_ctrl.agc = INDYCAM_VALUE_UNCHANGED;
-                indycam_ctrl.awb = INDYCAM_VALUE_UNCHANGED;
-                indycam_ctrl.shutter = INDYCAM_VALUE_UNCHANGED;
-                indycam_ctrl.gain = INDYCAM_VALUE_UNCHANGED;
-                indycam_ctrl.red_balance = INDYCAM_VALUE_UNCHANGED;
-                indycam_ctrl.blue_balance = INDYCAM_VALUE_UNCHANGED;
-                indycam_ctrl.red_saturation = INDYCAM_VALUE_UNCHANGED;
-                indycam_ctrl.blue_saturation = INDYCAM_VALUE_UNCHANGED;
-                indycam_ctrl.gamma = INDYCAM_VALUE_UNCHANGED;
-
-                switch(control->id) {
-                case V4L2_CID_AUTOGAIN:
-                        indycam_ctrl.agc = control->value;
-                        break;
-                case V4L2_CID_AUTO_WHITE_BALANCE:
-                        indycam_ctrl.awb = control->value;
-                        break;
-                case V4L2_CID_GAIN:
-                        indycam_ctrl.gain = control->value;
-                        break;
-                case V4L2_CID_PRIVATE_BASE:
-                        indycam_ctrl.red_saturation = control->value;
-                        break;
-                case V4L2_CID_PRIVATE_BASE + 1:
-                        indycam_ctrl.blue_saturation = control->value;
-                        break;
-                case V4L2_CID_RED_BALANCE:
-                        indycam_ctrl.red_balance = control->value;
-                        break;
-                case V4L2_CID_BLUE_BALANCE:
-                        indycam_ctrl.blue_balance = control->value;
-                        break;
-                case V4L2_CID_EXPOSURE:
-                        indycam_ctrl.shutter = control->value;
-                        break;
-                case V4L2_CID_GAMMA:
-                        indycam_ctrl.gamma = control->value;
-                        break;
-                default:
-                        err =  -EINVAL;
-                }
+found1:
+                indycam_ctrl.type = vino_indycam_v4l2_controls[i].reserved[0];
+                indycam_ctrl.value = control->value;
 
-                if (!err)
-                        i2c_camera_command(DECODER_INDYCAM_SET_CONTROLS,
-                                           &indycam_ctrl);
+                err = i2c_camera_command(DECODER_INDYCAM_SET_CONTROL,
+                                         &indycam_ctrl);
+                if (err)
+                        err = -EINVAL;
                 break;
+        }
         case VINO_INPUT_COMPOSITE:
-        case VINO_INPUT_SVIDEO:
+        case VINO_INPUT_SVIDEO: {
+                struct saa7191_control saa7191_ctrl;
+
                 for (i = 0; i < VINO_SAA7191_V4L2_CONTROL_COUNT; i++) {
                         if (vino_saa7191_v4l2_controls[i].id ==
                             control->id) {
@@ -3611,41 +4005,32 @@ ok1:
                                     && (control->value <=
                                         vino_saa7191_v4l2_controls[i].
                                         maximum)) {
-                                        goto ok2;
+                                        goto found2;
                                 } else {
                                         err = -ERANGE;
-                                        goto error;
+                                        goto out;
                                 }
                         }
                 }
                 err = -EINVAL;
-                goto error;
-
-ok2:
-                saa7191_ctrl.hue = SAA7191_VALUE_UNCHANGED;
-                saa7191_ctrl.vtrc = SAA7191_VALUE_UNCHANGED;
+                goto out;
 
-                switch(control->id) {
-                case V4L2_CID_HUE:
-                        saa7191_ctrl.hue = control->value;
-                        break;
-                case V4L2_CID_PRIVATE_BASE:
-                        saa7191_ctrl.vtrc = control->value;
-                        break;
-                default:
-                        err =  -EINVAL;
-                }
+found2:
+                saa7191_ctrl.type = vino_saa7191_v4l2_controls[i].reserved[0];
+                saa7191_ctrl.value = control->value;
 
-                if (!err)
-                        i2c_decoder_command(DECODER_SAA7191_SET_CONTROLS,
-                                            &saa7191_ctrl);
+                err = i2c_decoder_command(DECODER_SAA7191_SET_CONTROL,
+                                          &saa7191_ctrl);
+                if (err)
+                        err = -EINVAL;
                 break;
+        }
         default:
                 err =  -EINVAL;
         }
 
-error:
-        spin_unlock(&vino_drvdata->input_lock);
+out:
+        spin_unlock_irqrestore(&vino_drvdata->input_lock, flags);
 
         return err;
 }
@@ -3865,9 +4250,9 @@ static unsigned int vino_poll(struct file *file, poll_table *pt)
 over:
         dprintk("poll(): data %savailable\n",
                 (outgoing > 0) ? "" : "not ");
-        if (outgoing > 0) {
+
+        if (outgoing > 0)
                 ret = POLLIN | POLLRDNORM;
-        }
 
 error:
 
@@ -3880,6 +4265,7 @@ static int vino_do_ioctl(struct inode *inode, struct file *file,
         struct video_device *dev = video_devdata(file);
         struct vino_channel_settings *vcs = video_get_drvdata(dev);
 
+#ifdef VINO_DEBUG
         switch (_IOC_TYPE(cmd)) {
         case 'v':
                 dprintk("ioctl(): V4L1 unsupported (0x%08x)\n", cmd);
@@ -3891,9 +4277,9 @@ static int vino_do_ioctl(struct inode *inode, struct file *file,
         default:
                 dprintk("ioctl(): unsupported command 0x%08x\n", cmd);
         }
+#endif
 
         switch (cmd) {
-        /* TODO: V4L1 interface (use compatibility layer?) */
         /* V4L2 interface */
         case VIDIOC_QUERYCAP: {
                 vino_v4l2_querycap(arg);
@@ -3911,6 +4297,9 @@ static int vino_do_ioctl(struct inode *inode, struct file *file,
         case VIDIOC_ENUMSTD: {
                 return vino_v4l2_enumstd(vcs, arg);
         }
+        case VIDIOC_QUERYSTD: {
+                return vino_v4l2_querystd(vcs, arg);
+        }
         case VIDIOC_G_STD: {
                 return vino_v4l2_g_std(vcs, arg);
         }
@@ -4100,8 +4489,7 @@ static int vino_probe(void)
                 return -ENODEV;
         }
 
-        printk(KERN_INFO "VINO with chip ID %ld, revision %ld found\n",
-               VINO_ID_VALUE(rev_id), VINO_REV_NUM(rev_id));
+        printk(KERN_INFO "VINO revision %ld found\n", VINO_REV_NUM(rev_id));
 
         return 0;
 }
diff --git a/drivers/media/video/zoran_card.c b/drivers/media/video/zoran_card.c
index eed2acea1779..39a0d238900e 100644
--- a/drivers/media/video/zoran_card.c
+++ b/drivers/media/video/zoran_card.c
@@ -1057,10 +1057,8 @@ zr36057_init (struct zoran *zr)
                         KERN_ERR
                         "%s: zr36057_init() - kmalloc (STAT_COM) failed\n",
                         ZR_DEVNAME(zr));
-                if (vdev)
-                        kfree(vdev);
-                if (mem)
-                        kfree((void *)mem);
+                kfree(vdev);
+                kfree((void *)mem);
                 return -ENOMEM;
         }
         memset((void *) mem, 0, mem_needed);
@@ -1105,15 +1103,15 @@ zoran_release (struct zoran *zr)
         /* unregister videocodec bus */
         if (zr->codec) {
                 struct videocodec_master *master = zr->codec->master_data;
+
                 videocodec_detach(zr->codec);
-                if (master)
-                        kfree(master);
+                kfree(master);
         }
         if (zr->vfe) {
                 struct videocodec_master *master = zr->vfe->master_data;
+
                 videocodec_detach(zr->vfe);
-                if (master)
-                        kfree(master);
+                kfree(master);
         }
 
         /* unregister i2c bus */
diff --git a/drivers/media/video/zoran_driver.c b/drivers/media/video/zoran_driver.c
index 53adeb70f2ca..07bde9acd672 100644
--- a/drivers/media/video/zoran_driver.c
+++ b/drivers/media/video/zoran_driver.c
@@ -996,8 +996,6 @@ zoran_jpg_queue_frame (struct file          *file,
                 return -EINVAL;
         }
 
-        spin_lock_irqsave(&zr->spinlock, flags);
-
         if (fh->jpg_buffers.active == ZORAN_FREE) {
                 if (zr->jpg_buffers.active == ZORAN_FREE) {
                         zr->jpg_buffers = fh->jpg_buffers;
@@ -1016,6 +1014,8 @@ zoran_jpg_queue_frame (struct file          *file,
                 zr36057_enable_jpg(zr, mode);
         }
 
+        spin_lock_irqsave(&zr->spinlock, flags);
+
         if (!res) {
                 switch (zr->jpg_buffers.buffer[num].state) {
                 case BUZ_STATE_DONE:
diff --git a/drivers/message/fusion/mptlan.c b/drivers/message/fusion/mptlan.c
index ed3c891e388f..014085d8ec85 100644
--- a/drivers/message/fusion/mptlan.c
+++ b/drivers/message/fusion/mptlan.c
@@ -511,7 +511,7 @@ mpt_lan_close(struct net_device *dev)
 {
         struct mpt_lan_priv *priv = netdev_priv(dev);
         MPT_ADAPTER *mpt_dev = priv->mpt_dev;
-        unsigned int timeout;
+        unsigned long timeout;
         int i;
 
         dlprintk((KERN_INFO MYNAM ": mpt_lan_close called\n"));
@@ -526,11 +526,9 @@ mpt_lan_close(struct net_device *dev)
 
         mpt_lan_reset(dev);
 
-        timeout = 2 * HZ;
-        while (atomic_read(&priv->buckets_out) && --timeout) {
-                set_current_state(TASK_INTERRUPTIBLE);
-                schedule_timeout(1);
-        }
+        timeout = jiffies + 2 * HZ;
+        while (atomic_read(&priv->buckets_out) && time_before(jiffies, timeout))
+                schedule_timeout_interruptible(1);
 
         for (i = 0; i < priv->max_buckets_out; i++) {
                 if (priv->RcvCtl[i].skb != NULL) {
diff --git a/drivers/message/fusion/mptscsih.c b/drivers/message/fusion/mptscsih.c
index 5cb07eb224d7..4330ed0cedaa 100644
--- a/drivers/message/fusion/mptscsih.c
+++ b/drivers/message/fusion/mptscsih.c
@@ -1013,10 +1013,8 @@ mptscsih_remove(struct pci_dev *pdev)
         spin_lock_irqsave(&dvtaskQ_lock, flags);
         if (dvtaskQ_active) {
                 spin_unlock_irqrestore(&dvtaskQ_lock, flags);
-                while(dvtaskQ_active && --count) {
-                        set_current_state(TASK_INTERRUPTIBLE);
-                        schedule_timeout(1);
-                }
+                while(dvtaskQ_active && --count)
+                        schedule_timeout_interruptible(1);
         } else {
                 spin_unlock_irqrestore(&dvtaskQ_lock, flags);
         }
diff --git a/drivers/message/i2o/exec-osm.c b/drivers/message/i2o/exec-osm.c
index b675b4ebbebd..9c339a2505b0 100644
--- a/drivers/message/i2o/exec-osm.c
+++ b/drivers/message/i2o/exec-osm.c
@@ -33,6 +33,7 @@
 #include <linux/workqueue.h>
 #include <linux/string.h>
 #include <linux/slab.h>
+#include <linux/sched.h>   /* wait_event_interruptible_timeout() needs this */
 #include <asm/param.h>          /* HZ */
 #include "core.h"
 
diff --git a/drivers/message/i2o/iop.c b/drivers/message/i2o/iop.c
index 61b837de4b6a..4eb53258842e 100644
--- a/drivers/message/i2o/iop.c
+++ b/drivers/message/i2o/iop.c
@@ -93,8 +93,7 @@ u32 i2o_msg_get_wait(struct i2o_controller *c,
                                   c->name);
                         return I2O_QUEUE_EMPTY;
                 }
-                set_current_state(TASK_UNINTERRUPTIBLE);
-                schedule_timeout(1);
+                schedule_timeout_uninterruptible(1);
         }
 
         return m;
@@ -485,8 +484,7 @@ static int i2o_iop_init_outbound_queue(struct i2o_controller *c)
                         osm_warn("%s: Timeout Initializing\n", c->name);
                         return -ETIMEDOUT;
                 }
-                set_current_state(TASK_UNINTERRUPTIBLE);
-                schedule_timeout(1);
+                schedule_timeout_uninterruptible(1);
         }
 
         m = c->out_queue.phys;
@@ -548,8 +546,7 @@ static int i2o_iop_reset(struct i2o_controller *c)
                 if (time_after(jiffies, timeout))
                         break;
 
-                set_current_state(TASK_UNINTERRUPTIBLE);
-                schedule_timeout(1);
+                schedule_timeout_uninterruptible(1);
         }
 
         switch (*status) {
@@ -577,8 +574,7 @@ static int i2o_iop_reset(struct i2o_controller *c)
                                 rc = -ETIMEDOUT;
                                 goto exit;
                         }
-                        set_current_state(TASK_UNINTERRUPTIBLE);
-                        schedule_timeout(1);
+                        schedule_timeout_uninterruptible(1);
 
                         m = i2o_msg_get_wait(c, &msg, I2O_TIMEOUT_RESET);
                 }
@@ -989,8 +985,7 @@ int i2o_status_get(struct i2o_controller *c)
                         return -ETIMEDOUT;
                 }
 
-                set_current_state(TASK_UNINTERRUPTIBLE);
-                schedule_timeout(1);
+                schedule_timeout_uninterruptible(1);
         }
 
 #ifdef DEBUG
diff --git a/drivers/mfd/mcp-core.c b/drivers/mfd/mcp-core.c
index c75d713c01e4..55ba23075c90 100644
--- a/drivers/mfd/mcp-core.c
+++ b/drivers/mfd/mcp-core.c
@@ -15,6 +15,8 @@
 #include <linux/errno.h>
 #include <linux/smp.h>
 #include <linux/device.h>
+#include <linux/slab.h>
+#include <linux/string.h>
 
 #include <asm/dma.h>
 #include <asm/system.h>
diff --git a/drivers/mmc/mmc.c b/drivers/mmc/mmc.c
index ceae379a4d4c..da528390acf8 100644
--- a/drivers/mmc/mmc.c
+++ b/drivers/mmc/mmc.c
@@ -1263,7 +1263,7 @@ EXPORT_SYMBOL(mmc_suspend_host);
  */
 int mmc_resume_host(struct mmc_host *host)
 {
-        mmc_detect_change(host, 0);
+        mmc_rescan(host);
 
         return 0;
 }
diff --git a/drivers/mmc/wbsd.c b/drivers/mmc/wbsd.c
index 4ff67e7363d9..e954b8354fef 100644
--- a/drivers/mmc/wbsd.c
+++ b/drivers/mmc/wbsd.c
@@ -1602,8 +1602,7 @@ static void __devexit wbsd_release_dma(struct wbsd_host* host)
         if (host->dma_addr)
                 dma_unmap_single(host->mmc->dev, host->dma_addr, WBSD_DMA_SIZE,
                         DMA_BIDIRECTIONAL);
-        if (host->dma_buffer)
-                kfree(host->dma_buffer);
+        kfree(host->dma_buffer);
         if (host->dma >= 0)
                 free_dma(host->dma);
 
diff --git a/drivers/mtd/Kconfig b/drivers/mtd/Kconfig
index 027054dea032..f6b775e63ac8 100644
--- a/drivers/mtd/Kconfig
+++ b/drivers/mtd/Kconfig
@@ -1,4 +1,4 @@
-# $Id: Kconfig,v 1.7 2004/11/22 11:33:56 ijc Exp $
+# $Id: Kconfig,v 1.11 2005/11/07 11:14:19 gleixner Exp $
 
 menu "Memory Technology Devices (MTD)"
 
@@ -10,7 +10,7 @@ config MTD
           will provide the generic support for MTD drivers to register
           themselves with the kernel and for potential users of MTD devices
           to enumerate the devices which are present and obtain a handle on
-          them. It will also allow you to select individual drivers for 
+          them. It will also allow you to select individual drivers for
           particular hardware and users of MTD devices. If unsure, say N.
 
 config MTD_DEBUG
@@ -61,11 +61,11 @@ config MTD_REDBOOT_PARTS
 
           If you need code which can detect and parse this table, and register
           MTD 'partitions' corresponding to each image in the table, enable
-          this option. 
+          this option.
 
           You will still need the parsing functions to be called by the driver
-          for your particular device. It won't happen automatically. The 
-          SA1100 map driver (CONFIG_MTD_SA1100) has an option for this, for 
+          for your particular device. It won't happen automatically. The
+          SA1100 map driver (CONFIG_MTD_SA1100) has an option for this, for
           example.
 
 config MTD_REDBOOT_DIRECTORY_BLOCK
@@ -81,10 +81,10 @@ config MTD_REDBOOT_DIRECTORY_BLOCK
           partition table.  A zero or positive value gives an absolete
           erase block number. A negative value specifies a number of
           sectors before the end of the device.
-          
+
           For example "2" means block number 2, "-1" means the last
           block and "-2" means the penultimate block.
-          
+
 config MTD_REDBOOT_PARTS_UNALLOCATED
         bool "  Include unallocated flash regions"
         depends on MTD_REDBOOT_PARTS
@@ -105,11 +105,11 @@ config MTD_CMDLINE_PARTS
         ---help---
           Allow generic configuration of the MTD paritition tables via the kernel
           command line. Multiple flash resources are supported for hardware where
-          different kinds of flash memory are available. 
+          different kinds of flash memory are available.
 
           You will still need the parsing functions to be called by the driver
-          for your particular device. It won't happen automatically. The 
-          SA1100 map driver (CONFIG_MTD_SA1100) has an option for this, for 
+          for your particular device. It won't happen automatically. The
+          SA1100 map driver (CONFIG_MTD_SA1100) has an option for this, for
           example.
 
           The format for the command line is as follows:
@@ -118,12 +118,12 @@ config MTD_CMDLINE_PARTS
           <mtddef>  := <mtd-id>:<partdef>[,<partdef>]
           <partdef> := <size>[@offset][<name>][ro]
           <mtd-id>  := unique id used in mapping driver/device
-          <size>    := standard linux memsize OR "-" to denote all 
+          <size>    := standard linux memsize OR "-" to denote all
           remaining space
           <name>    := (NAME)
 
-          Due to the way Linux handles the command line, no spaces are 
-          allowed in the partition definition, including mtd id's and partition 
+          Due to the way Linux handles the command line, no spaces are
+          allowed in the partition definition, including mtd id's and partition
           names.
 
           Examples:
@@ -240,7 +240,7 @@ config INFTL
         tristate "INFTL (Inverse NAND Flash Translation Layer) support"
         depends on MTD
         ---help---
-          This provides support for the Inverse NAND Flash Translation 
+          This provides support for the Inverse NAND Flash Translation
           Layer which is used on M-Systems' newer DiskOnChip devices. It
           uses a kind of pseudo-file system on a flash device to emulate
           a block device with 512-byte sectors, on top of which you put
@@ -253,6 +253,16 @@ config INFTL
           permitted to copy, modify and distribute the code as you wish. Just
           not use it.
 
+config RFD_FTL
+        tristate "Resident Flash Disk (Flash Translation Layer) support"
+        depends on MTD
+        ---help---
+          This provides support for the flash translation layer known
+          as the Resident Flash Disk (RFD), as used by the Embedded BIOS
+          of General Software. There is a blurb at:
+
+                http://www.gensw.com/pages/prod/bios/rfd.htm
+
 source "drivers/mtd/chips/Kconfig"
 
 source "drivers/mtd/maps/Kconfig"
@@ -261,5 +271,7 @@ source "drivers/mtd/devices/Kconfig"
 
 source "drivers/mtd/nand/Kconfig"
 
+source "drivers/mtd/onenand/Kconfig"
+
 endmenu
 
diff --git a/drivers/mtd/Makefile b/drivers/mtd/Makefile
index e4ad588327f7..fc9374407c2b 100644
--- a/drivers/mtd/Makefile
+++ b/drivers/mtd/Makefile
@@ -1,7 +1,7 @@
 #
 # Makefile for the memory technology device drivers.
 #
-# $Id: Makefile.common,v 1.5 2004/08/10 20:51:49 dwmw2 Exp $
+# $Id: Makefile.common,v 1.7 2005/07/11 10:39:27 gleixner Exp $
 
 # Core functionality.
 mtd-y                           := mtdcore.o
@@ -20,8 +20,9 @@ obj-$(CONFIG_MTD_BLOCK_RO)	+= mtdblock_ro.o mtd_blkdevs.o
 obj-$(CONFIG_FTL)               += ftl.o mtd_blkdevs.o
 obj-$(CONFIG_NFTL)              += nftl.o mtd_blkdevs.o
 obj-$(CONFIG_INFTL)             += inftl.o mtd_blkdevs.o
+obj-$(CONFIG_RFD_FTL)           += rfd_ftl.o mtd_blkdevs.o
 
 nftl-objs               := nftlcore.o nftlmount.o
 inftl-objs              := inftlcore.o inftlmount.o
 
-obj-y           += chips/ maps/ devices/ nand/
+obj-y           += chips/ maps/ devices/ nand/ onenand/
diff --git a/drivers/mtd/afs.c b/drivers/mtd/afs.c
index 7363e101eb0f..6a45be04564b 100644
--- a/drivers/mtd/afs.c
+++ b/drivers/mtd/afs.c
@@ -1,27 +1,27 @@
 /*======================================================================
 
     drivers/mtd/afs.c: ARM Flash Layout/Partitioning
-  
+
     Copyright (C) 2000 ARM Limited
-  
+
    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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-  
-   This is access code for flashes using ARM's flash partitioning 
+
+   This is access code for flashes using ARM's flash partitioning
    standards.
 
-   $Id: afs.c,v 1.13 2004/02/27 22:09:59 rmk Exp $
+   $Id: afs.c,v 1.15 2005/11/07 11:14:19 gleixner Exp $
 
 ======================================================================*/
 
@@ -163,7 +163,7 @@ afs_read_iis(struct mtd_info *mtd, struct image_info_struct *iis, u_int ptr)
         return ret;
 }
 
-static int parse_afs_partitions(struct mtd_info *mtd, 
+static int parse_afs_partitions(struct mtd_info *mtd,
                          struct mtd_partition **pparts,
                          unsigned long origin)
 {
diff --git a/drivers/mtd/chips/Kconfig b/drivers/mtd/chips/Kconfig
index df95d2158b16..eafa23f5cbd6 100644
--- a/drivers/mtd/chips/Kconfig
+++ b/drivers/mtd/chips/Kconfig
@@ -1,5 +1,5 @@
 # drivers/mtd/chips/Kconfig
-# $Id: Kconfig,v 1.15 2005/06/06 23:04:35 tpoynor Exp $
+# $Id: Kconfig,v 1.18 2005/11/07 11:14:22 gleixner Exp $
 
 menu "RAM/ROM/Flash chip drivers"
         depends on MTD!=n
@@ -39,7 +39,7 @@ config MTD_CFI_ADV_OPTIONS
           If you need to specify a specific endianness for access to flash
           chips, or if you wish to reduce the size of the kernel by including
           support for only specific arrangements of flash chips, say 'Y'. This
-          option does not directly affect the code, but will enable other 
+          option does not directly affect the code, but will enable other
           configuration options which allow you to do so.
 
           If unsure, say 'N'.
@@ -56,7 +56,7 @@ config MTD_CFI_NOSWAP
           data bits when writing the 'magic' commands to the chips. Saying
           'NO', which is the default when CONFIG_MTD_CFI_ADV_OPTIONS isn't
           enabled, means that the CPU will not do any swapping; the chips
-          are expected to be wired to the CPU in 'host-endian' form. 
+          are expected to be wired to the CPU in 'host-endian' form.
           Specific arrangements are possible with the BIG_ENDIAN_BYTE and
           LITTLE_ENDIAN_BYTE, if the bytes are reversed.
 
@@ -79,10 +79,10 @@ config MTD_CFI_GEOMETRY
         bool "Specific CFI Flash geometry selection"
         depends on MTD_CFI_ADV_OPTIONS
         help
-          This option does not affect the code directly, but will enable 
+          This option does not affect the code directly, but will enable
           some other configuration options which would allow you to reduce
-          the size of the kernel by including support for only certain 
-          arrangements of CFI chips. If unsure, say 'N' and all options 
+          the size of the kernel by including support for only certain
+          arrangements of CFI chips. If unsure, say 'N' and all options
           which are supported by the current code will be enabled.
 
 config MTD_MAP_BANK_WIDTH_1
@@ -197,7 +197,7 @@ config MTD_CFI_AMDSTD
         help
           The Common Flash Interface defines a number of different command
           sets which a CFI-compliant chip may claim to implement. This code
-          provides support for one of those command sets, used on chips 
+          provides support for one of those command sets, used on chips
           including the AMD Am29LV320.
 
 config MTD_CFI_AMDSTD_RETRY
@@ -237,14 +237,14 @@ config MTD_RAM
         tristate "Support for RAM chips in bus mapping"
         depends on MTD
         help
-          This option enables basic support for RAM chips accessed through 
+          This option enables basic support for RAM chips accessed through
           a bus mapping driver.
 
 config MTD_ROM
         tristate "Support for ROM chips in bus mapping"
         depends on MTD
         help
-          This option enables basic support for ROM chips accessed through 
+          This option enables basic support for ROM chips accessed through
           a bus mapping driver.
 
 config MTD_ABSENT
@@ -275,7 +275,7 @@ config MTD_AMDSTD
         depends on MTD && MTD_OBSOLETE_CHIPS
         help
           This option enables support for flash chips using AMD-compatible
-          commands, including some which are not CFI-compatible and hence 
+          commands, including some which are not CFI-compatible and hence
           cannot be used with the CONFIG_MTD_CFI_AMDSTD option.
 
           It also works on AMD compatible chips that do conform to CFI.
@@ -285,7 +285,7 @@ config MTD_SHARP
         depends on MTD && MTD_OBSOLETE_CHIPS
         help
           This option enables support for flash chips using Sharp-compatible
-          commands, including some which are not CFI-compatible and hence 
+          commands, including some which are not CFI-compatible and hence
           cannot be used with the CONFIG_MTD_CFI_INTELxxx options.
 
 config MTD_JEDEC
diff --git a/drivers/mtd/chips/Makefile b/drivers/mtd/chips/Makefile
index 6830489828c6..8afe3092c4e3 100644
--- a/drivers/mtd/chips/Makefile
+++ b/drivers/mtd/chips/Makefile
@@ -1,7 +1,7 @@
 #
 # linux/drivers/chips/Makefile
 #
-# $Id: Makefile.common,v 1.4 2004/07/12 16:07:30 dwmw2 Exp $
+# $Id: Makefile.common,v 1.5 2005/11/07 11:14:22 gleixner Exp $
 
 #                       *** BIG UGLY NOTE ***
 #
@@ -11,7 +11,7 @@
 # the CFI command set drivers are linked before gen_probe.o
 
 obj-$(CONFIG_MTD)               += chipreg.o
-obj-$(CONFIG_MTD_AMDSTD)        += amd_flash.o 
+obj-$(CONFIG_MTD_AMDSTD)        += amd_flash.o
 obj-$(CONFIG_MTD_CFI)           += cfi_probe.o
 obj-$(CONFIG_MTD_CFI_UTIL)      += cfi_util.o
 obj-$(CONFIG_MTD_CFI_STAA)      += cfi_cmdset_0020.o
diff --git a/drivers/mtd/chips/amd_flash.c b/drivers/mtd/chips/amd_flash.c
index 2dafeba3f3d5..fdb91b6f1d97 100644
--- a/drivers/mtd/chips/amd_flash.c
+++ b/drivers/mtd/chips/amd_flash.c
@@ -3,7 +3,7 @@
  *
  * Author: Jonas Holmberg <jonas.holmberg@axis.com>
  *
- * $Id: amd_flash.c,v 1.27 2005/02/04 07:43:09 jonashg Exp $
+ * $Id: amd_flash.c,v 1.28 2005/11/07 11:14:22 gleixner Exp $
  *
  * Copyright (c) 2001 Axis Communications AB
  *
@@ -93,9 +93,9 @@
 #define D6_MASK 0x40
 
 struct amd_flash_private {
-        int device_type;        
-        int interleave; 
-        int numchips;   
+        int device_type;
+        int interleave;
+        int numchips;
         unsigned long chipshift;
 //      const char *im_name;
         struct flchip chips[0];
@@ -253,7 +253,7 @@ static int amd_flash_do_unlock(struct mtd_info *mtd, loff_t ofs, size_t len,
         int i;
         int retval = 0;
         int lock_status;
-      
+
         map = mtd->priv;
 
         /* Pass the whole chip through sector by sector and check for each
@@ -273,7 +273,7 @@ static int amd_flash_do_unlock(struct mtd_info *mtd, loff_t ofs, size_t len,
                                 unlock_sector(map, eraseoffset, is_unlock);
 
                                 lock_status = is_sector_locked(map, eraseoffset);
-                                
+
                                 if (is_unlock && lock_status) {
                                         printk("Cannot unlock sector at address %x length %xx\n",
                                                eraseoffset, merip->erasesize);
@@ -305,7 +305,7 @@ static int amd_flash_lock(struct mtd_info *mtd, loff_t ofs, size_t len)
 /*
  * Reads JEDEC manufacturer ID and device ID and returns the index of the first
  * matching table entry (-1 if not found or alias for already found chip).
- */ 
+ */
 static int probe_new_chip(struct mtd_info *mtd, __u32 base,
                           struct flchip *chips,
                           struct amd_flash_private *private,
@@ -636,7 +636,7 @@ static struct mtd_info *amd_flash_probe(struct map_info *map)
                         { .offset = 0x000000, .erasesize = 0x10000, .numblocks = 31 },
                         { .offset = 0x1F0000, .erasesize = 0x02000, .numblocks =  8 }
                 }
-        } 
+        }
         };
 
         struct mtd_info *mtd;
@@ -701,7 +701,7 @@ static struct mtd_info *amd_flash_probe(struct map_info *map)
 
         mtd->eraseregions = kmalloc(sizeof(struct mtd_erase_region_info) *
                                     mtd->numeraseregions, GFP_KERNEL);
-        if (!mtd->eraseregions) { 
+        if (!mtd->eraseregions) {
                 printk(KERN_WARNING "%s: Failed to allocate "
                        "memory for MTD erase region info\n", map->name);
                 kfree(mtd);
@@ -739,12 +739,12 @@ static struct mtd_info *amd_flash_probe(struct map_info *map)
         mtd->type = MTD_NORFLASH;
         mtd->flags = MTD_CAP_NORFLASH;
         mtd->name = map->name;
-        mtd->erase = amd_flash_erase;   
-        mtd->read = amd_flash_read;     
-        mtd->write = amd_flash_write;   
-        mtd->sync = amd_flash_sync;     
-        mtd->suspend = amd_flash_suspend;       
-        mtd->resume = amd_flash_resume; 
+        mtd->erase = amd_flash_erase;
+        mtd->read = amd_flash_read;
+        mtd->write = amd_flash_write;
+        mtd->sync = amd_flash_sync;
+        mtd->suspend = amd_flash_suspend;
+        mtd->resume = amd_flash_resume;
         mtd->lock = amd_flash_lock;
         mtd->unlock = amd_flash_unlock;
 
@@ -789,7 +789,7 @@ retry:
                        map->name, chip->state);
                 set_current_state(TASK_UNINTERRUPTIBLE);
                 add_wait_queue(&chip->wq, &wait);
-                
+
                 spin_unlock_bh(chip->mutex);
 
                 schedule();
@@ -802,7 +802,7 @@ retry:
                 timeo = jiffies + HZ;
 
                 goto retry;
-        }       
+        }
 
         adr += chip->start;
 
@@ -889,7 +889,7 @@ retry:
                        map->name, chip->state);
                 set_current_state(TASK_UNINTERRUPTIBLE);
                 add_wait_queue(&chip->wq, &wait);
-                
+
                 spin_unlock_bh(chip->mutex);
 
                 schedule();
@@ -901,7 +901,7 @@ retry:
                 timeo = jiffies + HZ;
 
                 goto retry;
-        }       
+        }
 
         chip->state = FL_WRITING;
 
@@ -911,7 +911,7 @@ retry:
         wide_write(map, datum, adr);
 
         times_left = 500000;
-        while (times_left-- && flash_is_busy(map, adr, private->interleave)) { 
+        while (times_left-- && flash_is_busy(map, adr, private->interleave)) {
                 if (need_resched()) {
                         spin_unlock_bh(chip->mutex);
                         schedule();
@@ -989,7 +989,7 @@ static int amd_flash_write(struct mtd_info *mtd, loff_t to , size_t len,
                 if (ret) {
                         return ret;
                 }
-                
+
                 ofs += n;
                 buf += n;
                 (*retlen) += n;
@@ -1002,7 +1002,7 @@ static int amd_flash_write(struct mtd_info *mtd, loff_t to , size_t len,
                         }
                 }
         }
-        
+
         /* We are now aligned, write as much as possible. */
         while(len >= map->buswidth) {
                 __u32 datum;
@@ -1063,7 +1063,7 @@ static int amd_flash_write(struct mtd_info *mtd, loff_t to , size_t len,
                 if (ret) {
                         return ret;
                 }
-                
+
                 (*retlen) += n;
         }
 
@@ -1085,7 +1085,7 @@ retry:
         if (chip->state != FL_READY){
                 set_current_state(TASK_UNINTERRUPTIBLE);
                 add_wait_queue(&chip->wq, &wait);
-                
+
                 spin_unlock_bh(chip->mutex);
 
                 schedule();
@@ -1098,7 +1098,7 @@ retry:
                 timeo = jiffies + HZ;
 
                 goto retry;
-        }       
+        }
 
         chip->state = FL_ERASING;
 
@@ -1106,30 +1106,30 @@ retry:
         ENABLE_VPP(map);
         send_cmd(map, chip->start, CMD_SECTOR_ERASE_UNLOCK_DATA);
         send_cmd_to_addr(map, chip->start, CMD_SECTOR_ERASE_UNLOCK_DATA_2, adr);
-        
+
         timeo = jiffies + (HZ * 20);
 
         spin_unlock_bh(chip->mutex);
         msleep(1000);
         spin_lock_bh(chip->mutex);
-        
+
         while (flash_is_busy(map, adr, private->interleave)) {
 
                 if (chip->state != FL_ERASING) {
                         /* Someone's suspended the erase. Sleep */
                         set_current_state(TASK_UNINTERRUPTIBLE);
                         add_wait_queue(&chip->wq, &wait);
-                        
+
                         spin_unlock_bh(chip->mutex);
                         printk(KERN_INFO "%s: erase suspended. Sleeping\n",
                                map->name);
                         schedule();
                         remove_wait_queue(&chip->wq, &wait);
-                        
+
                         if (signal_pending(current)) {
                                 return -EINTR;
                         }
-                        
+
                         timeo = jiffies + (HZ*2); /* FIXME */
                         spin_lock_bh(chip->mutex);
                         continue;
@@ -1145,7 +1145,7 @@ retry:
 
                         return -EIO;
                 }
-                
+
                 /* Latency issues. Drop the lock, wait a while and retry */
                 spin_unlock_bh(chip->mutex);
 
@@ -1153,7 +1153,7 @@ retry:
                         schedule();
                 else
                         udelay(1);
-                
+
                 spin_lock_bh(chip->mutex);
         }
 
@@ -1180,7 +1180,7 @@ retry:
                         return -EIO;
                 }
         }
-        
+
         DISABLE_VPP(map);
         chip->state = FL_READY;
         wake_up(&chip->wq);
@@ -1246,7 +1246,7 @@ static int amd_flash_erase(struct mtd_info *mtd, struct erase_info *instr)
          * with the erase region at that address.
          */
 
-        while ((i < mtd->numeraseregions) && 
+        while ((i < mtd->numeraseregions) &&
                ((instr->addr + instr->len) >= regions[i].offset)) {
                 i++;
         }
@@ -1293,10 +1293,10 @@ static int amd_flash_erase(struct mtd_info *mtd, struct erase_info *instr)
                         }
                 }
         }
-                
+
         instr->state = MTD_ERASE_DONE;
         mtd_erase_callback(instr);
-        
+
         return 0;
 }
 
@@ -1324,7 +1324,7 @@ static void amd_flash_sync(struct mtd_info *mtd)
                 case FL_JEDEC_QUERY:
                         chip->oldstate = chip->state;
                         chip->state = FL_SYNCING;
-                        /* No need to wake_up() on this state change - 
+                        /* No need to wake_up() on this state change -
                          * as the whole point is that nobody can do anything
                          * with the chip now anyway.
                          */
@@ -1335,13 +1335,13 @@ static void amd_flash_sync(struct mtd_info *mtd)
                 default:
                         /* Not an idle state */
                         add_wait_queue(&chip->wq, &wait);
-                        
+
                         spin_unlock_bh(chip->mutex);
 
                         schedule();
 
                         remove_wait_queue(&chip->wq, &wait);
-                        
+
                         goto retry;
                 }
         }
@@ -1351,7 +1351,7 @@ static void amd_flash_sync(struct mtd_info *mtd)
                 chip = &private->chips[i];
 
                 spin_lock_bh(chip->mutex);
-                
+
                 if (chip->state == FL_SYNCING) {
                         chip->state = chip->oldstate;
                         wake_up(&chip->wq);
diff --git a/drivers/mtd/chips/cfi_cmdset_0001.c b/drivers/mtd/chips/cfi_cmdset_0001.c
index 0cfcd88468e0..143f01a4c170 100644
--- a/drivers/mtd/chips/cfi_cmdset_0001.c
+++ b/drivers/mtd/chips/cfi_cmdset_0001.c
@@ -4,9 +4,9 @@
  *
  * (C) 2000 Red Hat. GPL'd
  *
- * $Id: cfi_cmdset_0001.c,v 1.178 2005/05/19 17:05:43 nico Exp $
+ * $Id: cfi_cmdset_0001.c,v 1.185 2005/11/07 11:14:22 gleixner Exp $
+ *
  *
- * 
  * 10/10/2000   Nicolas Pitre <nico@cam.org>
  *      - completely revamped method functions so they are aware and
  *        independent of the flash geometry (buswidth, interleave, etc.)
@@ -51,6 +51,7 @@
 static int cfi_intelext_read (struct mtd_info *, loff_t, size_t, size_t *, u_char *);
 static int cfi_intelext_write_words(struct mtd_info *, loff_t, size_t, size_t *, const u_char *);
 static int cfi_intelext_write_buffers(struct mtd_info *, loff_t, size_t, size_t *, const u_char *);
+static int cfi_intelext_writev(struct mtd_info *, const struct kvec *, unsigned long, loff_t, size_t *);
 static int cfi_intelext_erase_varsize(struct mtd_info *, struct erase_info *);
 static void cfi_intelext_sync (struct mtd_info *);
 static int cfi_intelext_lock(struct mtd_info *mtd, loff_t ofs, size_t len);
@@ -105,6 +106,7 @@ static struct mtd_chip_driver cfi_intelext_chipdrv = {
 static void cfi_tell_features(struct cfi_pri_intelext *extp)
 {
         int i;
+        printk("  Extended Query version %c.%c\n", extp->MajorVersion, extp->MinorVersion);
         printk("  Feature/Command Support:      %4.4X\n", extp->FeatureSupport);
         printk("     - Chip Erase:              %s\n", extp->FeatureSupport&1?"supported":"unsupported");
         printk("     - Suspend Erase:           %s\n", extp->FeatureSupport&2?"supported":"unsupported");
@@ -116,36 +118,43 @@ static void cfi_tell_features(struct cfi_pri_intelext *extp)
         printk("     - Page-mode read:          %s\n", extp->FeatureSupport&128?"supported":"unsupported");
         printk("     - Synchronous read:        %s\n", extp->FeatureSupport&256?"supported":"unsupported");
         printk("     - Simultaneous operations: %s\n", extp->FeatureSupport&512?"supported":"unsupported");
-        for (i=10; i<32; i++) {
-                if (extp->FeatureSupport & (1<<i)) 
+        printk("     - Extended Flash Array:    %s\n", extp->FeatureSupport&1024?"supported":"unsupported");
+        for (i=11; i<32; i++) {
+                if (extp->FeatureSupport & (1<<i))
                         printk("     - Unknown Bit %X:      supported\n", i);
         }
-        
+
         printk("  Supported functions after Suspend: %2.2X\n", extp->SuspendCmdSupport);
         printk("     - Program after Erase Suspend: %s\n", extp->SuspendCmdSupport&1?"supported":"unsupported");
         for (i=1; i<8; i++) {
                 if (extp->SuspendCmdSupport & (1<<i))
                         printk("     - Unknown Bit %X:               supported\n", i);
         }
-        
+
         printk("  Block Status Register Mask: %4.4X\n", extp->BlkStatusRegMask);
         printk("     - Lock Bit Active:      %s\n", extp->BlkStatusRegMask&1?"yes":"no");
-        printk("     - Valid Bit Active:     %s\n", extp->BlkStatusRegMask&2?"yes":"no");
-        for (i=2; i<16; i++) {
+        printk("     - Lock-Down Bit Active: %s\n", extp->BlkStatusRegMask&2?"yes":"no");
+        for (i=2; i<3; i++) {
                 if (extp->BlkStatusRegMask & (1<<i))
                         printk("     - Unknown Bit %X Active: yes\n",i);
         }
-        
-        printk("  Vcc Logic Supply Optimum Program/Erase Voltage: %d.%d V\n", 
+        printk("     - EFA Lock Bit:         %s\n", extp->BlkStatusRegMask&16?"yes":"no");
+        printk("     - EFA Lock-Down Bit:    %s\n", extp->BlkStatusRegMask&32?"yes":"no");
+        for (i=6; i<16; i++) {
+                if (extp->BlkStatusRegMask & (1<<i))
+                        printk("     - Unknown Bit %X Active: yes\n",i);
+        }
+
+        printk("  Vcc Logic Supply Optimum Program/Erase Voltage: %d.%d V\n",
                extp->VccOptimal >> 4, extp->VccOptimal & 0xf);
         if (extp->VppOptimal)
-                printk("  Vpp Programming Supply Optimum Program/Erase Voltage: %d.%d V\n", 
+                printk("  Vpp Programming Supply Optimum Program/Erase Voltage: %d.%d V\n",
                        extp->VppOptimal >> 4, extp->VppOptimal & 0xf);
 }
 #endif
 
 #ifdef CMDSET0001_DISABLE_ERASE_SUSPEND_ON_WRITE
-/* Some Intel Strata Flash prior to FPO revision C has bugs in this area */ 
+/* Some Intel Strata Flash prior to FPO revision C has bugs in this area */
 static void fixup_intel_strataflash(struct mtd_info *mtd, void* param)
 {
         struct map_info *map = mtd->priv;
@@ -176,7 +185,7 @@ static void fixup_st_m28w320ct(struct mtd_info *mtd, void* param)
 {
         struct map_info *map = mtd->priv;
         struct cfi_private *cfi = map->fldrv_priv;
-        
+
         cfi->cfiq->BufWriteTimeoutTyp = 0;      /* Not supported */
         cfi->cfiq->BufWriteTimeoutMax = 0;      /* Not supported */
 }
@@ -185,7 +194,7 @@ static void fixup_st_m28w320cb(struct mtd_info *mtd, void* param)
 {
         struct map_info *map = mtd->priv;
         struct cfi_private *cfi = map->fldrv_priv;
-        
+
         /* Note this is done after the region info is endian swapped */
         cfi->cfiq->EraseRegionInfo[1] =
                 (cfi->cfiq->EraseRegionInfo[1] & 0xffff0000) | 0x3e;
@@ -207,12 +216,13 @@ static void fixup_use_write_buffers(struct mtd_info *mtd, void *param)
         if (cfi->cfiq->BufWriteTimeoutTyp) {
                 printk(KERN_INFO "Using buffer write method\n" );
                 mtd->write = cfi_intelext_write_buffers;
+                mtd->writev = cfi_intelext_writev;
         }
 }
 
 static struct cfi_fixup cfi_fixup_table[] = {
 #ifdef CMDSET0001_DISABLE_ERASE_SUSPEND_ON_WRITE
-        { CFI_MFR_ANY, CFI_ID_ANY, fixup_intel_strataflash, NULL }, 
+        { CFI_MFR_ANY, CFI_ID_ANY, fixup_intel_strataflash, NULL },
 #endif
 #ifdef CMDSET0001_DISABLE_WRITE_SUSPEND
         { CFI_MFR_ANY, CFI_ID_ANY, fixup_no_write_suspend, NULL },
@@ -252,12 +262,21 @@ read_pri_intelext(struct map_info *map, __u16 adr)
         if (!extp)
                 return NULL;
 
+        if (extp->MajorVersion != '1' ||
+            (extp->MinorVersion < '0' || extp->MinorVersion > '4')) {
+                printk(KERN_ERR "  Unknown Intel/Sharp Extended Query "
+                       "version %c.%c.\n",  extp->MajorVersion,
+                       extp->MinorVersion);
+                kfree(extp);
+                return NULL;
+        }
+
         /* Do some byteswapping if necessary */
         extp->FeatureSupport = le32_to_cpu(extp->FeatureSupport);
         extp->BlkStatusRegMask = le16_to_cpu(extp->BlkStatusRegMask);
         extp->ProtRegAddr = le16_to_cpu(extp->ProtRegAddr);
 
-        if (extp->MajorVersion == '1' && extp->MinorVersion == '3') {
+        if (extp->MajorVersion == '1' && extp->MinorVersion >= '3') {
                 unsigned int extra_size = 0;
                 int nb_parts, i;
 
@@ -266,7 +285,10 @@ read_pri_intelext(struct map_info *map, __u16 adr)
                               sizeof(struct cfi_intelext_otpinfo);
 
                 /* Burst Read info */
-                extra_size += 6;
+                extra_size += 2;
+                if (extp_size < sizeof(*extp) + extra_size)
+                        goto need_more;
+                extra_size += extp->extra[extra_size-1];
 
                 /* Number of hardware-partitions */
                 extra_size += 1;
@@ -274,6 +296,10 @@ read_pri_intelext(struct map_info *map, __u16 adr)
                         goto need_more;
                 nb_parts = extp->extra[extra_size - 1];
 
+                /* skip the sizeof(partregion) field in CFI 1.4 */
+                if (extp->MinorVersion >= '4')
+                        extra_size += 2;
+
                 for (i = 0; i < nb_parts; i++) {
                         struct cfi_intelext_regioninfo *rinfo;
                         rinfo = (struct cfi_intelext_regioninfo *)&extp->extra[extra_size];
@@ -285,6 +311,9 @@ read_pri_intelext(struct map_info *map, __u16 adr)
                                       * sizeof(struct cfi_intelext_blockinfo);
                 }
 
+                if (extp->MinorVersion >= '4')
+                        extra_size += sizeof(struct cfi_intelext_programming_regioninfo);
+
                 if (extp_size < sizeof(*extp) + extra_size) {
                         need_more:
                         extp_size = sizeof(*extp) + extra_size;
@@ -298,7 +327,7 @@ read_pri_intelext(struct map_info *map, __u16 adr)
                         goto again;
                 }
         }
-                
+
         return extp;
 }
 
@@ -339,7 +368,7 @@ struct mtd_info *cfi_cmdset_0001(struct map_info *map, int primary)
         mtd->reboot_notifier.notifier_call = cfi_intelext_reboot;
 
         if (cfi->cfi_mode == CFI_MODE_CFI) {
-                /* 
+                /*
                  * It's a real CFI chip, not one for which the probe
                  * routine faked a CFI structure. So we read the feature
                  * table from it.
@@ -354,14 +383,14 @@ struct mtd_info *cfi_cmdset_0001(struct map_info *map, int primary)
                 }
 
                 /* Install our own private info structure */
-                cfi->cmdset_priv = extp;        
+                cfi->cmdset_priv = extp;
 
                 cfi_fixup(mtd, cfi_fixup_table);
 
 #ifdef DEBUG_CFI_FEATURES
                 /* Tell the user about it in lots of lovely detail */
                 cfi_tell_features(extp);
-#endif  
+#endif
 
                 if(extp->SuspendCmdSupport & 1) {
                         printk(KERN_NOTICE "cfi_cmdset_0001: Erase suspend on write enabled\n");
@@ -379,10 +408,10 @@ struct mtd_info *cfi_cmdset_0001(struct map_info *map, int primary)
                 cfi->chips[i].buffer_write_time = 1<<cfi->cfiq->BufWriteTimeoutTyp;
                 cfi->chips[i].erase_time = 1<<cfi->cfiq->BlockEraseTimeoutTyp;
                 cfi->chips[i].ref_point_counter = 0;
-        }               
+        }
 
         map->fldrv = &cfi_intelext_chipdrv;
-        
+
         return cfi_intelext_setup(mtd);
 }
 
@@ -399,13 +428,13 @@ static struct mtd_info *cfi_intelext_setup(struct mtd_info *mtd)
         mtd->size = devsize * cfi->numchips;
 
         mtd->numeraseregions = cfi->cfiq->NumEraseRegions * cfi->numchips;
-        mtd->eraseregions = kmalloc(sizeof(struct mtd_erase_region_info) 
+        mtd->eraseregions = kmalloc(sizeof(struct mtd_erase_region_info)
                         * mtd->numeraseregions, GFP_KERNEL);
-        if (!mtd->eraseregions) { 
+        if (!mtd->eraseregions) {
                 printk(KERN_ERR "Failed to allocate memory for MTD erase region info\n");
                 goto setup_err;
         }
-        
+
         for (i=0; i<cfi->cfiq->NumEraseRegions; i++) {
                 unsigned long ernum, ersize;
                 ersize = ((cfi->cfiq->EraseRegionInfo[i] >> 8) & ~0xff) * cfi->interleave;
@@ -429,7 +458,7 @@ static struct mtd_info *cfi_intelext_setup(struct mtd_info *mtd)
         }
 
         for (i=0; i<mtd->numeraseregions;i++){
-                printk(KERN_DEBUG "%d: offset=0x%x,size=0x%x,blocks=%d\n",
+                printk(KERN_DEBUG "erase region %d: offset=0x%x,size=0x%x,blocks=%d\n",
                        i,mtd->eraseregions[i].offset,
                        mtd->eraseregions[i].erasesize,
                        mtd->eraseregions[i].numblocks);
@@ -455,8 +484,7 @@ static struct mtd_info *cfi_intelext_setup(struct mtd_info *mtd)
 
  setup_err:
         if(mtd) {
-                if(mtd->eraseregions)
-                        kfree(mtd->eraseregions);
+                kfree(mtd->eraseregions);
                 kfree(mtd);
         }
         kfree(cfi->cmdset_priv);
@@ -481,7 +509,7 @@ static int cfi_intelext_partition_fixup(struct mtd_info *mtd,
          * arrangement at this point. This can be rearranged in the future
          * if someone feels motivated enough.  --nico
          */
-        if (extp && extp->MajorVersion == '1' && extp->MinorVersion == '3'
+        if (extp && extp->MajorVersion == '1' && extp->MinorVersion >= '3'
             && extp->FeatureSupport & (1 << 9)) {
                 struct cfi_private *newcfi;
                 struct flchip *chip;
@@ -493,12 +521,16 @@ static int cfi_intelext_partition_fixup(struct mtd_info *mtd,
                        sizeof(struct cfi_intelext_otpinfo);
 
                 /* Burst Read info */
-                offs += 6;
+                offs += extp->extra[offs+1]+2;
 
                 /* Number of partition regions */
                 numregions = extp->extra[offs];
                 offs += 1;
 
+                /* skip the sizeof(partregion) field in CFI 1.4 */
+                if (extp->MinorVersion >= '4')
+                        offs += 2;
+
                 /* Number of hardware partitions */
                 numparts = 0;
                 for (i = 0; i < numregions; i++) {
@@ -510,6 +542,20 @@ static int cfi_intelext_partition_fixup(struct mtd_info *mtd,
                                   sizeof(struct cfi_intelext_blockinfo);
                 }
 
+                /* Programming Region info */
+                if (extp->MinorVersion >= '4') {
+                        struct cfi_intelext_programming_regioninfo *prinfo;
+                        prinfo = (struct cfi_intelext_programming_regioninfo *)&extp->extra[offs];
+                        MTD_PROGREGION_SIZE(mtd) = cfi->interleave << prinfo->ProgRegShift;
+                        MTD_PROGREGION_CTRLMODE_VALID(mtd) = cfi->interleave * prinfo->ControlValid;
+                        MTD_PROGREGION_CTRLMODE_INVALID(mtd) = cfi->interleave * prinfo->ControlInvalid;
+                        mtd->flags |= MTD_PROGRAM_REGIONS;
+                        printk(KERN_DEBUG "%s: program region size/ctrl_valid/ctrl_inval = %d/%d/%d\n",
+                               map->name, MTD_PROGREGION_SIZE(mtd),
+                               MTD_PROGREGION_CTRLMODE_VALID(mtd),
+                               MTD_PROGREGION_CTRLMODE_INVALID(mtd));
+                }
+
                 /*
                  * All functions below currently rely on all chips having
                  * the same geometry so we'll just assume that all hardware
@@ -654,8 +700,8 @@ static int get_chip(struct map_info *map, struct flchip *chip, unsigned long adr
                                 break;
 
                         if (time_after(jiffies, timeo)) {
-                                printk(KERN_ERR "Waiting for chip to be ready timed out. Status %lx\n", 
-                                       status.x[0]);
+                                printk(KERN_ERR "%s: Waiting for chip to be ready timed out. Status %lx\n",
+                                       map->name, status.x[0]);
                                 return -EIO;
                         }
                         spin_unlock(chip->mutex);
@@ -664,7 +710,7 @@ static int get_chip(struct map_info *map, struct flchip *chip, unsigned long adr
                         /* Someone else might have been playing with it. */
                         goto retry;
                 }
-                                
+
         case FL_READY:
         case FL_CFI_QUERY:
         case FL_JEDEC_QUERY:
@@ -702,8 +748,8 @@ static int get_chip(struct map_info *map, struct flchip *chip, unsigned long adr
                                 map_write(map, CMD(0x70), adr);
                                 chip->state = FL_ERASING;
                                 chip->oldstate = FL_READY;
-                                printk(KERN_ERR "Chip not ready after erase "
-                                       "suspended: status = 0x%lx\n", status.x[0]);
+                                printk(KERN_ERR "%s: Chip not ready after erase "
+                                       "suspended: status = 0x%lx\n", map->name, status.x[0]);
                                 return -EIO;
                         }
 
@@ -783,14 +829,14 @@ static void put_chip(struct map_info *map, struct flchip *chip, unsigned long ad
         switch(chip->oldstate) {
         case FL_ERASING:
                 chip->state = chip->oldstate;
-                /* What if one interleaved chip has finished and the 
+                /* What if one interleaved chip has finished and the
                    other hasn't? The old code would leave the finished
-                   one in READY mode. That's bad, and caused -EROFS 
+                   one in READY mode. That's bad, and caused -EROFS
                    errors to be returned from do_erase_oneblock because
                    that's the only bit it checked for at the time.
-                   As the state machine appears to explicitly allow 
+                   As the state machine appears to explicitly allow
                    sending the 0x70 (Read Status) command to an erasing
-                   chip and expecting it to be ignored, that's what we 
+                   chip and expecting it to be ignored, that's what we
                    do. */
                 map_write(map, CMD(0xd0), adr);
                 map_write(map, CMD(0x70), adr);
@@ -810,7 +856,7 @@ static void put_chip(struct map_info *map, struct flchip *chip, unsigned long ad
                 DISABLE_VPP(map);
                 break;
         default:
-                printk(KERN_ERR "put_chip() called with oldstate %d!!\n", chip->oldstate);
+                printk(KERN_ERR "%s: put_chip() called with oldstate %d!!\n", map->name, chip->oldstate);
         }
         wake_up(&chip->wq);
 }
@@ -1026,8 +1072,8 @@ static int do_point_onechip (struct map_info *map, struct flchip *chip, loff_t a
 
         adr += chip->start;
 
-        /* Ensure cmd read/writes are aligned. */ 
-        cmd_addr = adr & ~(map_bankwidth(map)-1); 
+        /* Ensure cmd read/writes are aligned. */
+        cmd_addr = adr & ~(map_bankwidth(map)-1);
 
         spin_lock(chip->mutex);
 
@@ -1055,7 +1101,7 @@ static int cfi_intelext_point (struct mtd_info *mtd, loff_t from, size_t len, si
 
         if (!map->virt || (from + len > mtd->size))
                 return -EINVAL;
-        
+
         *mtdbuf = (void *)map->virt + from;
         *retlen = 0;
 
@@ -1082,7 +1128,7 @@ static int cfi_intelext_point (struct mtd_info *mtd, loff_t from, size_t len, si
 
                 *retlen += thislen;
                 len -= thislen;
-                
+
                 ofs = 0;
                 chipnum++;
         }
@@ -1121,7 +1167,7 @@ static void cfi_intelext_unpoint (struct mtd_info *mtd, u_char *addr, loff_t fro
                         if(chip->ref_point_counter == 0)
                                 chip->state = FL_READY;
                 } else
-                        printk(KERN_ERR "Warning: unpoint called on non pointed region\n"); /* Should this give an error? */
+                        printk(KERN_ERR "%s: Warning: unpoint called on non pointed region\n", map->name); /* Should this give an error? */
 
                 put_chip(map, chip, chip->start);
                 spin_unlock(chip->mutex);
@@ -1140,8 +1186,8 @@ static inline int do_read_onechip(struct map_info *map, struct flchip *chip, lof
 
         adr += chip->start;
 
-        /* Ensure cmd read/writes are aligned. */ 
-        cmd_addr = adr & ~(map_bankwidth(map)-1); 
+        /* Ensure cmd read/writes are aligned. */
+        cmd_addr = adr & ~(map_bankwidth(map)-1);
 
         spin_lock(chip->mutex);
         ret = get_chip(map, chip, cmd_addr, FL_READY);
@@ -1196,7 +1242,7 @@ static int cfi_intelext_read (struct mtd_info *mtd, loff_t from, size_t len, siz
                 *retlen += thislen;
                 len -= thislen;
                 buf += thislen;
-                
+
                 ofs = 0;
                 chipnum++;
         }
@@ -1213,12 +1259,17 @@ static int __xipram do_write_oneword(struct map_info *map, struct flchip *chip,
 
         adr += chip->start;
 
-        /* Let's determine this according to the interleave only once */
+        /* Let's determine those according to the interleave only once */
         status_OK = CMD(0x80);
         switch (mode) {
-        case FL_WRITING:   write_cmd = CMD(0x40); break;
-        case FL_OTP_WRITE: write_cmd = CMD(0xc0); break;
-        default: return -EINVAL;
+        case FL_WRITING:
+                write_cmd = (cfi->cfiq->P_ID != 0x0200) ? CMD(0x40) : CMD(0x41);
+                break;
+        case FL_OTP_WRITE:
+                write_cmd = CMD(0xc0);
+                break;
+        default:
+                return -EINVAL;
         }
 
         spin_lock(chip->mutex);
@@ -1259,12 +1310,13 @@ static int __xipram do_write_oneword(struct map_info *map, struct flchip *chip,
                 status = map_read(map, adr);
                 if (map_word_andequal(map, status, status_OK, status_OK))
                         break;
-                
+
                 /* OK Still waiting */
                 if (time_after(jiffies, timeo)) {
+                        map_write(map, CMD(0x70), adr);
                         chip->state = FL_STATUS;
                         xip_enable(map, chip, adr);
-                        printk(KERN_ERR "waiting for chip to be ready timed out in word write\n");
+                        printk(KERN_ERR "%s: word write error (status timeout)\n", map->name);
                         ret = -EIO;
                         goto out;
                 }
@@ -1276,27 +1328,39 @@ static int __xipram do_write_oneword(struct map_info *map, struct flchip *chip,
         if (!z) {
                 chip->word_write_time--;
                 if (!chip->word_write_time)
-                        chip->word_write_time++;
+                        chip->word_write_time = 1;
         }
-        if (z > 1) 
+        if (z > 1)
                 chip->word_write_time++;
 
         /* Done and happy. */
         chip->state = FL_STATUS;
 
-        /* check for lock bit */
-        if (map_word_bitsset(map, status, CMD(0x02))) {
-                /* clear status */
+        /* check for errors */
+        if (map_word_bitsset(map, status, CMD(0x1a))) {
+                unsigned long chipstatus = MERGESTATUS(status);
+
+                /* reset status */
                 map_write(map, CMD(0x50), adr);
-                /* put back into read status register mode */
                 map_write(map, CMD(0x70), adr);
-                ret = -EROFS;
+                xip_enable(map, chip, adr);
+
+                if (chipstatus & 0x02) {
+                        ret = -EROFS;
+                } else if (chipstatus & 0x08) {
+                        printk(KERN_ERR "%s: word write error (bad VPP)\n", map->name);
+                        ret = -EIO;
+                } else {
+                        printk(KERN_ERR "%s: word write error (status 0x%lx)\n", map->name, chipstatus);
+                        ret = -EINVAL;
+                }
+
+                goto out;
         }
 
         xip_enable(map, chip, adr);
  out:   put_chip(map, chip, adr);
         spin_unlock(chip->mutex);
-
         return ret;
 }
 
@@ -1329,7 +1393,7 @@ static int cfi_intelext_write_words (struct mtd_info *mtd, loff_t to , size_t le
 
                 ret = do_write_oneword(map, &cfi->chips[chipnum],
                                                bus_ofs, datum, FL_WRITING);
-                if (ret) 
+                if (ret)
                         return ret;
 
                 len -= n;
@@ -1338,13 +1402,13 @@ static int cfi_intelext_write_words (struct mtd_info *mtd, loff_t to , size_t le
                 (*retlen) += n;
 
                 if (ofs >> cfi->chipshift) {
-                        chipnum ++; 
+                        chipnum ++;
                         ofs = 0;
                         if (chipnum == cfi->numchips)
                                 return 0;
                 }
         }
-        
+
         while(len >= map_bankwidth(map)) {
                 map_word datum = map_word_load(map, buf);
 
@@ -1359,7 +1423,7 @@ static int cfi_intelext_write_words (struct mtd_info *mtd, loff_t to , size_t le
                 len -= map_bankwidth(map);
 
                 if (ofs >> cfi->chipshift) {
-                        chipnum ++; 
+                        chipnum ++;
                         ofs = 0;
                         if (chipnum == cfi->numchips)
                                 return 0;
@@ -1374,9 +1438,9 @@ static int cfi_intelext_write_words (struct mtd_info *mtd, loff_t to , size_t le
 
                 ret = do_write_oneword(map, &cfi->chips[chipnum],
                                        ofs, datum, FL_WRITING);
-                if (ret) 
+                if (ret)
                         return ret;
-                
+
                 (*retlen) += len;
         }
 
@@ -1384,20 +1448,24 @@ static int cfi_intelext_write_words (struct mtd_info *mtd, loff_t to , size_t le
 }
 
 
-static int __xipram do_write_buffer(struct map_info *map, struct flchip *chip, 
-                                    unsigned long adr, const u_char *buf, int len)
+static int __xipram do_write_buffer(struct map_info *map, struct flchip *chip,
+                                    unsigned long adr, const struct kvec **pvec,
+                                    unsigned long *pvec_seek, int len)
 {
         struct cfi_private *cfi = map->fldrv_priv;
-        map_word status, status_OK;
+        map_word status, status_OK, write_cmd, datum;
         unsigned long cmd_adr, timeo;
-        int wbufsize, z, ret=0, bytes, words;
+        int wbufsize, z, ret=0, word_gap, words;
+        const struct kvec *vec;
+        unsigned long vec_seek;
 
         wbufsize = cfi_interleave(cfi) << cfi->cfiq->MaxBufWriteSize;
         adr += chip->start;
         cmd_adr = adr & ~(wbufsize-1);
-        
+
         /* Let's determine this according to the interleave only once */
         status_OK = CMD(0x80);
+        write_cmd = (cfi->cfiq->P_ID != 0x0200) ? CMD(0xe8) : CMD(0xe9);
 
         spin_lock(chip->mutex);
         ret = get_chip(map, chip, cmd_adr, FL_WRITING);
@@ -1411,7 +1479,7 @@ static int __xipram do_write_buffer(struct map_info *map, struct flchip *chip,
         xip_disable(map, chip, cmd_adr);
 
         /* §4.8 of the 28FxxxJ3A datasheet says "Any time SR.4 and/or SR.5 is set
-           [...], the device will not accept any more Write to Buffer commands". 
+           [...], the device will not accept any more Write to Buffer commands".
            So we must check here and reset those bits if they're set. Otherwise
            we're just pissing in the wind */
         if (chip->state != FL_STATUS)
@@ -1429,7 +1497,7 @@ static int __xipram do_write_buffer(struct map_info *map, struct flchip *chip,
 
         z = 0;
         for (;;) {
-                map_write(map, CMD(0xe8), cmd_adr);
+                map_write(map, write_cmd, cmd_adr);
 
                 status = map_read(map, cmd_adr);
                 if (map_word_andequal(map, status, status_OK, status_OK))
@@ -1447,41 +1515,66 @@ static int __xipram do_write_buffer(struct map_info *map, struct flchip *chip,
                         map_write(map, CMD(0x50), cmd_adr);
                         map_write(map, CMD(0x70), cmd_adr);
                         xip_enable(map, chip, cmd_adr);
-                        printk(KERN_ERR "Chip not ready for buffer write. status = %lx, Xstatus = %lx\n",
-                               status.x[0], Xstatus.x[0]);
+                        printk(KERN_ERR "%s: Chip not ready for buffer write. status = %lx, Xstatus = %lx\n",
+                               map->name, status.x[0], Xstatus.x[0]);
                         ret = -EIO;
                         goto out;
                 }
         }
 
+        /* Figure out the number of words to write */
+        word_gap = (-adr & (map_bankwidth(map)-1));
+        words = (len - word_gap + map_bankwidth(map) - 1) / map_bankwidth(map);
+        if (!word_gap) {
+                words--;
+        } else {
+                word_gap = map_bankwidth(map) - word_gap;
+                adr -= word_gap;
+                datum = map_word_ff(map);
+        }
+
         /* Write length of data to come */
-        bytes = len & (map_bankwidth(map)-1);
-        words = len / map_bankwidth(map);
-        map_write(map, CMD(words - !bytes), cmd_adr );
+        map_write(map, CMD(words), cmd_adr );
 
         /* Write data */
-        z = 0;
-        while(z < words * map_bankwidth(map)) {
-                map_word datum = map_word_load(map, buf);
-                map_write(map, datum, adr+z);
+        vec = *pvec;
+        vec_seek = *pvec_seek;
+        do {
+                int n = map_bankwidth(map) - word_gap;
+                if (n > vec->iov_len - vec_seek)
+                        n = vec->iov_len - vec_seek;
+                if (n > len)
+                        n = len;
 
-                z += map_bankwidth(map);
-                buf += map_bankwidth(map);
-        }
+                if (!word_gap && len < map_bankwidth(map))
+                        datum = map_word_ff(map);
 
-        if (bytes) {
-                map_word datum;
+                datum = map_word_load_partial(map, datum,
+                                              vec->iov_base + vec_seek,
+                                              word_gap, n);
 
-                datum = map_word_ff(map);
-                datum = map_word_load_partial(map, datum, buf, 0, bytes);
-                map_write(map, datum, adr+z);
-        }
+                len -= n;
+                word_gap += n;
+                if (!len || word_gap == map_bankwidth(map)) {
+                        map_write(map, datum, adr);
+                        adr += map_bankwidth(map);
+                        word_gap = 0;
+                }
+
+                vec_seek += n;
+                if (vec_seek == vec->iov_len) {
+                        vec++;
+                        vec_seek = 0;
+                }
+        } while (len);
+        *pvec = vec;
+        *pvec_seek = vec_seek;
 
         /* GO GO GO */
         map_write(map, CMD(0xd0), cmd_adr);
         chip->state = FL_WRITING;
 
-        INVALIDATE_CACHE_UDELAY(map, chip, 
+        INVALIDATE_CACHE_UDELAY(map, chip,
                                 cmd_adr, len,
                                 chip->buffer_write_time);
 
@@ -1507,13 +1600,14 @@ static int __xipram do_write_buffer(struct map_info *map, struct flchip *chip,
 
                 /* OK Still waiting */
                 if (time_after(jiffies, timeo)) {
+                        map_write(map, CMD(0x70), cmd_adr);
                         chip->state = FL_STATUS;
                         xip_enable(map, chip, cmd_adr);
-                        printk(KERN_ERR "waiting for chip to be ready timed out in bufwrite\n");
+                        printk(KERN_ERR "%s: buffer write error (status timeout)\n", map->name);
                         ret = -EIO;
                         goto out;
                 }
-                
+
                 /* Latency issues. Drop the lock, wait a while and retry */
                 z++;
                 UDELAY(map, chip, cmd_adr, 1);
@@ -1521,21 +1615,34 @@ static int __xipram do_write_buffer(struct map_info *map, struct flchip *chip,
         if (!z) {
                 chip->buffer_write_time--;
                 if (!chip->buffer_write_time)
-                        chip->buffer_write_time++;
+                        chip->buffer_write_time = 1;
         }
-        if (z > 1) 
+        if (z > 1)
                 chip->buffer_write_time++;
 
         /* Done and happy. */
         chip->state = FL_STATUS;
 
-        /* check for lock bit */
-        if (map_word_bitsset(map, status, CMD(0x02))) {
-                /* clear status */
+        /* check for errors */
+        if (map_word_bitsset(map, status, CMD(0x1a))) {
+                unsigned long chipstatus = MERGESTATUS(status);
+
+                /* reset status */
                 map_write(map, CMD(0x50), cmd_adr);
-                /* put back into read status register mode */
-                map_write(map, CMD(0x70), adr);
-                ret = -EROFS;
+                map_write(map, CMD(0x70), cmd_adr);
+                xip_enable(map, chip, cmd_adr);
+
+                if (chipstatus & 0x02) {
+                        ret = -EROFS;
+                } else if (chipstatus & 0x08) {
+                        printk(KERN_ERR "%s: buffer write error (bad VPP)\n", map->name);
+                        ret = -EIO;
+                } else {
+                        printk(KERN_ERR "%s: buffer write error (status 0x%lx)\n", map->name, chipstatus);
+                        ret = -EINVAL;
+                }
+
+                goto out;
         }
 
         xip_enable(map, chip, cmd_adr);
@@ -1544,70 +1651,65 @@ static int __xipram do_write_buffer(struct map_info *map, struct flchip *chip,
         return ret;
 }
 
-static int cfi_intelext_write_buffers (struct mtd_info *mtd, loff_t to, 
-                                       size_t len, size_t *retlen, const u_char *buf)
+static int cfi_intelext_writev (struct mtd_info *mtd, const struct kvec *vecs,
+                                unsigned long count, loff_t to, size_t *retlen)
 {
         struct map_info *map = mtd->priv;
         struct cfi_private *cfi = map->fldrv_priv;
         int wbufsize = cfi_interleave(cfi) << cfi->cfiq->MaxBufWriteSize;
         int ret = 0;
         int chipnum;
-        unsigned long ofs;
+        unsigned long ofs, vec_seek, i;
+        size_t len = 0;
+
+        for (i = 0; i < count; i++)
+                len += vecs[i].iov_len;
 
         *retlen = 0;
         if (!len)
                 return 0;
 
         chipnum = to >> cfi->chipshift;
-        ofs = to  - (chipnum << cfi->chipshift);
-
-        /* If it's not bus-aligned, do the first word write */
-        if (ofs & (map_bankwidth(map)-1)) {
-                size_t local_len = (-ofs)&(map_bankwidth(map)-1);
-                if (local_len > len)
-                        local_len = len;
-                ret = cfi_intelext_write_words(mtd, to, local_len,
-                                               retlen, buf);
-                if (ret)
-                        return ret;
-                ofs += local_len;
-                buf += local_len;
-                len -= local_len;
-
-                if (ofs >> cfi->chipshift) {
-                        chipnum ++;
-                        ofs = 0;
-                        if (chipnum == cfi->numchips)
-                                return 0;
-                }
-        }
+        ofs = to - (chipnum << cfi->chipshift);
+        vec_seek = 0;
 
-        while(len) {
+        do {
                 /* We must not cross write block boundaries */
                 int size = wbufsize - (ofs & (wbufsize-1));
 
                 if (size > len)
                         size = len;
-                ret = do_write_buffer(map, &cfi->chips[chipnum], 
-                                      ofs, buf, size);
+                ret = do_write_buffer(map, &cfi->chips[chipnum],
+                                      ofs, &vecs, &vec_seek, size);
                 if (ret)
                         return ret;
 
                 ofs += size;
-                buf += size;
                 (*retlen) += size;
                 len -= size;
 
                 if (ofs >> cfi->chipshift) {
-                        chipnum ++; 
+                        chipnum ++;
                         ofs = 0;
                         if (chipnum == cfi->numchips)
                                 return 0;
                 }
-        }
+        } while (len);
+
         return 0;
 }
 
+static int cfi_intelext_write_buffers (struct mtd_info *mtd, loff_t to,
+                                       size_t len, size_t *retlen, const u_char *buf)
+{
+        struct kvec vec;
+
+        vec.iov_base = (void *) buf;
+        vec.iov_len = len;
+
+        return cfi_intelext_writev(mtd, &vec, 1, to, retlen);
+}
+
 static int __xipram do_erase_oneblock(struct map_info *map, struct flchip *chip,
                                       unsigned long adr, int len, void *thunk)
 {
@@ -1673,23 +1775,17 @@ static int __xipram do_erase_oneblock(struct map_info *map, struct flchip *chip,
                 status = map_read(map, adr);
                 if (map_word_andequal(map, status, status_OK, status_OK))
                         break;
-                
+
                 /* OK Still waiting */
                 if (time_after(jiffies, timeo)) {
-                        map_word Xstatus;
                         map_write(map, CMD(0x70), adr);
                         chip->state = FL_STATUS;
-                        Xstatus = map_read(map, adr);
-                        /* Clear status bits */
-                        map_write(map, CMD(0x50), adr);
-                        map_write(map, CMD(0x70), adr);
                         xip_enable(map, chip, adr);
-                        printk(KERN_ERR "waiting for erase at %08lx to complete timed out. status = %lx, Xstatus = %lx.\n",
-                               adr, status.x[0], Xstatus.x[0]);
+                        printk(KERN_ERR "%s: block erase error: (status timeout)\n", map->name);
                         ret = -EIO;
                         goto out;
                 }
-                
+
                 /* Latency issues. Drop the lock, wait a while and retry */
                 UDELAY(map, chip, adr, 1000000/HZ);
         }
@@ -1699,43 +1795,40 @@ static int __xipram do_erase_oneblock(struct map_info *map, struct flchip *chip,
         chip->state = FL_STATUS;
         status = map_read(map, adr);
 
-        /* check for lock bit */
+        /* check for errors */
         if (map_word_bitsset(map, status, CMD(0x3a))) {
-                unsigned long chipstatus;
+                unsigned long chipstatus = MERGESTATUS(status);
 
                 /* Reset the error bits */
                 map_write(map, CMD(0x50), adr);
                 map_write(map, CMD(0x70), adr);
                 xip_enable(map, chip, adr);
 
-                chipstatus = MERGESTATUS(status);
-
                 if ((chipstatus & 0x30) == 0x30) {
-                        printk(KERN_NOTICE "Chip reports improper command sequence: status 0x%lx\n", chipstatus);
-                        ret = -EIO;
+                        printk(KERN_ERR "%s: block erase error: (bad command sequence, status 0x%lx)\n", map->name, chipstatus);
+                        ret = -EINVAL;
                 } else if (chipstatus & 0x02) {
                         /* Protection bit set */
                         ret = -EROFS;
                 } else if (chipstatus & 0x8) {
                         /* Voltage */
-                        printk(KERN_WARNING "Chip reports voltage low on erase: status 0x%lx\n", chipstatus);
+                        printk(KERN_ERR "%s: block erase error: (bad VPP)\n", map->name);
                         ret = -EIO;
-                } else if (chipstatus & 0x20) {
-                        if (retries--) {
-                                printk(KERN_DEBUG "Chip erase failed at 0x%08lx: status 0x%lx. Retrying...\n", adr, chipstatus);
-                                timeo = jiffies + HZ;
-                                put_chip(map, chip, adr);
-                                spin_unlock(chip->mutex);
-                                goto retry;
-                        }
-                        printk(KERN_DEBUG "Chip erase failed at 0x%08lx: status 0x%lx\n", adr, chipstatus);
+                } else if (chipstatus & 0x20 && retries--) {
+                        printk(KERN_DEBUG "block erase failed at 0x%08lx: status 0x%lx. Retrying...\n", adr, chipstatus);
+                        timeo = jiffies + HZ;
+                        put_chip(map, chip, adr);
+                        spin_unlock(chip->mutex);
+                        goto retry;
+                } else {
+                        printk(KERN_ERR "%s: block erase failed at 0x%08lx (status 0x%lx)\n", map->name, adr, chipstatus);
                         ret = -EIO;
                 }
-        } else {
-                xip_enable(map, chip, adr);
-                ret = 0;
+
+                goto out;
         }
 
+        xip_enable(map, chip, adr);
  out:   put_chip(map, chip, adr);
         spin_unlock(chip->mutex);
         return ret;
@@ -1755,7 +1848,7 @@ int cfi_intelext_erase_varsize(struct mtd_info *mtd, struct erase_info *instr)
 
         instr->state = MTD_ERASE_DONE;
         mtd_erase_callback(instr);
-        
+
         return 0;
 }
 
@@ -1776,7 +1869,7 @@ static void cfi_intelext_sync (struct mtd_info *mtd)
                 if (!ret) {
                         chip->oldstate = chip->state;
                         chip->state = FL_SYNCING;
-                        /* No need to wake_up() on this state change - 
+                        /* No need to wake_up() on this state change -
                          * as the whole point is that nobody can do anything
                          * with the chip now anyway.
                          */
@@ -1790,7 +1883,7 @@ static void cfi_intelext_sync (struct mtd_info *mtd)
                 chip = &cfi->chips[i];
 
                 spin_lock(chip->mutex);
-                
+
                 if (chip->state == FL_SYNCING) {
                         chip->state = chip->oldstate;
                         chip->oldstate = FL_READY;
@@ -1847,7 +1940,7 @@ static int __xipram do_xxlock_oneblock(struct map_info *map, struct flchip *chip
 
         ENABLE_VPP(map);
         xip_disable(map, chip, adr);
-        
+
         map_write(map, CMD(0x60), adr);
         if (thunk == DO_XXLOCK_ONEBLOCK_LOCK) {
                 map_write(map, CMD(0x01), adr);
@@ -1875,25 +1968,22 @@ static int __xipram do_xxlock_oneblock(struct map_info *map, struct flchip *chip
                 status = map_read(map, adr);
                 if (map_word_andequal(map, status, status_OK, status_OK))
                         break;
-                
+
                 /* OK Still waiting */
                 if (time_after(jiffies, timeo)) {
-                        map_word Xstatus;
                         map_write(map, CMD(0x70), adr);
                         chip->state = FL_STATUS;
-                        Xstatus = map_read(map, adr);
                         xip_enable(map, chip, adr);
-                        printk(KERN_ERR "waiting for unlock to complete timed out. status = %lx, Xstatus = %lx.\n",
-                               status.x[0], Xstatus.x[0]);
+                        printk(KERN_ERR "%s: block unlock error: (status timeout)\n", map->name);
                         put_chip(map, chip, adr);
                         spin_unlock(chip->mutex);
                         return -EIO;
                 }
-                
+
                 /* Latency issues. Drop the lock, wait a while and retry */
                 UDELAY(map, chip, adr, 1);
         }
-        
+
         /* Done and happy. */
         chip->state = FL_STATUS;
         xip_enable(map, chip, adr);
@@ -1913,9 +2003,9 @@ static int cfi_intelext_lock(struct mtd_info *mtd, loff_t ofs, size_t len)
                 ofs, len, 0);
 #endif
 
-        ret = cfi_varsize_frob(mtd, do_xxlock_oneblock, 
+        ret = cfi_varsize_frob(mtd, do_xxlock_oneblock,
                 ofs, len, DO_XXLOCK_ONEBLOCK_LOCK);
-        
+
 #ifdef DEBUG_LOCK_BITS
         printk(KERN_DEBUG "%s: lock status after, ret=%d\n",
                __FUNCTION__, ret);
@@ -1939,20 +2029,20 @@ static int cfi_intelext_unlock(struct mtd_info *mtd, loff_t ofs, size_t len)
 
         ret = cfi_varsize_frob(mtd, do_xxlock_oneblock,
                                         ofs, len, DO_XXLOCK_ONEBLOCK_UNLOCK);
-        
+
 #ifdef DEBUG_LOCK_BITS
         printk(KERN_DEBUG "%s: lock status after, ret=%d\n",
                __FUNCTION__, ret);
-        cfi_varsize_frob(mtd, do_printlockstatus_oneblock, 
+        cfi_varsize_frob(mtd, do_printlockstatus_oneblock,
                 ofs, len, 0);
 #endif
-        
+
         return ret;
 }
 
 #ifdef CONFIG_MTD_OTP
 
-typedef int (*otp_op_t)(struct map_info *map, struct flchip *chip, 
+typedef int (*otp_op_t)(struct map_info *map, struct flchip *chip,
                         u_long data_offset, u_char *buf, u_int size,
                         u_long prot_offset, u_int groupno, u_int groupsize);
 
@@ -2003,7 +2093,7 @@ do_otp_write(struct map_info *map, struct flchip *chip, u_long offset,
 
                 datum = map_word_load_partial(map, datum, buf, gap, n);
                 ret = do_write_oneword(map, chip, bus_ofs, datum, FL_OTP_WRITE);
-                if (ret) 
+                if (ret)
                         return ret;
 
                 offset += n;
@@ -2196,7 +2286,7 @@ static int cfi_intelext_lock_user_prot_reg(struct mtd_info *mtd,
                                      NULL, do_otp_lock, 1);
 }
 
-static int cfi_intelext_get_fact_prot_info(struct mtd_info *mtd, 
+static int cfi_intelext_get_fact_prot_info(struct mtd_info *mtd,
                                            struct otp_info *buf, size_t len)
 {
         size_t retlen;
@@ -2239,7 +2329,7 @@ static int cfi_intelext_suspend(struct mtd_info *mtd)
                         if (chip->oldstate == FL_READY) {
                                 chip->oldstate = chip->state;
                                 chip->state = FL_PM_SUSPENDED;
-                                /* No need to wake_up() on this state change - 
+                                /* No need to wake_up() on this state change -
                                  * as the whole point is that nobody can do anything
                                  * with the chip now anyway.
                                  */
@@ -2267,9 +2357,9 @@ static int cfi_intelext_suspend(struct mtd_info *mtd)
         if (ret) {
                 for (i--; i >=0; i--) {
                         chip = &cfi->chips[i];
-                        
+
                         spin_lock(chip->mutex);
-                        
+
                         if (chip->state == FL_PM_SUSPENDED) {
                                 /* No need to force it into a known state here,
                                    because we're returning failure, and it didn't
@@ -2280,8 +2370,8 @@ static int cfi_intelext_suspend(struct mtd_info *mtd)
                         }
                         spin_unlock(chip->mutex);
                 }
-        } 
-        
+        }
+
         return ret;
 }
 
@@ -2293,11 +2383,11 @@ static void cfi_intelext_resume(struct mtd_info *mtd)
         struct flchip *chip;
 
         for (i=0; i<cfi->numchips; i++) {
-        
+
                 chip = &cfi->chips[i];
 
                 spin_lock(chip->mutex);
-                
+
                 /* Go to known state. Chip may have been power cycled */
                 if (chip->state == FL_PM_SUSPENDED) {
                         map_write(map, CMD(0xFF), cfi->chips[i].start);
@@ -2319,7 +2409,7 @@ static int cfi_intelext_reset(struct mtd_info *mtd)
                 struct flchip *chip = &cfi->chips[i];
 
                 /* force the completion of any ongoing operation
-                   and switch to array mode so any bootloader in 
+                   and switch to array mode so any bootloader in
                    flash is accessible for soft reboot. */
                 spin_lock(chip->mutex);
                 ret = get_chip(map, chip, chip->start, FL_SYNCING);
@@ -2356,20 +2446,23 @@ static void cfi_intelext_destroy(struct mtd_info *mtd)
         kfree(mtd->eraseregions);
 }
 
-static char im_name_1[]="cfi_cmdset_0001";
-static char im_name_3[]="cfi_cmdset_0003";
+static char im_name_0001[] = "cfi_cmdset_0001";
+static char im_name_0003[] = "cfi_cmdset_0003";
+static char im_name_0200[] = "cfi_cmdset_0200";
 
 static int __init cfi_intelext_init(void)
 {
-        inter_module_register(im_name_1, THIS_MODULE, &cfi_cmdset_0001);
-        inter_module_register(im_name_3, THIS_MODULE, &cfi_cmdset_0001);
+        inter_module_register(im_name_0001, THIS_MODULE, &cfi_cmdset_0001);
+        inter_module_register(im_name_0003, THIS_MODULE, &cfi_cmdset_0001);
+        inter_module_register(im_name_0200, THIS_MODULE, &cfi_cmdset_0001);
         return 0;
 }
 
 static void __exit cfi_intelext_exit(void)
 {
-        inter_module_unregister(im_name_1);
-        inter_module_unregister(im_name_3);
+        inter_module_unregister(im_name_0001);
+        inter_module_unregister(im_name_0003);
+        inter_module_unregister(im_name_0200);
 }
 
 module_init(cfi_intelext_init);
diff --git a/drivers/mtd/chips/cfi_cmdset_0002.c b/drivers/mtd/chips/cfi_cmdset_0002.c
index 8505f118f2db..aed10bd5c3c3 100644
--- a/drivers/mtd/chips/cfi_cmdset_0002.c
+++ b/drivers/mtd/chips/cfi_cmdset_0002.c
@@ -10,14 +10,14 @@
  *
  * 4_by_16 work by Carolyn J. Smith
  *
- * XIP support hooks by Vitaly Wool (based on code for Intel flash 
+ * XIP support hooks by Vitaly Wool (based on code for Intel flash
  * by Nicolas Pitre)
- * 
+ *
  * Occasionally maintained by Thayne Harbaugh tharbaugh at lnxi dot com
  *
  * This code is GPL
  *
- * $Id: cfi_cmdset_0002.c,v 1.118 2005/07/04 22:34:29 gleixner Exp $
+ * $Id: cfi_cmdset_0002.c,v 1.122 2005/11/07 11:14:22 gleixner Exp $
  *
  */
 
@@ -93,7 +93,7 @@ static void cfi_tell_features(struct cfi_pri_amdstd *extp)
         };
 
         printk("  Silicon revision: %d\n", extp->SiliconRevision >> 1);
-        printk("  Address sensitive unlock: %s\n", 
+        printk("  Address sensitive unlock: %s\n",
                (extp->SiliconRevision & 1) ? "Not required" : "Required");
 
         if (extp->EraseSuspend < ARRAY_SIZE(erase_suspend))
@@ -118,9 +118,9 @@ static void cfi_tell_features(struct cfi_pri_amdstd *extp)
         else
                 printk("  Page mode: %d word page\n", extp->PageMode << 2);
 
-        printk("  Vpp Supply Minimum Program/Erase Voltage: %d.%d V\n", 
+        printk("  Vpp Supply Minimum Program/Erase Voltage: %d.%d V\n",
                extp->VppMin >> 4, extp->VppMin & 0xf);
-        printk("  Vpp Supply Maximum Program/Erase Voltage: %d.%d V\n", 
+        printk("  Vpp Supply Maximum Program/Erase Voltage: %d.%d V\n",
                extp->VppMax >> 4, extp->VppMax & 0xf);
 
         if (extp->TopBottom < ARRAY_SIZE(top_bottom))
@@ -177,7 +177,7 @@ static void fixup_use_erase_chip(struct mtd_info *mtd, void *param)
                 ((cfi->cfiq->EraseRegionInfo[0] & 0xffff) == 0)) {
                 mtd->erase = cfi_amdstd_erase_chip;
         }
-        
+
 }
 
 static struct cfi_fixup cfi_fixup_table[] = {
@@ -239,7 +239,7 @@ struct mtd_info *cfi_cmdset_0002(struct map_info *map, int primary)
 
         if (cfi->cfi_mode==CFI_MODE_CFI){
                 unsigned char bootloc;
-                /* 
+                /*
                  * It's a real CFI chip, not one for which the probe
                  * routine faked a CFI structure. So we read the feature
                  * table from it.
@@ -253,8 +253,18 @@ struct mtd_info *cfi_cmdset_0002(struct map_info *map, int primary)
                         return NULL;
                 }
 
+                if (extp->MajorVersion != '1' ||
+                    (extp->MinorVersion < '0' || extp->MinorVersion > '4')) {
+                        printk(KERN_ERR "  Unknown Amd/Fujitsu Extended Query "
+                               "version %c.%c.\n",  extp->MajorVersion,
+                               extp->MinorVersion);
+                        kfree(extp);
+                        kfree(mtd);
+                        return NULL;
+                }
+
                 /* Install our own private info structure */
-                cfi->cmdset_priv = extp;        
+                cfi->cmdset_priv = extp;
 
                 /* Apply cfi device specific fixups */
                 cfi_fixup(mtd, cfi_fixup_table);
@@ -262,7 +272,7 @@ struct mtd_info *cfi_cmdset_0002(struct map_info *map, int primary)
 #ifdef DEBUG_CFI_FEATURES
                 /* Tell the user about it in lots of lovely detail */
                 cfi_tell_features(extp);
-#endif  
+#endif
 
                 bootloc = extp->TopBottom;
                 if ((bootloc != 2) && (bootloc != 3)) {
@@ -273,11 +283,11 @@ struct mtd_info *cfi_cmdset_0002(struct map_info *map, int primary)
 
                 if (bootloc == 3 && cfi->cfiq->NumEraseRegions > 1) {
                         printk(KERN_WARNING "%s: Swapping erase regions for broken CFI table.\n", map->name);
-                        
+
                         for (i=0; i<cfi->cfiq->NumEraseRegions / 2; i++) {
                                 int j = (cfi->cfiq->NumEraseRegions-1)-i;
                                 __u32 swap;
-                                
+
                                 swap = cfi->cfiq->EraseRegionInfo[i];
                                 cfi->cfiq->EraseRegionInfo[i] = cfi->cfiq->EraseRegionInfo[j];
                                 cfi->cfiq->EraseRegionInfo[j] = swap;
@@ -288,11 +298,11 @@ struct mtd_info *cfi_cmdset_0002(struct map_info *map, int primary)
                 cfi->addr_unlock2 = 0x2aa;
                 /* Modify the unlock address if we are in compatibility mode */
                 if (    /* x16 in x8 mode */
-                        ((cfi->device_type == CFI_DEVICETYPE_X8) && 
+                        ((cfi->device_type == CFI_DEVICETYPE_X8) &&
                                 (cfi->cfiq->InterfaceDesc == 2)) ||
                         /* x32 in x16 mode */
                         ((cfi->device_type == CFI_DEVICETYPE_X16) &&
-                                (cfi->cfiq->InterfaceDesc == 4))) 
+                                (cfi->cfiq->InterfaceDesc == 4)))
                 {
                         cfi->addr_unlock1 = 0xaaa;
                         cfi->addr_unlock2 = 0x555;
@@ -310,10 +320,10 @@ struct mtd_info *cfi_cmdset_0002(struct map_info *map, int primary)
                 cfi->chips[i].word_write_time = 1<<cfi->cfiq->WordWriteTimeoutTyp;
                 cfi->chips[i].buffer_write_time = 1<<cfi->cfiq->BufWriteTimeoutTyp;
                 cfi->chips[i].erase_time = 1<<cfi->cfiq->BlockEraseTimeoutTyp;
-        }               
-        
+        }
+
         map->fldrv = &cfi_amdstd_chipdrv;
-        
+
         return cfi_amdstd_setup(mtd);
 }
 
@@ -326,24 +336,24 @@ static struct mtd_info *cfi_amdstd_setup(struct mtd_info *mtd)
         unsigned long offset = 0;
         int i,j;
 
-        printk(KERN_NOTICE "number of %s chips: %d\n", 
+        printk(KERN_NOTICE "number of %s chips: %d\n",
                (cfi->cfi_mode == CFI_MODE_CFI)?"CFI":"JEDEC",cfi->numchips);
-        /* Select the correct geometry setup */ 
+        /* Select the correct geometry setup */
         mtd->size = devsize * cfi->numchips;
 
         mtd->numeraseregions = cfi->cfiq->NumEraseRegions * cfi->numchips;
         mtd->eraseregions = kmalloc(sizeof(struct mtd_erase_region_info)
                                     * mtd->numeraseregions, GFP_KERNEL);
-        if (!mtd->eraseregions) { 
+        if (!mtd->eraseregions) {
                 printk(KERN_WARNING "Failed to allocate memory for MTD erase region info\n");
                 goto setup_err;
         }
-                        
+
         for (i=0; i<cfi->cfiq->NumEraseRegions; i++) {
                 unsigned long ernum, ersize;
                 ersize = ((cfi->cfiq->EraseRegionInfo[i] >> 8) & ~0xff) * cfi->interleave;
                 ernum = (cfi->cfiq->EraseRegionInfo[i] & 0xffff) + 1;
-                        
+
                 if (mtd->erasesize < ersize) {
                         mtd->erasesize = ersize;
                 }
@@ -378,8 +388,7 @@ static struct mtd_info *cfi_amdstd_setup(struct mtd_info *mtd)
 
  setup_err:
         if(mtd) {
-                if(mtd->eraseregions)
-                        kfree(mtd->eraseregions);
+                kfree(mtd->eraseregions);
                 kfree(mtd);
         }
         kfree(cfi->cmdset_priv);
@@ -430,7 +439,7 @@ static int __xipram chip_good(struct map_info *map, unsigned long addr, map_word
         oldd = map_read(map, addr);
         curd = map_read(map, addr);
 
-        return  map_word_equal(map, oldd, curd) && 
+        return  map_word_equal(map, oldd, curd) &&
                 map_word_equal(map, curd, expected);
 }
 
@@ -462,7 +471,7 @@ static int get_chip(struct map_info *map, struct flchip *chip, unsigned long adr
                         /* Someone else might have been playing with it. */
                         goto retry;
                 }
-                                
+
         case FL_READY:
         case FL_CFI_QUERY:
         case FL_JEDEC_QUERY:
@@ -505,7 +514,7 @@ static int get_chip(struct map_info *map, struct flchip *chip, unsigned long adr
                                 printk(KERN_ERR "MTD %s(): chip not ready after erase suspend\n", __func__);
                                 return -EIO;
                         }
-                        
+
                         spin_unlock(chip->mutex);
                         cfi_udelay(1);
                         spin_lock(chip->mutex);
@@ -608,7 +617,7 @@ static void __xipram xip_enable(struct map_info *map, struct flchip *chip,
  * When a delay is required for the flash operation to complete, the
  * xip_udelay() function is polling for both the given timeout and pending
  * (but still masked) hardware interrupts.  Whenever there is an interrupt
- * pending then the flash erase operation is suspended, array mode restored 
+ * pending then the flash erase operation is suspended, array mode restored
  * and interrupts unmasked.  Task scheduling might also happen at that
  * point.  The CPU eventually returns from the interrupt or the call to
  * schedule() and the suspended flash operation is resumed for the remaining
@@ -632,9 +641,9 @@ static void __xipram xip_udelay(struct map_info *map, struct flchip *chip,
                     ((chip->state == FL_ERASING && (extp->EraseSuspend & 2))) &&
                     (cfi_interleave_is_1(cfi) || chip->oldstate == FL_READY)) {
                         /*
-                         * Let's suspend the erase operation when supported.  
-                         * Note that we currently don't try to suspend 
-                         * interleaved chips if there is already another 
+                         * Let's suspend the erase operation when supported.
+                         * Note that we currently don't try to suspend
+                         * interleaved chips if there is already another
                          * operation suspended (imagine what happens
                          * when one chip was already done with the current
                          * operation while another chip suspended it, then
@@ -770,8 +779,8 @@ static inline int do_read_onechip(struct map_info *map, struct flchip *chip, lof
 
         adr += chip->start;
 
-        /* Ensure cmd read/writes are aligned. */ 
-        cmd_addr = adr & ~(map_bankwidth(map)-1); 
+        /* Ensure cmd read/writes are aligned. */
+        cmd_addr = adr & ~(map_bankwidth(map)-1);
 
         spin_lock(chip->mutex);
         ret = get_chip(map, chip, cmd_addr, FL_READY);
@@ -851,7 +860,7 @@ static inline int do_read_secsi_onechip(struct map_info *map, struct flchip *chi
 #endif
                 set_current_state(TASK_UNINTERRUPTIBLE);
                 add_wait_queue(&chip->wq, &wait);
-                
+
                 spin_unlock(chip->mutex);
 
                 schedule();
@@ -863,7 +872,7 @@ static inline int do_read_secsi_onechip(struct map_info *map, struct flchip *chi
                 timeo = jiffies + HZ;
 
                 goto retry;
-        }       
+        }
 
         adr += chip->start;
 
@@ -872,14 +881,14 @@ static inline int do_read_secsi_onechip(struct map_info *map, struct flchip *chi
         cfi_send_gen_cmd(0xAA, cfi->addr_unlock1, chip->start, map, cfi, cfi->device_type, NULL);
         cfi_send_gen_cmd(0x55, cfi->addr_unlock2, chip->start, map, cfi, cfi->device_type, NULL);
         cfi_send_gen_cmd(0x88, cfi->addr_unlock1, chip->start, map, cfi, cfi->device_type, NULL);
-        
+
         map_copy_from(map, buf, adr, len);
 
         cfi_send_gen_cmd(0xAA, cfi->addr_unlock1, chip->start, map, cfi, cfi->device_type, NULL);
         cfi_send_gen_cmd(0x55, cfi->addr_unlock2, chip->start, map, cfi, cfi->device_type, NULL);
         cfi_send_gen_cmd(0x90, cfi->addr_unlock1, chip->start, map, cfi, cfi->device_type, NULL);
         cfi_send_gen_cmd(0x00, cfi->addr_unlock1, chip->start, map, cfi, cfi->device_type, NULL);
-        
+
         wake_up(&chip->wq);
         spin_unlock(chip->mutex);
 
@@ -988,7 +997,7 @@ static int __xipram do_write_oneword(struct map_info *map, struct flchip *chip,
                                 chip->word_write_time);
 
         /* See comment above for timeout value. */
-        timeo = jiffies + uWriteTimeout; 
+        timeo = jiffies + uWriteTimeout;
         for (;;) {
                 if (chip->state != FL_WRITING) {
                         /* Someone's suspended the write. Sleep */
@@ -1004,16 +1013,16 @@ static int __xipram do_write_oneword(struct map_info *map, struct flchip *chip,
                         continue;
                 }
 
-                if (chip_ready(map, adr))
-                        break;
-
-                if (time_after(jiffies, timeo)) {
+                if (time_after(jiffies, timeo) && !chip_ready(map, adr)){
                         xip_enable(map, chip, adr);
                         printk(KERN_WARNING "MTD %s(): software timeout\n", __func__);
                         xip_disable(map, chip, adr);
-                        break;
+                        break;
                 }
 
+                if (chip_ready(map, adr))
+                        break;
+
                 /* Latency issues. Drop the lock, wait a while and retry */
                 UDELAY(map, chip, adr, 1);
         }
@@ -1023,7 +1032,7 @@ static int __xipram do_write_oneword(struct map_info *map, struct flchip *chip,
                 map_write( map, CMD(0xF0), chip->start );
                 /* FIXME - should have reset delay before continuing */
 
-                if (++retry_cnt <= MAX_WORD_RETRIES) 
+                if (++retry_cnt <= MAX_WORD_RETRIES)
                         goto retry;
 
                 ret = -EIO;
@@ -1091,27 +1100,27 @@ static int cfi_amdstd_write_words(struct mtd_info *mtd, loff_t to, size_t len,
 
                 /* Number of bytes to copy from buffer */
                 n = min_t(int, len, map_bankwidth(map)-i);
-                
+
                 tmp_buf = map_word_load_partial(map, tmp_buf, buf, i, n);
 
-                ret = do_write_oneword(map, &cfi->chips[chipnum], 
+                ret = do_write_oneword(map, &cfi->chips[chipnum],
                                        bus_ofs, tmp_buf);
-                if (ret) 
+                if (ret)
                         return ret;
-                
+
                 ofs += n;
                 buf += n;
                 (*retlen) += n;
                 len -= n;
 
                 if (ofs >> cfi->chipshift) {
-                        chipnum ++; 
+                        chipnum ++;
                         ofs = 0;
                         if (chipnum == cfi->numchips)
                                 return 0;
                 }
         }
-        
+
         /* We are now aligned, write as much as possible */
         while(len >= map_bankwidth(map)) {
                 map_word datum;
@@ -1129,7 +1138,7 @@ static int cfi_amdstd_write_words(struct mtd_info *mtd, loff_t to, size_t len,
                 len -= map_bankwidth(map);
 
                 if (ofs >> cfi->chipshift) {
-                        chipnum ++; 
+                        chipnum ++;
                         ofs = 0;
                         if (chipnum == cfi->numchips)
                                 return 0;
@@ -1167,12 +1176,12 @@ static int cfi_amdstd_write_words(struct mtd_info *mtd, loff_t to, size_t len,
                 spin_unlock(cfi->chips[chipnum].mutex);
 
                 tmp_buf = map_word_load_partial(map, tmp_buf, buf, 0, len);
-        
-                ret = do_write_oneword(map, &cfi->chips[chipnum], 
+
+                ret = do_write_oneword(map, &cfi->chips[chipnum],
                                 ofs, tmp_buf);
-                if (ret) 
+                if (ret)
                         return ret;
-                
+
                 (*retlen) += len;
         }
 
@@ -1184,7 +1193,7 @@ static int cfi_amdstd_write_words(struct mtd_info *mtd, loff_t to, size_t len,
  * FIXME: interleaved mode not tested, and probably not supported!
  */
 static int __xipram do_write_buffer(struct map_info *map, struct flchip *chip,
-                                    unsigned long adr, const u_char *buf, 
+                                    unsigned long adr, const u_char *buf,
                                     int len)
 {
         struct cfi_private *cfi = map->fldrv_priv;
@@ -1214,7 +1223,7 @@ static int __xipram do_write_buffer(struct map_info *map, struct flchip *chip,
         XIP_INVAL_CACHED_RANGE(map, adr, len);
         ENABLE_VPP(map);
         xip_disable(map, chip, cmd_adr);
-        
+
         cfi_send_gen_cmd(0xAA, cfi->addr_unlock1, chip->start, map, cfi, cfi->device_type, NULL);
         cfi_send_gen_cmd(0x55, cfi->addr_unlock2, chip->start, map, cfi, cfi->device_type, NULL);
         //cfi_send_gen_cmd(0xA0, cfi->addr_unlock1, chip->start, map, cfi, cfi->device_type, NULL);
@@ -1248,8 +1257,8 @@ static int __xipram do_write_buffer(struct map_info *map, struct flchip *chip,
                                 adr, map_bankwidth(map),
                                 chip->word_write_time);
 
-        timeo = jiffies + uWriteTimeout; 
-                
+        timeo = jiffies + uWriteTimeout;
+
         for (;;) {
                 if (chip->state != FL_WRITING) {
                         /* Someone's suspended the write. Sleep */
@@ -1265,13 +1274,13 @@ static int __xipram do_write_buffer(struct map_info *map, struct flchip *chip,
                         continue;
                 }
 
+                if (time_after(jiffies, timeo) && !chip_ready(map, adr))
+                        break;
+
                 if (chip_ready(map, adr)) {
                         xip_enable(map, chip, adr);
                         goto op_done;
                 }
-                    
-                if( time_after(jiffies, timeo))
-                        break;
 
                 /* Latency issues. Drop the lock, wait a while and retry */
                 UDELAY(map, chip, adr, 1);
@@ -1343,7 +1352,7 @@ static int cfi_amdstd_write_buffers(struct mtd_info *mtd, loff_t to, size_t len,
                 if (size % map_bankwidth(map))
                         size -= size % map_bankwidth(map);
 
-                ret = do_write_buffer(map, &cfi->chips[chipnum], 
+                ret = do_write_buffer(map, &cfi->chips[chipnum],
                                       ofs, buf, size);
                 if (ret)
                         return ret;
@@ -1354,7 +1363,7 @@ static int cfi_amdstd_write_buffers(struct mtd_info *mtd, loff_t to, size_t len,
                 len -= size;
 
                 if (ofs >> cfi->chipshift) {
-                        chipnum ++; 
+                        chipnum ++;
                         ofs = 0;
                         if (chipnum == cfi->numchips)
                                 return 0;
@@ -1571,7 +1580,7 @@ int cfi_amdstd_erase_varsize(struct mtd_info *mtd, struct erase_info *instr)
 
         instr->state = MTD_ERASE_DONE;
         mtd_erase_callback(instr);
-        
+
         return 0;
 }
 
@@ -1594,7 +1603,7 @@ static int cfi_amdstd_erase_chip(struct mtd_info *mtd, struct erase_info *instr)
 
         instr->state = MTD_ERASE_DONE;
         mtd_erase_callback(instr);
-        
+
         return 0;
 }
 
@@ -1621,7 +1630,7 @@ static void cfi_amdstd_sync (struct mtd_info *mtd)
                 case FL_JEDEC_QUERY:
                         chip->oldstate = chip->state;
                         chip->state = FL_SYNCING;
-                        /* No need to wake_up() on this state change - 
+                        /* No need to wake_up() on this state change -
                          * as the whole point is that nobody can do anything
                          * with the chip now anyway.
                          */
@@ -1632,13 +1641,13 @@ static void cfi_amdstd_sync (struct mtd_info *mtd)
                 default:
                         /* Not an idle state */
                         add_wait_queue(&chip->wq, &wait);
-                        
+
                         spin_unlock(chip->mutex);
 
                         schedule();
 
                         remove_wait_queue(&chip->wq, &wait);
-                        
+
                         goto retry;
                 }
         }
@@ -1649,7 +1658,7 @@ static void cfi_amdstd_sync (struct mtd_info *mtd)
                 chip = &cfi->chips[i];
 
                 spin_lock(chip->mutex);
-                
+
                 if (chip->state == FL_SYNCING) {
                         chip->state = chip->oldstate;
                         wake_up(&chip->wq);
@@ -1679,7 +1688,7 @@ static int cfi_amdstd_suspend(struct mtd_info *mtd)
                 case FL_JEDEC_QUERY:
                         chip->oldstate = chip->state;
                         chip->state = FL_PM_SUSPENDED;
-                        /* No need to wake_up() on this state change - 
+                        /* No need to wake_up() on this state change -
                          * as the whole point is that nobody can do anything
                          * with the chip now anyway.
                          */
@@ -1700,7 +1709,7 @@ static int cfi_amdstd_suspend(struct mtd_info *mtd)
                         chip = &cfi->chips[i];
 
                         spin_lock(chip->mutex);
-                
+
                         if (chip->state == FL_PM_SUSPENDED) {
                                 chip->state = chip->oldstate;
                                 wake_up(&chip->wq);
@@ -1708,7 +1717,7 @@ static int cfi_amdstd_suspend(struct mtd_info *mtd)
                         spin_unlock(chip->mutex);
                 }
         }
-        
+
         return ret;
 }
 
@@ -1721,11 +1730,11 @@ static void cfi_amdstd_resume(struct mtd_info *mtd)
         struct flchip *chip;
 
         for (i=0; i<cfi->numchips; i++) {
-        
+
                 chip = &cfi->chips[i];
 
                 spin_lock(chip->mutex);
-                
+
                 if (chip->state == FL_PM_SUSPENDED) {
                         chip->state = FL_READY;
                         map_write(map, CMD(0xF0), chip->start);
@@ -1742,6 +1751,7 @@ static void cfi_amdstd_destroy(struct mtd_info *mtd)
 {
         struct map_info *map = mtd->priv;
         struct cfi_private *cfi = map->fldrv_priv;
+
         kfree(cfi->cmdset_priv);
         kfree(cfi->cfiq);
         kfree(cfi);
diff --git a/drivers/mtd/chips/cfi_cmdset_0020.c b/drivers/mtd/chips/cfi_cmdset_0020.c
index c894f8801578..c4a19d2dc67f 100644
--- a/drivers/mtd/chips/cfi_cmdset_0020.c
+++ b/drivers/mtd/chips/cfi_cmdset_0020.c
@@ -4,8 +4,8 @@
  *
  * (C) 2000 Red Hat. GPL'd
  *
- * $Id: cfi_cmdset_0020.c,v 1.19 2005/07/13 15:52:45 dwmw2 Exp $
- * 
+ * $Id: cfi_cmdset_0020.c,v 1.22 2005/11/07 11:14:22 gleixner Exp $
+ *
  * 10/10/2000   Nicolas Pitre <nico@cam.org>
  *      - completely revamped method functions so they are aware and
  *        independent of the flash geometry (buswidth, interleave, etc.)
@@ -81,17 +81,17 @@ static void cfi_tell_features(struct cfi_pri_intelext *extp)
         printk("     - Page-mode read:     %s\n", extp->FeatureSupport&128?"supported":"unsupported");
         printk("     - Synchronous read:   %s\n", extp->FeatureSupport&256?"supported":"unsupported");
         for (i=9; i<32; i++) {
-                if (extp->FeatureSupport & (1<<i)) 
+                if (extp->FeatureSupport & (1<<i))
                         printk("     - Unknown Bit %X:      supported\n", i);
         }
-        
+
         printk("  Supported functions after Suspend: %2.2X\n", extp->SuspendCmdSupport);
         printk("     - Program after Erase Suspend: %s\n", extp->SuspendCmdSupport&1?"supported":"unsupported");
         for (i=1; i<8; i++) {
                 if (extp->SuspendCmdSupport & (1<<i))
                         printk("     - Unknown Bit %X:               supported\n", i);
         }
-        
+
         printk("  Block Status Register Mask: %4.4X\n", extp->BlkStatusRegMask);
         printk("     - Lock Bit Active:      %s\n", extp->BlkStatusRegMask&1?"yes":"no");
         printk("     - Valid Bit Active:     %s\n", extp->BlkStatusRegMask&2?"yes":"no");
@@ -99,11 +99,11 @@ static void cfi_tell_features(struct cfi_pri_intelext *extp)
                 if (extp->BlkStatusRegMask & (1<<i))
                         printk("     - Unknown Bit %X Active: yes\n",i);
         }
-        
-        printk("  Vcc Logic Supply Optimum Program/Erase Voltage: %d.%d V\n", 
+
+        printk("  Vcc Logic Supply Optimum Program/Erase Voltage: %d.%d V\n",
                extp->VccOptimal >> 8, extp->VccOptimal & 0xf);
         if (extp->VppOptimal)
-                printk("  Vpp Programming Supply Optimum Program/Erase Voltage: %d.%d V\n", 
+                printk("  Vpp Programming Supply Optimum Program/Erase Voltage: %d.%d V\n",
                        extp->VppOptimal >> 8, extp->VppOptimal & 0xf);
 }
 #endif
@@ -121,7 +121,7 @@ struct mtd_info *cfi_cmdset_0020(struct map_info *map, int primary)
         int i;
 
         if (cfi->cfi_mode) {
-                /* 
+                /*
                  * It's a real CFI chip, not one for which the probe
                  * routine faked a CFI structure. So we read the feature
                  * table from it.
@@ -133,24 +133,33 @@ struct mtd_info *cfi_cmdset_0020(struct map_info *map, int primary)
                 if (!extp)
                         return NULL;
 
+                if (extp->MajorVersion != '1' ||
+                    (extp->MinorVersion < '0' || extp->MinorVersion > '3')) {
+                        printk(KERN_ERR "  Unknown ST Microelectronics"
+                               " Extended Query version %c.%c.\n",
+                               extp->MajorVersion, extp->MinorVersion);
+                        kfree(extp);
+                        return NULL;
+                }
+
                 /* Do some byteswapping if necessary */
                 extp->FeatureSupport = cfi32_to_cpu(extp->FeatureSupport);
                 extp->BlkStatusRegMask = cfi32_to_cpu(extp->BlkStatusRegMask);
-                
+
 #ifdef DEBUG_CFI_FEATURES
                 /* Tell the user about it in lots of lovely detail */
                 cfi_tell_features(extp);
-#endif  
+#endif
 
                 /* Install our own private info structure */
                 cfi->cmdset_priv = extp;
-        }       
+        }
 
         for (i=0; i< cfi->numchips; i++) {
                 cfi->chips[i].word_write_time = 128;
                 cfi->chips[i].buffer_write_time = 128;
                 cfi->chips[i].erase_time = 1024;
-        }               
+        }
 
         return cfi_staa_setup(map);
 }
@@ -178,15 +187,15 @@ static struct mtd_info *cfi_staa_setup(struct map_info *map)
         mtd->size = devsize * cfi->numchips;
 
         mtd->numeraseregions = cfi->cfiq->NumEraseRegions * cfi->numchips;
-        mtd->eraseregions = kmalloc(sizeof(struct mtd_erase_region_info) 
+        mtd->eraseregions = kmalloc(sizeof(struct mtd_erase_region_info)
                         * mtd->numeraseregions, GFP_KERNEL);
-        if (!mtd->eraseregions) { 
+        if (!mtd->eraseregions) {
                 printk(KERN_ERR "Failed to allocate memory for MTD erase region info\n");
                 kfree(cfi->cmdset_priv);
                 kfree(mtd);
                 return NULL;
         }
-        
+
         for (i=0; i<cfi->cfiq->NumEraseRegions; i++) {
                 unsigned long ernum, ersize;
                 ersize = ((cfi->cfiq->EraseRegionInfo[i] >> 8) & ~0xff) * cfi->interleave;
@@ -219,7 +228,7 @@ static struct mtd_info *cfi_staa_setup(struct map_info *map)
                                mtd->eraseregions[i].numblocks);
                 }
 
-        /* Also select the correct geometry setup too */ 
+        /* Also select the correct geometry setup too */
         mtd->erase = cfi_staa_erase_varsize;
         mtd->read = cfi_staa_read;
         mtd->write = cfi_staa_write_buffers;
@@ -250,8 +259,8 @@ static inline int do_read_onechip(struct map_info *map, struct flchip *chip, lof
 
         adr += chip->start;
 
-        /* Ensure cmd read/writes are aligned. */ 
-        cmd_addr = adr & ~(map_bankwidth(map)-1); 
+        /* Ensure cmd read/writes are aligned. */
+        cmd_addr = adr & ~(map_bankwidth(map)-1);
 
         /* Let's determine this according to the interleave only once */
         status_OK = CMD(0x80);
@@ -267,7 +276,7 @@ static inline int do_read_onechip(struct map_info *map, struct flchip *chip, lof
         case FL_ERASING:
                 if (!(((struct cfi_pri_intelext *)cfi->cmdset_priv)->FeatureSupport & 2))
                         goto sleep; /* We don't support erase suspend */
-                
+
                 map_write (map, CMD(0xb0), cmd_addr);
                 /* If the flash has finished erasing, then 'erase suspend'
                  * appears to make some (28F320) flash devices switch to
@@ -282,7 +291,7 @@ static inline int do_read_onechip(struct map_info *map, struct flchip *chip, lof
                         status = map_read(map, cmd_addr);
                         if (map_word_andequal(map, status, status_OK, status_OK))
                                 break;
-                        
+
                         if (time_after(jiffies, timeo)) {
                                 /* Urgh */
                                 map_write(map, CMD(0xd0), cmd_addr);
@@ -294,17 +303,17 @@ static inline int do_read_onechip(struct map_info *map, struct flchip *chip, lof
                                        "suspended: status = 0x%lx\n", status.x[0]);
                                 return -EIO;
                         }
-                        
+
                         spin_unlock_bh(chip->mutex);
                         cfi_udelay(1);
                         spin_lock_bh(chip->mutex);
                 }
-                
+
                 suspended = 1;
                 map_write(map, CMD(0xff), cmd_addr);
                 chip->state = FL_READY;
                 break;
-        
+
 #if 0
         case FL_WRITING:
                 /* Not quite yet */
@@ -325,7 +334,7 @@ static inline int do_read_onechip(struct map_info *map, struct flchip *chip, lof
                         chip->state = FL_READY;
                         break;
                 }
-                
+
                 /* Urgh. Chip not yet ready to talk to us. */
                 if (time_after(jiffies, timeo)) {
                         spin_unlock_bh(chip->mutex);
@@ -355,17 +364,17 @@ static inline int do_read_onechip(struct map_info *map, struct flchip *chip, lof
 
         if (suspended) {
                 chip->state = chip->oldstate;
-                /* What if one interleaved chip has finished and the 
+                /* What if one interleaved chip has finished and the
                    other hasn't? The old code would leave the finished
-                   one in READY mode. That's bad, and caused -EROFS 
+                   one in READY mode. That's bad, and caused -EROFS
                    errors to be returned from do_erase_oneblock because
                    that's the only bit it checked for at the time.
-                   As the state machine appears to explicitly allow 
+                   As the state machine appears to explicitly allow
                    sending the 0x70 (Read Status) command to an erasing
-                   chip and expecting it to be ignored, that's what we 
+                   chip and expecting it to be ignored, that's what we
                    do. */
                 map_write(map, CMD(0xd0), cmd_addr);
-                map_write(map, CMD(0x70), cmd_addr);            
+                map_write(map, CMD(0x70), cmd_addr);
         }
 
         wake_up(&chip->wq);
@@ -405,14 +414,14 @@ static int cfi_staa_read (struct mtd_info *mtd, loff_t from, size_t len, size_t
                 *retlen += thislen;
                 len -= thislen;
                 buf += thislen;
-                
+
                 ofs = 0;
                 chipnum++;
         }
         return ret;
 }
 
-static inline int do_write_buffer(struct map_info *map, struct flchip *chip, 
+static inline int do_write_buffer(struct map_info *map, struct flchip *chip,
                                   unsigned long adr, const u_char *buf, int len)
 {
         struct cfi_private *cfi = map->fldrv_priv;
@@ -420,7 +429,7 @@ static inline int do_write_buffer(struct map_info *map, struct flchip *chip,
         unsigned long cmd_adr, timeo;
         DECLARE_WAITQUEUE(wait, current);
         int wbufsize, z;
-        
+
         /* M58LW064A requires bus alignment for buffer wriets -- saw */
         if (adr & (map_bankwidth(map)-1))
             return -EINVAL;
@@ -428,10 +437,10 @@ static inline int do_write_buffer(struct map_info *map, struct flchip *chip,
         wbufsize = cfi_interleave(cfi) << cfi->cfiq->MaxBufWriteSize;
         adr += chip->start;
         cmd_adr = adr & ~(wbufsize-1);
-        
+
         /* Let's determine this according to the interleave only once */
         status_OK = CMD(0x80);
-        
+
         timeo = jiffies + HZ;
  retry:
 
@@ -439,7 +448,7 @@ static inline int do_write_buffer(struct map_info *map, struct flchip *chip,
        printk("%s: chip->state[%d]\n", __FUNCTION__, chip->state);
 #endif
         spin_lock_bh(chip->mutex);
- 
+
         /* Check that the chip's ready to talk to us.
          * Later, we can actually think about interrupting it
          * if it's in FL_ERASING state.
@@ -448,7 +457,7 @@ static inline int do_write_buffer(struct map_info *map, struct flchip *chip,
         switch (chip->state) {
         case FL_READY:
                 break;
-                
+
         case FL_CFI_QUERY:
         case FL_JEDEC_QUERY:
                 map_write(map, CMD(0x70), cmd_adr);
@@ -513,7 +522,7 @@ static inline int do_write_buffer(struct map_info *map, struct flchip *chip,
 
         /* Write length of data to come */
         map_write(map, CMD(len/map_bankwidth(map)-1), cmd_adr );
-        
+
         /* Write data */
         for (z = 0; z < len;
              z += map_bankwidth(map), buf += map_bankwidth(map)) {
@@ -560,7 +569,7 @@ static inline int do_write_buffer(struct map_info *map, struct flchip *chip,
                         printk(KERN_ERR "waiting for chip to be ready timed out in bufwrite\n");
                         return -EIO;
                 }
-                
+
                 /* Latency issues. Drop the lock, wait a while and retry */
                 spin_unlock_bh(chip->mutex);
                 cfi_udelay(1);
@@ -572,9 +581,9 @@ static inline int do_write_buffer(struct map_info *map, struct flchip *chip,
                 if (!chip->buffer_write_time)
                         chip->buffer_write_time++;
         }
-        if (z > 1) 
+        if (z > 1)
                 chip->buffer_write_time++;
-        
+
         /* Done and happy. */
         DISABLE_VPP(map);
         chip->state = FL_STATUS;
@@ -598,7 +607,7 @@ static inline int do_write_buffer(struct map_info *map, struct flchip *chip,
         return 0;
 }
 
-static int cfi_staa_write_buffers (struct mtd_info *mtd, loff_t to, 
+static int cfi_staa_write_buffers (struct mtd_info *mtd, loff_t to,
                                        size_t len, size_t *retlen, const u_char *buf)
 {
         struct map_info *map = mtd->priv;
@@ -620,7 +629,7 @@ static int cfi_staa_write_buffers (struct mtd_info *mtd, loff_t to,
         printk("%s: chipnum[%x] wbufsize[%x]\n", __FUNCTION__, chipnum, wbufsize);
         printk("%s: ofs[%x] len[%x]\n", __FUNCTION__, ofs, len);
 #endif
-        
+
         /* Write buffer is worth it only if more than one word to write... */
         while (len > 0) {
                 /* We must not cross write block boundaries */
@@ -629,7 +638,7 @@ static int cfi_staa_write_buffers (struct mtd_info *mtd, loff_t to,
                 if (size > len)
                     size = len;
 
-                ret = do_write_buffer(map, &cfi->chips[chipnum], 
+                ret = do_write_buffer(map, &cfi->chips[chipnum],
                                       ofs, buf, size);
                 if (ret)
                         return ret;
@@ -640,13 +649,13 @@ static int cfi_staa_write_buffers (struct mtd_info *mtd, loff_t to,
                 len -= size;
 
                 if (ofs >> cfi->chipshift) {
-                        chipnum ++; 
+                        chipnum ++;
                         ofs = 0;
                         if (chipnum == cfi->numchips)
                                 return 0;
                 }
         }
-        
+
         return 0;
 }
 
@@ -756,7 +765,7 @@ retry:
                 status = map_read(map, adr);
                 if (map_word_andequal(map, status, status_OK, status_OK))
                         break;
-                
+
                 /* Urgh. Chip not yet ready to talk to us. */
                 if (time_after(jiffies, timeo)) {
                         spin_unlock_bh(chip->mutex);
@@ -789,7 +798,7 @@ retry:
         map_write(map, CMD(0x20), adr);
         map_write(map, CMD(0xD0), adr);
         chip->state = FL_ERASING;
-        
+
         spin_unlock_bh(chip->mutex);
         msleep(1000);
         spin_lock_bh(chip->mutex);
@@ -814,7 +823,7 @@ retry:
                 status = map_read(map, adr);
                 if (map_word_andequal(map, status, status_OK, status_OK))
                         break;
-                
+
                 /* OK Still waiting */
                 if (time_after(jiffies, timeo)) {
                         map_write(map, CMD(0x70), adr);
@@ -824,13 +833,13 @@ retry:
                         spin_unlock_bh(chip->mutex);
                         return -EIO;
                 }
-                
+
                 /* Latency issues. Drop the lock, wait a while and retry */
                 spin_unlock_bh(chip->mutex);
                 cfi_udelay(1);
                 spin_lock_bh(chip->mutex);
         }
-        
+
         DISABLE_VPP(map);
         ret = 0;
 
@@ -855,7 +864,7 @@ retry:
                 /* Reset the error bits */
                 map_write(map, CMD(0x50), adr);
                 map_write(map, CMD(0x70), adr);
-                
+
                 if ((chipstatus & 0x30) == 0x30) {
                         printk(KERN_NOTICE "Chip reports improper command sequence: status 0x%x\n", chipstatus);
                         ret = -EIO;
@@ -904,17 +913,17 @@ int cfi_staa_erase_varsize(struct mtd_info *mtd, struct erase_info *instr)
 
         i = 0;
 
-        /* Skip all erase regions which are ended before the start of 
+        /* Skip all erase regions which are ended before the start of
            the requested erase. Actually, to save on the calculations,
            we skip to the first erase region which starts after the
            start of the requested erase, and then go back one.
         */
-        
+
         while (i < mtd->numeraseregions && instr->addr >= regions[i].offset)
                i++;
         i--;
 
-        /* OK, now i is pointing at the erase region in which this 
+        /* OK, now i is pointing at the erase region in which this
            erase request starts. Check the start of the requested
            erase range is aligned with the erase size which is in
            effect here.
@@ -937,7 +946,7 @@ int cfi_staa_erase_varsize(struct mtd_info *mtd, struct erase_info *instr)
            the address actually falls
         */
         i--;
-        
+
         if ((instr->addr + instr->len) & (regions[i].erasesize-1))
                 return -EINVAL;
 
@@ -949,7 +958,7 @@ int cfi_staa_erase_varsize(struct mtd_info *mtd, struct erase_info *instr)
 
         while(len) {
                 ret = do_erase_oneblock(map, &cfi->chips[chipnum], adr);
-                
+
                 if (ret)
                         return ret;
 
@@ -962,15 +971,15 @@ int cfi_staa_erase_varsize(struct mtd_info *mtd, struct erase_info *instr)
                 if (adr >> cfi->chipshift) {
                         adr = 0;
                         chipnum++;
-                        
+
                         if (chipnum >= cfi->numchips)
                         break;
                 }
         }
-                
+
         instr->state = MTD_ERASE_DONE;
         mtd_erase_callback(instr);
-        
+
         return 0;
 }
 
@@ -996,7 +1005,7 @@ static void cfi_staa_sync (struct mtd_info *mtd)
                 case FL_JEDEC_QUERY:
                         chip->oldstate = chip->state;
                         chip->state = FL_SYNCING;
-                        /* No need to wake_up() on this state change - 
+                        /* No need to wake_up() on this state change -
                          * as the whole point is that nobody can do anything
                          * with the chip now anyway.
                          */
@@ -1007,11 +1016,11 @@ static void cfi_staa_sync (struct mtd_info *mtd)
                 default:
                         /* Not an idle state */
                         add_wait_queue(&chip->wq, &wait);
-                        
+
                         spin_unlock_bh(chip->mutex);
                         schedule();
                         remove_wait_queue(&chip->wq, &wait);
-                        
+
                         goto retry;
                 }
         }
@@ -1022,7 +1031,7 @@ static void cfi_staa_sync (struct mtd_info *mtd)
                 chip = &cfi->chips[i];
 
                 spin_lock_bh(chip->mutex);
-                
+
                 if (chip->state == FL_SYNCING) {
                         chip->state = chip->oldstate;
                         wake_up(&chip->wq);
@@ -1057,9 +1066,9 @@ retry:
 
         case FL_STATUS:
                 status = map_read(map, adr);
-                if (map_word_andequal(map, status, status_OK, status_OK)) 
+                if (map_word_andequal(map, status, status_OK, status_OK))
                         break;
-                
+
                 /* Urgh. Chip not yet ready to talk to us. */
                 if (time_after(jiffies, timeo)) {
                         spin_unlock_bh(chip->mutex);
@@ -1088,7 +1097,7 @@ retry:
         map_write(map, CMD(0x60), adr);
         map_write(map, CMD(0x01), adr);
         chip->state = FL_LOCKING;
-        
+
         spin_unlock_bh(chip->mutex);
         msleep(1000);
         spin_lock_bh(chip->mutex);
@@ -1102,7 +1111,7 @@ retry:
                 status = map_read(map, adr);
                 if (map_word_andequal(map, status, status_OK, status_OK))
                         break;
-                
+
                 /* OK Still waiting */
                 if (time_after(jiffies, timeo)) {
                         map_write(map, CMD(0x70), adr);
@@ -1112,13 +1121,13 @@ retry:
                         spin_unlock_bh(chip->mutex);
                         return -EIO;
                 }
-                
+
                 /* Latency issues. Drop the lock, wait a while and retry */
                 spin_unlock_bh(chip->mutex);
                 cfi_udelay(1);
                 spin_lock_bh(chip->mutex);
         }
-        
+
         /* Done and happy. */
         chip->state = FL_STATUS;
         DISABLE_VPP(map);
@@ -1162,8 +1171,8 @@ static int cfi_staa_lock(struct mtd_info *mtd, loff_t ofs, size_t len)
                 cfi_send_gen_cmd(0x90, 0x55, 0, map, cfi, cfi->device_type, NULL);
                 printk("after lock: block status register is %x\n",cfi_read_query(map, adr+(2*ofs_factor)));
                 cfi_send_gen_cmd(0xff, 0x55, 0, map, cfi, cfi->device_type, NULL);
-#endif  
-                
+#endif
+
                 if (ret)
                         return ret;
 
@@ -1173,7 +1182,7 @@ static int cfi_staa_lock(struct mtd_info *mtd, loff_t ofs, size_t len)
                 if (adr >> cfi->chipshift) {
                         adr = 0;
                         chipnum++;
-                        
+
                         if (chipnum >= cfi->numchips)
                         break;
                 }
@@ -1208,7 +1217,7 @@ retry:
                 status = map_read(map, adr);
                 if (map_word_andequal(map, status, status_OK, status_OK))
                         break;
-                
+
                 /* Urgh. Chip not yet ready to talk to us. */
                 if (time_after(jiffies, timeo)) {
                         spin_unlock_bh(chip->mutex);
@@ -1237,7 +1246,7 @@ retry:
         map_write(map, CMD(0x60), adr);
         map_write(map, CMD(0xD0), adr);
         chip->state = FL_UNLOCKING;
-        
+
         spin_unlock_bh(chip->mutex);
         msleep(1000);
         spin_lock_bh(chip->mutex);
@@ -1251,7 +1260,7 @@ retry:
                 status = map_read(map, adr);
                 if (map_word_andequal(map, status, status_OK, status_OK))
                         break;
-                
+
                 /* OK Still waiting */
                 if (time_after(jiffies, timeo)) {
                         map_write(map, CMD(0x70), adr);
@@ -1261,13 +1270,13 @@ retry:
                         spin_unlock_bh(chip->mutex);
                         return -EIO;
                 }
-                
+
                 /* Latency issues. Drop the unlock, wait a while and retry */
                 spin_unlock_bh(chip->mutex);
                 cfi_udelay(1);
                 spin_lock_bh(chip->mutex);
         }
-        
+
         /* Done and happy. */
         chip->state = FL_STATUS;
         DISABLE_VPP(map);
@@ -1292,7 +1301,7 @@ static int cfi_staa_unlock(struct mtd_info *mtd, loff_t ofs, size_t len)
         {
                 unsigned long temp_adr = adr;
                 unsigned long temp_len = len;
-                 
+
                 cfi_send_gen_cmd(0x90, 0x55, 0, map, cfi, cfi->device_type, NULL);
                 while (temp_len) {
                         printk("before unlock %x: block status register is %x\n",temp_adr,cfi_read_query(map, temp_adr+(2*ofs_factor)));
@@ -1310,7 +1319,7 @@ static int cfi_staa_unlock(struct mtd_info *mtd, loff_t ofs, size_t len)
         printk("after unlock: block status register is %x\n",cfi_read_query(map, adr+(2*ofs_factor)));
         cfi_send_gen_cmd(0xff, 0x55, 0, map, cfi, cfi->device_type, NULL);
 #endif
-        
+
         return ret;
 }
 
@@ -1334,7 +1343,7 @@ static int cfi_staa_suspend(struct mtd_info *mtd)
                 case FL_JEDEC_QUERY:
                         chip->oldstate = chip->state;
                         chip->state = FL_PM_SUSPENDED;
-                        /* No need to wake_up() on this state change - 
+                        /* No need to wake_up() on this state change -
                          * as the whole point is that nobody can do anything
                          * with the chip now anyway.
                          */
@@ -1353,9 +1362,9 @@ static int cfi_staa_suspend(struct mtd_info *mtd)
         if (ret) {
                 for (i--; i >=0; i--) {
                         chip = &cfi->chips[i];
-                        
+
                         spin_lock_bh(chip->mutex);
-                        
+
                         if (chip->state == FL_PM_SUSPENDED) {
                                 /* No need to force it into a known state here,
                                    because we're returning failure, and it didn't
@@ -1365,8 +1374,8 @@ static int cfi_staa_suspend(struct mtd_info *mtd)
                         }
                         spin_unlock_bh(chip->mutex);
                 }
-        } 
-        
+        }
+
         return ret;
 }
 
@@ -1378,11 +1387,11 @@ static void cfi_staa_resume(struct mtd_info *mtd)
         struct flchip *chip;
 
         for (i=0; i<cfi->numchips; i++) {
-        
+
                 chip = &cfi->chips[i];
 
                 spin_lock_bh(chip->mutex);
-                
+
                 /* Go to known state. Chip may have been power cycled */
                 if (chip->state == FL_PM_SUSPENDED) {
                         map_write(map, CMD(0xFF), 0);
diff --git a/drivers/mtd/chips/cfi_probe.c b/drivers/mtd/chips/cfi_probe.c
index cf750038ce6a..90eb30e06b7c 100644
--- a/drivers/mtd/chips/cfi_probe.c
+++ b/drivers/mtd/chips/cfi_probe.c
@@ -1,7 +1,7 @@
-/* 
+/*
    Common Flash Interface probe code.
    (C) 2000 Red Hat. GPL'd.
-   $Id: cfi_probe.c,v 1.83 2004/11/16 18:19:02 nico Exp $
+   $Id: cfi_probe.c,v 1.84 2005/11/07 11:14:23 gleixner Exp $
 */
 
 #include <linux/config.h>
@@ -20,7 +20,7 @@
 #include <linux/mtd/cfi.h>
 #include <linux/mtd/gen_probe.h>
 
-//#define DEBUG_CFI 
+//#define DEBUG_CFI
 
 #ifdef DEBUG_CFI
 static void print_cfi_ident(struct cfi_ident *);
@@ -103,7 +103,7 @@ static int __xipram cfi_probe_chip(struct map_info *map, __u32 base,
                                    unsigned long *chip_map, struct cfi_private *cfi)
 {
         int i;
-        
+
         if ((base + 0) >= map->size) {
                 printk(KERN_NOTICE
                         "Probe at base[0x00](0x%08lx) past the end of the map(0x%08lx)\n",
@@ -128,7 +128,7 @@ static int __xipram cfi_probe_chip(struct map_info *map, __u32 base,
         }
 
         if (!cfi->numchips) {
-                /* This is the first time we're called. Set up the CFI 
+                /* This is the first time we're called. Set up the CFI
                    stuff accordingly and return */
                 return cfi_chip_setup(map, cfi);
         }
@@ -138,13 +138,13 @@ static int __xipram cfi_probe_chip(struct map_info *map, __u32 base,
                 unsigned long start;
                 if(!test_bit(i, chip_map)) {
                         /* Skip location; no valid chip at this address */
-                        continue; 
+                        continue;
                 }
                 start = i << cfi->chipshift;
                 /* This chip should be in read mode if it's one
                    we've already touched. */
                 if (qry_present(map, start, cfi)) {
-                        /* Eep. This chip also had the QRY marker. 
+                        /* Eep. This chip also had the QRY marker.
                          * Is it an alias for the new one? */
                         cfi_send_gen_cmd(0xF0, 0, start, map, cfi, cfi->device_type, NULL);
                         cfi_send_gen_cmd(0xFF, 0, start, map, cfi, cfi->device_type, NULL);
@@ -156,13 +156,13 @@ static int __xipram cfi_probe_chip(struct map_info *map, __u32 base,
                                        map->name, base, start);
                                 return 0;
                         }
-                        /* Yes, it's actually got QRY for data. Most 
+                        /* Yes, it's actually got QRY for data. Most
                          * unfortunate. Stick the new chip in read mode
                          * too and if it's the same, assume it's an alias. */
                         /* FIXME: Use other modes to do a proper check */
                         cfi_send_gen_cmd(0xF0, 0, base, map, cfi, cfi->device_type, NULL);
                         cfi_send_gen_cmd(0xFF, 0, start, map, cfi, cfi->device_type, NULL);
-                        
+
                         if (qry_present(map, base, cfi)) {
                                 xip_allowed(base, map);
                                 printk(KERN_DEBUG "%s: Found an alias at 0x%x for the chip at 0x%lx\n",
@@ -171,12 +171,12 @@ static int __xipram cfi_probe_chip(struct map_info *map, __u32 base,
                         }
                 }
         }
-        
+
         /* OK, if we got to here, then none of the previous chips appear to
            be aliases for the current one. */
         set_bit((base >> cfi->chipshift), chip_map); /* Update chip map */
         cfi->numchips++;
-        
+
         /* Put it back into Read Mode */
         cfi_send_gen_cmd(0xF0, 0, base, map, cfi, cfi->device_type, NULL);
         cfi_send_gen_cmd(0xFF, 0, base, map, cfi, cfi->device_type, NULL);
@@ -185,11 +185,11 @@ static int __xipram cfi_probe_chip(struct map_info *map, __u32 base,
         printk(KERN_INFO "%s: Found %d x%d devices at 0x%x in %d-bit bank\n",
                map->name, cfi->interleave, cfi->device_type*8, base,
                map->bankwidth*8);
-        
+
         return 1;
 }
 
-static int __xipram cfi_chip_setup(struct map_info *map, 
+static int __xipram cfi_chip_setup(struct map_info *map,
                                    struct cfi_private *cfi)
 {
         int ofs_factor = cfi->interleave*cfi->device_type;
@@ -209,11 +209,11 @@ static int __xipram cfi_chip_setup(struct map_info *map,
                 printk(KERN_WARNING "%s: kmalloc failed for CFI ident structure\n", map->name);
                 return 0;
         }
-        
-        memset(cfi->cfiq,0,sizeof(struct cfi_ident));   
-        
+
+        memset(cfi->cfiq,0,sizeof(struct cfi_ident));
+
         cfi->cfi_mode = CFI_MODE_CFI;
-        
+
         /* Read the CFI info structure */
         xip_disable_qry(base, map, cfi);
         for (i=0; i<(sizeof(struct cfi_ident) + num_erase_regions * 4); i++)
@@ -231,7 +231,7 @@ static int __xipram cfi_chip_setup(struct map_info *map,
         cfi_send_gen_cmd(0x55, 0x2aa, base, map, cfi, cfi->device_type, NULL);
         cfi_send_gen_cmd(0x90, 0x555, base, map, cfi, cfi->device_type, NULL);
         cfi->mfr = cfi_read_query(map, base);
-        cfi->id = cfi_read_query(map, base + ofs_factor);    
+        cfi->id = cfi_read_query(map, base + ofs_factor);
 
         /* Put it back into Read Mode */
         cfi_send_gen_cmd(0xF0, 0, base, map, cfi, cfi->device_type, NULL);
@@ -255,10 +255,10 @@ static int __xipram cfi_chip_setup(struct map_info *map,
 
         for (i=0; i<cfi->cfiq->NumEraseRegions; i++) {
                 cfi->cfiq->EraseRegionInfo[i] = le32_to_cpu(cfi->cfiq->EraseRegionInfo[i]);
-                
-#ifdef DEBUG_CFI                
+
+#ifdef DEBUG_CFI
                 printk("  Erase Region #%d: BlockSize 0x%4.4X bytes, %d blocks\n",
-                       i, (cfi->cfiq->EraseRegionInfo[i] >> 8) & ~0xff, 
+                       i, (cfi->cfiq->EraseRegionInfo[i] >> 8) & ~0xff,
                        (cfi->cfiq->EraseRegionInfo[i] & 0xffff) + 1);
 #endif
         }
@@ -271,33 +271,33 @@ static int __xipram cfi_chip_setup(struct map_info *map,
 }
 
 #ifdef DEBUG_CFI
-static char *vendorname(__u16 vendor) 
+static char *vendorname(__u16 vendor)
 {
         switch (vendor) {
         case P_ID_NONE:
                 return "None";
-                
+
         case P_ID_INTEL_EXT:
                 return "Intel/Sharp Extended";
-                
+
         case P_ID_AMD_STD:
                 return "AMD/Fujitsu Standard";
-                
+
         case P_ID_INTEL_STD:
                 return "Intel/Sharp Standard";
-                
+
         case P_ID_AMD_EXT:
                 return "AMD/Fujitsu Extended";
 
         case P_ID_WINBOND:
                 return "Winbond Standard";
-                
+
         case P_ID_ST_ADV:
                 return "ST Advanced";
 
         case P_ID_MITSUBISHI_STD:
                 return "Mitsubishi Standard";
-                
+
         case P_ID_MITSUBISHI_EXT:
                 return "Mitsubishi Extended";
 
@@ -306,13 +306,13 @@ static char *vendorname(__u16 vendor)
 
         case P_ID_INTEL_PERFORMANCE:
                 return "Intel Performance Code";
-                
+
         case P_ID_INTEL_DATA:
                 return "Intel Data";
-                
+
         case P_ID_RESERVED:
                 return "Not Allowed / Reserved for Future Use";
-                
+
         default:
                 return "Unknown";
         }
@@ -325,21 +325,21 @@ static void print_cfi_ident(struct cfi_ident *cfip)
         if (cfip->qry[0] != 'Q' || cfip->qry[1] != 'R' || cfip->qry[2] != 'Y') {
                 printk("Invalid CFI ident structure.\n");
                 return;
-        }       
-#endif          
+        }
+#endif
         printk("Primary Vendor Command Set: %4.4X (%s)\n", cfip->P_ID, vendorname(cfip->P_ID));
         if (cfip->P_ADR)
                 printk("Primary Algorithm Table at %4.4X\n", cfip->P_ADR);
         else
                 printk("No Primary Algorithm Table\n");
-        
+
         printk("Alternative Vendor Command Set: %4.4X (%s)\n", cfip->A_ID, vendorname(cfip->A_ID));
         if (cfip->A_ADR)
                 printk("Alternate Algorithm Table at %4.4X\n", cfip->A_ADR);
         else
                 printk("No Alternate Algorithm Table\n");
-                
-                
+
+
         printk("Vcc Minimum: %2d.%d V\n", cfip->VccMin >> 4, cfip->VccMin & 0xf);
         printk("Vcc Maximum: %2d.%d V\n", cfip->VccMax >> 4, cfip->VccMax & 0xf);
         if (cfip->VppMin) {
@@ -348,61 +348,61 @@ static void print_cfi_ident(struct cfi_ident *cfip)
         }
         else
                 printk("No Vpp line\n");
-        
+
         printk("Typical byte/word write timeout: %d µs\n", 1<<cfip->WordWriteTimeoutTyp);
         printk("Maximum byte/word write timeout: %d µs\n", (1<<cfip->WordWriteTimeoutMax) * (1<<cfip->WordWriteTimeoutTyp));
-        
+
         if (cfip->BufWriteTimeoutTyp || cfip->BufWriteTimeoutMax) {
                 printk("Typical full buffer write timeout: %d µs\n", 1<<cfip->BufWriteTimeoutTyp);
                 printk("Maximum full buffer write timeout: %d µs\n", (1<<cfip->BufWriteTimeoutMax) * (1<<cfip->BufWriteTimeoutTyp));
         }
         else
                 printk("Full buffer write not supported\n");
-        
+
         printk("Typical block erase timeout: %d ms\n", 1<<cfip->BlockEraseTimeoutTyp);
         printk("Maximum block erase timeout: %d ms\n", (1<<cfip->BlockEraseTimeoutMax) * (1<<cfip->BlockEraseTimeoutTyp));
         if (cfip->ChipEraseTimeoutTyp || cfip->ChipEraseTimeoutMax) {
-                printk("Typical chip erase timeout: %d ms\n", 1<<cfip->ChipEraseTimeoutTyp); 
+                printk("Typical chip erase timeout: %d ms\n", 1<<cfip->ChipEraseTimeoutTyp);
                 printk("Maximum chip erase timeout: %d ms\n", (1<<cfip->ChipEraseTimeoutMax) * (1<<cfip->ChipEraseTimeoutTyp));
         }
         else
                 printk("Chip erase not supported\n");
-        
+
         printk("Device size: 0x%X bytes (%d MiB)\n", 1 << cfip->DevSize, 1<< (cfip->DevSize - 20));
         printk("Flash Device Interface description: 0x%4.4X\n", cfip->InterfaceDesc);
         switch(cfip->InterfaceDesc) {
         case 0:
                 printk("  - x8-only asynchronous interface\n");
                 break;
-                
+
         case 1:
                 printk("  - x16-only asynchronous interface\n");
                 break;
-                
+
         case 2:
                 printk("  - supports x8 and x16 via BYTE# with asynchronous interface\n");
                 break;
-                
+
         case 3:
                 printk("  - x32-only asynchronous interface\n");
                 break;
-                
+
         case 4:
                 printk("  - supports x16 and x32 via Word# with asynchronous interface\n");
                 break;
-                
+
         case 65535:
                 printk("  - Not Allowed / Reserved\n");
                 break;
-                
+
         default:
                 printk("  - Unknown\n");
                 break;
         }
-        
+
         printk("Max. bytes in buffer write: 0x%x\n", 1<< cfip->MaxBufWriteSize);
         printk("Number of Erase Block Regions: %d\n", cfip->NumEraseRegions);
-        
+
 }
 #endif /* DEBUG_CFI */
 
diff --git a/drivers/mtd/chips/cfi_util.c b/drivers/mtd/chips/cfi_util.c
index 2b2ede2bfcca..d8e7a026ba5a 100644
--- a/drivers/mtd/chips/cfi_util.c
+++ b/drivers/mtd/chips/cfi_util.c
@@ -7,7 +7,7 @@
  *
  * This code is covered by the GPL.
  *
- * $Id: cfi_util.c,v 1.8 2004/12/14 19:55:56 nico Exp $
+ * $Id: cfi_util.c,v 1.10 2005/11/07 11:14:23 gleixner Exp $
  *
  */
 
@@ -56,7 +56,7 @@ __xipram cfi_read_pri(struct map_info *map, __u16 adr, __u16 size, const char* n
 
         /* Read in the Extended Query Table */
         for (i=0; i<size; i++) {
-                ((unsigned char *)extp)[i] = 
+                ((unsigned char *)extp)[i] =
                         cfi_read_query(map, base+((adr+i)*ofs_factor));
         }
 
@@ -70,15 +70,6 @@ __xipram cfi_read_pri(struct map_info *map, __u16 adr, __u16 size, const char* n
         local_irq_enable();
 #endif
 
-        if (extp->MajorVersion != '1' || 
-            (extp->MinorVersion < '0' || extp->MinorVersion > '3')) {
-                printk(KERN_WARNING "  Unknown %s Extended Query "
-                       "version %c.%c.\n",  name, extp->MajorVersion,
-                       extp->MinorVersion);
-                kfree(extp);
-                extp = NULL;
-        }
-
  out:   return extp;
 }
 
@@ -122,17 +113,17 @@ int cfi_varsize_frob(struct mtd_info *mtd, varsize_frob_t frob,
 
         i = 0;
 
-        /* Skip all erase regions which are ended before the start of 
+        /* Skip all erase regions which are ended before the start of
            the requested erase. Actually, to save on the calculations,
            we skip to the first erase region which starts after the
            start of the requested erase, and then go back one.
         */
-        
+
         while (i < mtd->numeraseregions && ofs >= regions[i].offset)
                i++;
         i--;
 
-        /* OK, now i is pointing at the erase region in which this 
+        /* OK, now i is pointing at the erase region in which this
            erase request starts. Check the start of the requested
            erase range is aligned with the erase size which is in
            effect here.
@@ -155,7 +146,7 @@ int cfi_varsize_frob(struct mtd_info *mtd, varsize_frob_t frob,
            the address actually falls
         */
         i--;
-        
+
         if ((ofs + len) & (regions[i].erasesize-1))
                 return -EINVAL;
 
@@ -168,7 +159,7 @@ int cfi_varsize_frob(struct mtd_info *mtd, varsize_frob_t frob,
                 int size = regions[i].erasesize;
 
                 ret = (*frob)(map, &cfi->chips[chipnum], adr, size, thunk);
-                
+
                 if (ret)
                         return ret;
 
@@ -182,7 +173,7 @@ int cfi_varsize_frob(struct mtd_info *mtd, varsize_frob_t frob,
                 if (adr >> cfi->chipshift) {
                         adr = 0;
                         chipnum++;
-                        
+
                         if (chipnum >= cfi->numchips)
                         break;
                 }
diff --git a/drivers/mtd/chips/chipreg.c b/drivers/mtd/chips/chipreg.c
index d7d739a108ae..c2127840a183 100644
--- a/drivers/mtd/chips/chipreg.c
+++ b/drivers/mtd/chips/chipreg.c
@@ -41,7 +41,7 @@ static struct mtd_chip_driver *get_mtd_chip_driver (const char *name)
 
         list_for_each(pos, &chip_drvs_list) {
                 this = list_entry(pos, typeof(*this), list);
-                
+
                 if (!strcmp(this->name, name)) {
                         ret = this;
                         break;
@@ -73,7 +73,7 @@ struct mtd_info *do_map_probe(const char *name, struct map_info *map)
 
         ret = drv->probe(map);
 
-        /* We decrease the use count here. It may have been a 
+        /* We decrease the use count here. It may have been a
            probe-only module, which is no longer required from this
            point, having given us a handle on (and increased the use
            count of) the actual driver code.
@@ -82,7 +82,7 @@ struct mtd_info *do_map_probe(const char *name, struct map_info *map)
 
         if (ret)
                 return ret;
-        
+
         return NULL;
 }
 /*
diff --git a/drivers/mtd/chips/fwh_lock.h b/drivers/mtd/chips/fwh_lock.h
index e1a5b76596c5..77303ce5dcf1 100644
--- a/drivers/mtd/chips/fwh_lock.h
+++ b/drivers/mtd/chips/fwh_lock.h
@@ -25,7 +25,7 @@ struct fwh_xxlock_thunk {
  * so this code has not been tested with interleaved chips,
  * and will likely fail in that context.
  */
-static int fwh_xxlock_oneblock(struct map_info *map, struct flchip *chip, 
+static int fwh_xxlock_oneblock(struct map_info *map, struct flchip *chip,
         unsigned long adr, int len, void *thunk)
 {
         struct cfi_private *cfi = map->fldrv_priv;
@@ -44,7 +44,7 @@ static int fwh_xxlock_oneblock(struct map_info *map, struct flchip *chip,
          * - on 64k boundariesand
          * - bit 1 set high
          * - block lock registers are 4MiB lower - overflow subtract (danger)
-         * 
+         *
          * The address manipulation is first done on the logical address
          * which is 0 at the start of the chip, and then the offset of
          * the individual chip is addted to it.  Any other order a weird
@@ -93,7 +93,7 @@ static int fwh_unlock_varsize(struct mtd_info *mtd, loff_t ofs, size_t len)
 
         ret = cfi_varsize_frob(mtd, fwh_xxlock_oneblock, ofs, len,
                 (void *)&FWH_XXLOCK_ONEBLOCK_UNLOCK);
-        
+
         return ret;
 }
 
diff --git a/drivers/mtd/chips/gen_probe.c b/drivers/mtd/chips/gen_probe.c
index dc065b22f79e..41bd59d20d85 100644
--- a/drivers/mtd/chips/gen_probe.c
+++ b/drivers/mtd/chips/gen_probe.c
@@ -2,7 +2,7 @@
  * Routines common to all CFI-type probes.
  * (C) 2001-2003 Red Hat, Inc.
  * GPL'd
- * $Id: gen_probe.c,v 1.22 2005/01/24 23:49:50 rmk Exp $
+ * $Id: gen_probe.c,v 1.24 2005/11/07 11:14:23 gleixner Exp $
  */
 
 #include <linux/kernel.h>
@@ -26,7 +26,7 @@ struct mtd_info *mtd_do_chip_probe(struct map_info *map, struct chip_probe *cp)
 
         /* First probe the map to see if we have CFI stuff there. */
         cfi = genprobe_ident_chips(map, cp);
-        
+
         if (!cfi)
                 return NULL;
 
@@ -36,12 +36,12 @@ struct mtd_info *mtd_do_chip_probe(struct map_info *map, struct chip_probe *cp)
         mtd = check_cmd_set(map, 1); /* First the primary cmdset */
         if (!mtd)
                 mtd = check_cmd_set(map, 0); /* Then the secondary */
-        
+
         if (mtd)
                 return mtd;
 
         printk(KERN_WARNING"gen_probe: No supported Vendor Command Set found\n");
-        
+
         kfree(cfi->cfiq);
         kfree(cfi);
         map->fldrv_priv = NULL;
@@ -60,14 +60,14 @@ static struct cfi_private *genprobe_ident_chips(struct map_info *map, struct chi
 
         memset(&cfi, 0, sizeof(cfi));
 
-        /* Call the probetype-specific code with all permutations of 
+        /* Call the probetype-specific code with all permutations of
            interleave and device type, etc. */
         if (!genprobe_new_chip(map, cp, &cfi)) {
                 /* The probe didn't like it */
                 printk(KERN_DEBUG "%s: Found no %s device at location zero\n",
                        cp->name, map->name);
                 return NULL;
-        }               
+        }
 
 #if 0 /* Let the CFI probe routine do this sanity check. The Intel and AMD
          probe routines won't ever return a broken CFI structure anyway,
@@ -92,13 +92,13 @@ static struct cfi_private *genprobe_ident_chips(struct map_info *map, struct chi
         } else {
                 BUG();
         }
-                
+
         cfi.numchips = 1;
 
-        /* 
-         * Allocate memory for bitmap of valid chips. 
-         * Align bitmap storage size to full byte. 
-         */ 
+        /*
+         * Allocate memory for bitmap of valid chips.
+         * Align bitmap storage size to full byte.
+         */
         max_chips = map->size >> cfi.chipshift;
         mapsize = (max_chips / 8) + ((max_chips % 8) ? 1 : 0);
         chip_map = kmalloc(mapsize, GFP_KERNEL);
@@ -122,7 +122,7 @@ static struct cfi_private *genprobe_ident_chips(struct map_info *map, struct chi
         }
 
         /*
-         * Now allocate the space for the structures we need to return to 
+         * Now allocate the space for the structures we need to return to
          * our caller, and copy the appropriate data into them.
          */
 
@@ -154,7 +154,7 @@ static struct cfi_private *genprobe_ident_chips(struct map_info *map, struct chi
         return retcfi;
 }
 
-        
+
 static int genprobe_new_chip(struct map_info *map, struct chip_probe *cp,
                              struct cfi_private *cfi)
 {
@@ -189,7 +189,7 @@ extern cfi_cmdset_fn_t cfi_cmdset_0001;
 extern cfi_cmdset_fn_t cfi_cmdset_0002;
 extern cfi_cmdset_fn_t cfi_cmdset_0020;
 
-static inline struct mtd_info *cfi_cmdset_unknown(struct map_info *map, 
+static inline struct mtd_info *cfi_cmdset_unknown(struct map_info *map,
                                                   int primary)
 {
         struct cfi_private *cfi = map->fldrv_priv;
@@ -199,7 +199,7 @@ static inline struct mtd_info *cfi_cmdset_unknown(struct map_info *map,
         cfi_cmdset_fn_t *probe_function;
 
         sprintf(probename, "cfi_cmdset_%4.4X", type);
-                
+
         probe_function = inter_module_get_request(probename, probename);
 
         if (probe_function) {
@@ -221,7 +221,7 @@ static struct mtd_info *check_cmd_set(struct map_info *map, int primary)
 {
         struct cfi_private *cfi = map->fldrv_priv;
         __u16 type = primary?cfi->cfiq->P_ID:cfi->cfiq->A_ID;
-        
+
         if (type == P_ID_NONE || type == P_ID_RESERVED)
                 return NULL;
 
@@ -235,6 +235,7 @@ static struct mtd_info *check_cmd_set(struct map_info *map, int primary)
 #ifdef CONFIG_MTD_CFI_INTELEXT
         case 0x0001:
         case 0x0003:
+        case 0x0200:
                 return cfi_cmdset_0001(map, primary);
 #endif
 #ifdef CONFIG_MTD_CFI_AMDSTD
diff --git a/drivers/mtd/chips/jedec.c b/drivers/mtd/chips/jedec.c
index 4f6778f3ee3e..c40b48dabed3 100644
--- a/drivers/mtd/chips/jedec.c
+++ b/drivers/mtd/chips/jedec.c
@@ -1,6 +1,6 @@
 
 /* JEDEC Flash Interface.
- * This is an older type of interface for self programming flash. It is 
+ * This is an older type of interface for self programming flash. It is
  * commonly use in older AMD chips and is obsolete compared with CFI.
  * It is called JEDEC because the JEDEC association distributes the ID codes
  * for the chips.
@@ -88,9 +88,9 @@ static const struct JEDECTable JEDEC_table[] = {
 
 static const struct JEDECTable *jedec_idtoinf(__u8 mfr,__u8 id);
 static void jedec_sync(struct mtd_info *mtd) {};
-static int jedec_read(struct mtd_info *mtd, loff_t from, size_t len, 
+static int jedec_read(struct mtd_info *mtd, loff_t from, size_t len,
                       size_t *retlen, u_char *buf);
-static int jedec_read_banked(struct mtd_info *mtd, loff_t from, size_t len, 
+static int jedec_read_banked(struct mtd_info *mtd, loff_t from, size_t len,
                              size_t *retlen, u_char *buf);
 
 static struct mtd_info *jedec_probe(struct map_info *map);
@@ -122,7 +122,7 @@ static struct mtd_info *jedec_probe(struct map_info *map)
 
    memset(MTD, 0, sizeof(struct mtd_info) + sizeof(struct jedec_private));
    priv = (struct jedec_private *)&MTD[1];
-   
+
    my_bank_size = map->size;
 
    if (map->size/my_bank_size > MAX_JEDEC_CHIPS)
@@ -131,13 +131,13 @@ static struct mtd_info *jedec_probe(struct map_info *map)
       kfree(MTD);
       return NULL;
    }
-   
+
    for (Base = 0; Base < map->size; Base += my_bank_size)
    {
       // Perhaps zero could designate all tests?
       if (map->buswidth == 0)
          map->buswidth = 1;
-      
+
       if (map->buswidth == 1){
          if (jedec_probe8(map,Base,priv) == 0) {
                  printk("did recognize jedec chip\n");
@@ -150,7 +150,7 @@ static struct mtd_info *jedec_probe(struct map_info *map)
       if (map->buswidth == 4)
          jedec_probe32(map,Base,priv);
    }
-   
+
    // Get the biggest sector size
    SectorSize = 0;
    for (I = 0; priv->chips[I].jedec != 0 && I < MAX_JEDEC_CHIPS; I++)
@@ -160,7 +160,7 @@ static struct mtd_info *jedec_probe(struct map_info *map)
       if (priv->chips[I].sectorsize > SectorSize)
          SectorSize = priv->chips[I].sectorsize;
    }
-   
+
    // Quickly ensure that the other sector sizes are factors of the largest
    for (I = 0; priv->chips[I].jedec != 0 && I < MAX_JEDEC_CHIPS; I++)
    {
@@ -169,9 +169,9 @@ static struct mtd_info *jedec_probe(struct map_info *map)
          printk("mtd: Failed. Device has incompatible mixed sector sizes\n");
          kfree(MTD);
          return NULL;
-      }      
+      }
    }
-   
+
    /* Generate a part name that includes the number of different chips and
       other configuration information */
    count = 1;
@@ -181,13 +181,13 @@ static struct mtd_info *jedec_probe(struct map_info *map)
    for (I = 0; priv->chips[I].jedec != 0 && I < MAX_JEDEC_CHIPS; I++)
    {
       const struct JEDECTable *JEDEC;
-      
+
       if (priv->chips[I+1].jedec == priv->chips[I].jedec)
       {
          count++;
          continue;
       }
-      
+
       // Locate the chip in the jedec table
       JEDEC = jedec_idtoinf(priv->chips[I].jedec >> 8,priv->chips[I].jedec);
       if (JEDEC == 0)
@@ -196,11 +196,11 @@ static struct mtd_info *jedec_probe(struct map_info *map)
          kfree(MTD);
          return NULL;
       }
-      
+
       if (Uniq != 0)
          strcat(Part,",");
       Uniq++;
-      
+
       if (count != 1)
          sprintf(Part+strlen(Part),"%x*[%s]",count,JEDEC->name);
       else
@@ -208,7 +208,7 @@ static struct mtd_info *jedec_probe(struct map_info *map)
       if (strlen(Part) > sizeof(Part)*2/3)
          break;
       count = 1;
-   }   
+   }
 
    /* Determine if the chips are organized in a linear fashion, or if there
       are empty banks. Note, the last bank does not count here, only the
@@ -233,7 +233,7 @@ static struct mtd_info *jedec_probe(struct map_info *map)
                    {
                       if (priv->bank_fill[I] != my_bank_size)
                          priv->is_banked = 1;
-                      
+
                       /* This even could be eliminated, but new de-optimized read/write
                          functions have to be written */
                       printk("priv->bank_fill[%d] is %lx, priv->bank_fill[0] is %lx\n",I,priv->bank_fill[I],priv->bank_fill[0]);
@@ -242,7 +242,7 @@ static struct mtd_info *jedec_probe(struct map_info *map)
                          printk("mtd: Failed. Cannot handle unsymmetric banking\n");
                          kfree(MTD);
                          return NULL;
-                      }      
+                      }
                    }
            }
    }
@@ -250,7 +250,7 @@ static struct mtd_info *jedec_probe(struct map_info *map)
       strcat(Part,", banked");
 
    //   printk("Part: '%s'\n",Part);
-   
+
    memset(MTD,0,sizeof(*MTD));
   // strlcpy(MTD->name,Part,sizeof(MTD->name));
    MTD->name = map->name;
@@ -291,7 +291,7 @@ static int checkparity(u_char C)
 
 /* Take an array of JEDEC numbers that represent interleved flash chips
    and process them. Check to make sure they are good JEDEC numbers, look
-   them up and then add them to the chip list */   
+   them up and then add them to the chip list */
 static int handle_jedecs(struct map_info *map,__u8 *Mfg,__u8 *Id,unsigned Count,
                   unsigned long base,struct jedec_private *priv)
 {
@@ -306,16 +306,16 @@ static int handle_jedecs(struct map_info *map,__u8 *Mfg,__u8 *Id,unsigned Count,
       if (checkparity(Mfg[I]) == 0 || checkparity(Id[I]) == 0)
          return 0;
    }
-   
+
    // Finally, just make sure all the chip sizes are the same
    JEDEC = jedec_idtoinf(Mfg[0],Id[0]);
-   
+
    if (JEDEC == 0)
    {
       printk("mtd: Found JEDEC flash chip, but do not have a table entry for %x:%x\n",Mfg[0],Mfg[1]);
       return 0;
    }
-   
+
    Size = JEDEC->size;
    SectorSize = JEDEC->sectorsize;
    for (I = 0; I != Count; I++)
@@ -331,7 +331,7 @@ static int handle_jedecs(struct map_info *map,__u8 *Mfg,__u8 *Id,unsigned Count,
       {
          printk("mtd: Failed. Interleved flash does not have matching characteristics\n");
          return 0;
-      }      
+      }
    }
 
    // Load the Chips
@@ -345,13 +345,13 @@ static int handle_jedecs(struct map_info *map,__u8 *Mfg,__u8 *Id,unsigned Count,
    {
       printk("mtd: Device has too many chips. Increase MAX_JEDEC_CHIPS\n");
       return 0;
-   }      
-   
+   }
+
    // Add them to the table
    for (J = 0; J != Count; J++)
    {
       unsigned long Bank;
-         
+
       JEDEC = jedec_idtoinf(Mfg[J],Id[J]);
       priv->chips[I].jedec = (Mfg[J] << 8) | Id[J];
       priv->chips[I].size = JEDEC->size;
@@ -364,17 +364,17 @@ static int handle_jedecs(struct map_info *map,__u8 *Mfg,__u8 *Id,unsigned Count,
       // log2 n :|
       priv->chips[I].addrshift = 0;
       for (Bank = Count; Bank != 1; Bank >>= 1, priv->chips[I].addrshift++);
-      
+
       // Determine how filled this bank is.
       Bank = base & (~(my_bank_size-1));
-      if (priv->bank_fill[Bank/my_bank_size] < base + 
+      if (priv->bank_fill[Bank/my_bank_size] < base +
           (JEDEC->size << priv->chips[I].addrshift) - Bank)
          priv->bank_fill[Bank/my_bank_size] =  base + (JEDEC->size << priv->chips[I].addrshift) - Bank;
       I++;
    }
 
    priv->size += priv->chips[I-1].size*Count;
-         
+
    return priv->chips[I-1].size;
 }
 
@@ -392,7 +392,7 @@ static const struct JEDECTable *jedec_idtoinf(__u8 mfr,__u8 id)
 // Look for flash using an 8 bit bus interface
 static int jedec_probe8(struct map_info *map,unsigned long base,
                   struct jedec_private *priv)
-{ 
+{
    #define flread(x) map_read8(map,base+x)
    #define flwrite(v,x) map_write8(map,v,base+x)
 
@@ -410,20 +410,20 @@ static int jedec_probe8(struct map_info *map,unsigned long base,
    OldVal = flread(base);
    for (I = 0; OldVal != flread(base) && I < 10000; I++)
       OldVal = flread(base);
-   
+
    // Reset the chip
-   flwrite(Reset,0x555); 
-   
+   flwrite(Reset,0x555);
+
    // Send the sequence
    flwrite(AutoSel1,0x555);
    flwrite(AutoSel2,0x2AA);
    flwrite(AutoSel3,0x555);
-   
+
    //  Get the JEDEC numbers
    Mfg[0] = flread(0);
    Id[0] = flread(1);
    //   printk("Mfg is %x, Id is %x\n",Mfg[0],Id[0]);
-      
+
    Size = handle_jedecs(map,Mfg,Id,1,base,priv);
    //   printk("handle_jedecs Size is %x\n",(unsigned int)Size);
    if (Size == 0)
@@ -431,13 +431,13 @@ static int jedec_probe8(struct map_info *map,unsigned long base,
       flwrite(Reset,0x555);
       return 0;
    }
-   
+
 
    // Reset.
    flwrite(Reset,0x555);
-   
+
    return 1;
-   
+
    #undef flread
    #undef flwrite
 }
@@ -470,17 +470,17 @@ static int jedec_probe32(struct map_info *map,unsigned long base,
    OldVal = flread(base);
    for (I = 0; OldVal != flread(base) && I < 10000; I++)
       OldVal = flread(base);
-   
+
    // Reset the chip
-   flwrite(Reset,0x555); 
-   
+   flwrite(Reset,0x555);
+
    // Send the sequence
    flwrite(AutoSel1,0x555);
    flwrite(AutoSel2,0x2AA);
    flwrite(AutoSel3,0x555);
-   
+
    // Test #1, JEDEC numbers are readable from 0x??00/0x??01
-   if (flread(0) != flread(0x100) || 
+   if (flread(0) != flread(0x100) ||
        flread(1) != flread(0x101))
    {
       flwrite(Reset,0x555);
@@ -494,14 +494,14 @@ static int jedec_probe32(struct map_info *map,unsigned long base,
    OldVal = flread(1);
    for (I = 0; I != 4; I++)
       Id[I] = (OldVal >> (I*8));
-      
+
    Size = handle_jedecs(map,Mfg,Id,4,base,priv);
    if (Size == 0)
    {
       flwrite(Reset,0x555);
       return 0;
    }
-   
+
    /* Check if there is address wrap around within a single bank, if this
       returns JEDEC numbers then we assume that it is wrap around. Notice
       we call this routine with the JEDEC return still enabled, if two or
@@ -519,27 +519,27 @@ static int jedec_probe32(struct map_info *map,unsigned long base,
 
    // Reset.
    flwrite(0xF0F0F0F0,0x555);
-   
+
    return 1;
-   
+
    #undef flread
    #undef flwrite
 }
 
 /* Linear read. */
-static int jedec_read(struct mtd_info *mtd, loff_t from, size_t len, 
+static int jedec_read(struct mtd_info *mtd, loff_t from, size_t len,
                       size_t *retlen, u_char *buf)
 {
    struct map_info *map = mtd->priv;
-   
+
    map_copy_from(map, buf, from, len);
    *retlen = len;
-   return 0;   
+   return 0;
 }
 
 /* Banked read. Take special care to jump past the holes in the bank
    mapping. This version assumes symetry in the holes.. */
-static int jedec_read_banked(struct mtd_info *mtd, loff_t from, size_t len, 
+static int jedec_read_banked(struct mtd_info *mtd, loff_t from, size_t len,
                              size_t *retlen, u_char *buf)
 {
    struct map_info *map = mtd->priv;
@@ -555,17 +555,17 @@ static int jedec_read_banked(struct mtd_info *mtd, loff_t from, size_t len,
       if (priv->bank_fill[0] - offset < len)
          get = priv->bank_fill[0] - offset;
 
-      bank /= priv->bank_fill[0];      
+      bank /= priv->bank_fill[0];
       map_copy_from(map,buf + *retlen,bank*my_bank_size + offset,get);
-      
+
       len -= get;
       *retlen += get;
       from += get;
-   }   
-   return 0;   
+   }
+   return 0;
 }
 
-/* Pass the flags value that the flash return before it re-entered read 
+/* Pass the flags value that the flash return before it re-entered read
    mode. */
 static void jedec_flash_failed(unsigned char code)
 {
@@ -579,17 +579,17 @@ static void jedec_flash_failed(unsigned char code)
    printk("mtd: Programming didn't take\n");
 }
 
-/* This uses the erasure function described in the AMD Flash Handbook, 
+/* This uses the erasure function described in the AMD Flash Handbook,
    it will work for flashes with a fixed sector size only. Flashes with
    a selection of sector sizes (ie the AMD Am29F800B) will need a different
-   routine. This routine tries to parallize erasing multiple chips/sectors 
+   routine. This routine tries to parallize erasing multiple chips/sectors
    where possible */
 static int flash_erase(struct mtd_info *mtd, struct erase_info *instr)
 {
    // Does IO to the currently selected chip
    #define flread(x) map_read8(map,chip->base+((x)<<chip->addrshift))
    #define flwrite(v,x) map_write8(map,v,chip->base+((x)<<chip->addrshift))
-   
+
    unsigned long Time = 0;
    unsigned long NoTime = 0;
    unsigned long start = instr->addr, len = instr->len;
@@ -603,7 +603,7 @@ static int flash_erase(struct mtd_info *mtd, struct erase_info *instr)
        (len % mtd->erasesize) != 0 ||
        (len/mtd->erasesize) == 0)
       return -EINVAL;
-   
+
    jedec_flash_chip_scan(priv,start,len);
 
    // Start the erase sequence on each chip
@@ -611,16 +611,16 @@ static int flash_erase(struct mtd_info *mtd, struct erase_info *instr)
    {
       unsigned long off;
       struct jedec_flash_chip *chip = priv->chips + I;
-      
+
       if (chip->length == 0)
          continue;
-      
+
       if (chip->start + chip->length > chip->size)
       {
          printk("DIE\n");
          return -EIO;
-      }     
-      
+      }
+
       flwrite(0xF0,chip->start + 0x555);
       flwrite(0xAA,chip->start + 0x555);
       flwrite(0x55,chip->start + 0x2AA);
@@ -628,8 +628,8 @@ static int flash_erase(struct mtd_info *mtd, struct erase_info *instr)
       flwrite(0xAA,chip->start + 0x555);
       flwrite(0x55,chip->start + 0x2AA);
 
-      /* Once we start selecting the erase sectors the delay between each 
-         command must not exceed 50us or it will immediately start erasing 
+      /* Once we start selecting the erase sectors the delay between each
+         command must not exceed 50us or it will immediately start erasing
          and ignore the other sectors */
       for (off = 0; off < len; off += chip->sectorsize)
       {
@@ -641,19 +641,19 @@ static int flash_erase(struct mtd_info *mtd, struct erase_info *instr)
          {
             printk("mtd: Ack! We timed out the erase timer!\n");
             return -EIO;
-         }               
+         }
       }
-   }   
+   }
 
    /* We could split this into a timer routine and return early, performing
       background erasure.. Maybe later if the need warrents */
 
    /* Poll the flash for erasure completion, specs say this can take as long
-      as 480 seconds to do all the sectors (for a 2 meg flash). 
+      as 480 seconds to do all the sectors (for a 2 meg flash).
       Erasure time is dependent on chip age, temp and wear.. */
-   
+
    /* This being a generic routine assumes a 32 bit bus. It does read32s
-      and bundles interleved chips into the same grouping. This will work 
+      and bundles interleved chips into the same grouping. This will work
       for all bus widths */
    Time = 0;
    NoTime = 0;
@@ -664,20 +664,20 @@ static int flash_erase(struct mtd_info *mtd, struct erase_info *instr)
       unsigned todo[4] = {0,0,0,0};
       unsigned todo_left = 0;
       unsigned J;
-      
+
       if (chip->length == 0)
          continue;
 
-      /* Find all chips in this data line, realistically this is all 
+      /* Find all chips in this data line, realistically this is all
          or nothing up to the interleve count */
       for (J = 0; priv->chips[J].jedec != 0 && J < MAX_JEDEC_CHIPS; J++)
       {
-         if ((priv->chips[J].base & (~((1<<chip->addrshift)-1))) == 
+         if ((priv->chips[J].base & (~((1<<chip->addrshift)-1))) ==
              (chip->base & (~((1<<chip->addrshift)-1))))
          {
             todo_left++;
             todo[priv->chips[J].base & ((1<<chip->addrshift)-1)] = 1;
-         }       
+         }
       }
 
       /*      printk("todo: %x %x %x %x\n",(short)todo[0],(short)todo[1],
@@ -687,7 +687,7 @@ static int flash_erase(struct mtd_info *mtd, struct erase_info *instr)
       {
          __u32 Last[4];
          unsigned long Count = 0;
-         
+
          /* During erase bit 7 is held low and bit 6 toggles, we watch this,
             should it stop toggling or go high then the erase is completed,
             or this is not really flash ;> */
@@ -718,23 +718,23 @@ static int flash_erase(struct mtd_info *mtd, struct erase_info *instr)
                __u8 Byte3 = (Last[(Count-3)%4] >> (J*8)) & 0xFF;
                if (todo[J] == 0)
                   continue;
-               
+
                if ((Byte1 & (1 << 7)) == 0 && Byte1 != Byte2)
                {
 //                printk("Check %x %x %x\n",(short)J,(short)Byte1,(short)Byte2);
                   continue;
                }
-               
+
                if (Byte1 == Byte2)
                {
                   jedec_flash_failed(Byte3);
                   return -EIO;
                }
-               
+
                todo[J] = 0;
                todo_left--;
             }
-            
+
 /*          if (NoTime == 0)
                Time += HZ/10 - schedule_timeout(HZ/10);*/
             NoTime = 0;
@@ -751,7 +751,7 @@ static int flash_erase(struct mtd_info *mtd, struct erase_info *instr)
               break;
             }
             Count++;
-            
+
 /*          // Count time, max of 15s per sector (according to AMD)
             if (Time > 15*len/mtd->erasesize*HZ)
             {
@@ -759,38 +759,38 @@ static int flash_erase(struct mtd_info *mtd, struct erase_info *instr)
                return -EIO;
             }       */
          }
-                 
+
          // Skip to the next chip if we used chip erase
          if (chip->length == chip->size)
             off = chip->size;
          else
             off += chip->sectorsize;
-         
+
          if (off >= chip->length)
             break;
          NoTime = 1;
       }
-      
+
       for (J = 0; priv->chips[J].jedec != 0 && J < MAX_JEDEC_CHIPS; J++)
       {
          if ((priv->chips[J].base & (~((1<<chip->addrshift)-1))) ==
              (chip->base & (~((1<<chip->addrshift)-1))))
             priv->chips[J].length = 0;
-      }      
+      }
    }
-            
+
    //printk("done\n");
    instr->state = MTD_ERASE_DONE;
    mtd_erase_callback(instr);
    return 0;
-   
+
    #undef flread
    #undef flwrite
 }
 
 /* This is the simple flash writing function. It writes to every byte, in
    sequence. It takes care of how to properly address the flash if
-   the flash is interleved. It can only be used if all the chips in the 
+   the flash is interleved. It can only be used if all the chips in the
    array are identical!*/
 static int flash_write(struct mtd_info *mtd, loff_t start, size_t len,
                        size_t *retlen, const u_char *buf)
@@ -800,25 +800,25 @@ static int flash_write(struct mtd_info *mtd, loff_t start, size_t len,
       of addrshift (interleave index) and then adds the control register index. */
    #define flread(x) map_read8(map,base+(off&((1<<chip->addrshift)-1))+((x)<<chip->addrshift))
    #define flwrite(v,x) map_write8(map,v,base+(off&((1<<chip->addrshift)-1))+((x)<<chip->addrshift))
-   
+
    struct map_info *map = mtd->priv;
    struct jedec_private *priv = map->fldrv_priv;
    unsigned long base;
    unsigned long off;
    size_t save_len = len;
-   
+
    if (start + len > mtd->size)
       return -EIO;
-   
+
    //printk("Here");
-   
+
    //printk("flash_write: start is %x, len is %x\n",start,(unsigned long)len);
    while (len != 0)
    {
       struct jedec_flash_chip *chip = priv->chips;
       unsigned long bank;
       unsigned long boffset;
-         
+
       // Compute the base of the flash.
       off = ((unsigned long)start) % (chip->size << chip->addrshift);
       base = start - off;
@@ -828,10 +828,10 @@ static int flash_write(struct mtd_info *mtd, loff_t start, size_t len,
       boffset = base & (priv->bank_fill[0]-1);
       bank = (bank/priv->bank_fill[0])*my_bank_size;
       base = bank + boffset;
-      
+
     //  printk("Flasing %X %X %X\n",base,chip->size,len);
      // printk("off is %x, compare with %x\n",off,chip->size << chip->addrshift);
-      
+
       // Loop over this page
       for (; off != (chip->size << chip->addrshift) && len != 0; start++, len--, off++,buf++)
       {
@@ -845,7 +845,7 @@ static int flash_write(struct mtd_info *mtd, loff_t start, size_t len,
          }
          if (((~oldbyte) & *buf) != 0)
             printk("mtd: warn: Trying to set a 0 to a 1\n");
-             
+
          // Write
          flwrite(0xAA,0x555);
          flwrite(0x55,0x2AA);
@@ -854,10 +854,10 @@ static int flash_write(struct mtd_info *mtd, loff_t start, size_t len,
          Last[0] = map_read8(map,base + off);
          Last[1] = map_read8(map,base + off);
          Last[2] = map_read8(map,base + off);
-         
+
          /* Wait for the flash to finish the operation. We store the last 4
             status bytes that have been retrieved so we can determine why
-            it failed. The toggle bits keep toggling when there is a 
+            it failed. The toggle bits keep toggling when there is a
             failure */
          for (Count = 3; Last[(Count - 1) % 4] != Last[(Count - 2) % 4] &&
               Count < 10000; Count++)
@@ -866,7 +866,7 @@ static int flash_write(struct mtd_info *mtd, loff_t start, size_t len,
          {
             jedec_flash_failed(Last[(Count - 3) % 4]);
             return -EIO;
-         }       
+         }
       }
    }
    *retlen = save_len;
@@ -885,24 +885,24 @@ static void jedec_flash_chip_scan(struct jedec_private *priv,unsigned long start
    // Zero the records
    for (I = 0; priv->chips[I].jedec != 0 && I < MAX_JEDEC_CHIPS; I++)
       priv->chips[I].start = priv->chips[I].length = 0;
-   
+
    // Intersect the region with each chip
    for (I = 0; priv->chips[I].jedec != 0 && I < MAX_JEDEC_CHIPS; I++)
    {
       struct jedec_flash_chip *chip = priv->chips + I;
       unsigned long ByteStart;
       unsigned long ChipEndByte = chip->offset + (chip->size << chip->addrshift);
-      
+
       // End is before this chip or the start is after it
       if (start+len < chip->offset ||
           ChipEndByte - (1 << chip->addrshift) < start)
          continue;
-      
+
       if (start < chip->offset)
       {
          ByteStart = chip->offset;
          chip->start = 0;
-      }      
+      }
       else
       {
          chip->start = (start - chip->offset + (1 << chip->addrshift)-1) >> chip->addrshift;
diff --git a/drivers/mtd/chips/jedec_probe.c b/drivers/mtd/chips/jedec_probe.c
index 30da428eb7b9..edb306c03c0a 100644
--- a/drivers/mtd/chips/jedec_probe.c
+++ b/drivers/mtd/chips/jedec_probe.c
@@ -1,7 +1,7 @@
-/* 
+/*
    Common Flash Interface probe code.
    (C) 2000 Red Hat. GPL'd.
-   $Id: jedec_probe.c,v 1.63 2005/02/14 16:30:32 bjd Exp $
+   $Id: jedec_probe.c,v 1.66 2005/11/07 11:14:23 gleixner Exp $
    See JEDEC (http://www.jedec.org/) standard JESD21C (section 3.5)
    for the standard this probe goes back to.
 
@@ -1719,7 +1719,7 @@ static int jedec_probe_chip(struct map_info *map, __u32 base,
 
 static struct mtd_info *jedec_probe(struct map_info *map);
 
-static inline u32 jedec_read_mfr(struct map_info *map, __u32 base, 
+static inline u32 jedec_read_mfr(struct map_info *map, __u32 base,
         struct cfi_private *cfi)
 {
         map_word result;
@@ -1730,7 +1730,7 @@ static inline u32 jedec_read_mfr(struct map_info *map, __u32 base,
         return result.x[0] & mask;
 }
 
-static inline u32 jedec_read_id(struct map_info *map, __u32 base, 
+static inline u32 jedec_read_id(struct map_info *map, __u32 base,
         struct cfi_private *cfi)
 {
         map_word result;
@@ -1741,7 +1741,7 @@ static inline u32 jedec_read_id(struct map_info *map, __u32 base,
         return result.x[0] & mask;
 }
 
-static inline void jedec_reset(u32 base, struct map_info *map, 
+static inline void jedec_reset(u32 base, struct map_info *map,
         struct cfi_private *cfi)
 {
         /* Reset */
@@ -1765,7 +1765,7 @@ static inline void jedec_reset(u32 base, struct map_info *map,
          * so ensure we're in read mode.  Send both the Intel and the AMD command
          * for this.  Intel uses 0xff for this, AMD uses 0xff for NOP, so
          * this should be safe.
-         */ 
+         */
         cfi_send_gen_cmd(0xFF, 0, base, map, cfi, cfi->device_type, NULL);
         /* FIXME - should have reset delay before continuing */
 }
@@ -1807,14 +1807,14 @@ static int cfi_jedec_setup(struct cfi_private *p_cfi, int index)
         printk("Found: %s\n",jedec_table[index].name);
 
         num_erase_regions = jedec_table[index].NumEraseRegions;
-        
+
         p_cfi->cfiq = kmalloc(sizeof(struct cfi_ident) + num_erase_regions * 4, GFP_KERNEL);
         if (!p_cfi->cfiq) {
                 //xx printk(KERN_WARNING "%s: kmalloc failed for CFI ident structure\n", map->name);
                 return 0;
         }
 
-        memset(p_cfi->cfiq,0,sizeof(struct cfi_ident)); 
+        memset(p_cfi->cfiq,0,sizeof(struct cfi_ident));
 
         p_cfi->cfiq->P_ID = jedec_table[index].CmdSet;
         p_cfi->cfiq->NumEraseRegions = jedec_table[index].NumEraseRegions;
@@ -1969,7 +1969,7 @@ static inline int jedec_match( __u32 base,
         cfi_send_gen_cmd(0x90, cfi->addr_unlock1, base, map, cfi, cfi->device_type, NULL);
         /* FIXME - should have a delay before continuing */
 
- match_done:    
+ match_done:
         return rc;
 }
 
@@ -1998,23 +1998,23 @@ static int jedec_probe_chip(struct map_info *map, __u32 base,
                         "Probe at base(0x%08x) past the end of the map(0x%08lx)\n",
                         base, map->size -1);
                 return 0;
-                
+
         }
         /* Ensure the unlock addresses we try stay inside the map */
         probe_offset1 = cfi_build_cmd_addr(
-                cfi->addr_unlock1, 
-                cfi_interleave(cfi), 
+                cfi->addr_unlock1,
+                cfi_interleave(cfi),
                 cfi->device_type);
         probe_offset2 = cfi_build_cmd_addr(
-                cfi->addr_unlock1, 
-                cfi_interleave(cfi), 
+                cfi->addr_unlock1,
+                cfi_interleave(cfi),
                 cfi->device_type);
         if (    ((base + probe_offset1 + map_bankwidth(map)) >= map->size) ||
                 ((base + probe_offset2 + map_bankwidth(map)) >= map->size))
         {
                 goto retry;
         }
-                
+
         /* Reset */
         jedec_reset(base, map, cfi);
 
@@ -2027,13 +2027,13 @@ static int jedec_probe_chip(struct map_info *map, __u32 base,
         /* FIXME - should have a delay before continuing */
 
         if (!cfi->numchips) {
-                /* This is the first time we're called. Set up the CFI 
+                /* This is the first time we're called. Set up the CFI
                    stuff accordingly and return */
-                
+
                 cfi->mfr = jedec_read_mfr(map, base, cfi);
                 cfi->id = jedec_read_id(map, base, cfi);
                 DEBUG(MTD_DEBUG_LEVEL3,
-                      "Search for id:(%02x %02x) interleave(%d) type(%d)\n", 
+                      "Search for id:(%02x %02x) interleave(%d) type(%d)\n",
                         cfi->mfr, cfi->id, cfi_interleave(cfi), cfi->device_type);
                 for (i=0; i<sizeof(jedec_table)/sizeof(jedec_table[0]); i++) {
                         if ( jedec_match( base, map, cfi, &jedec_table[i] ) ) {
@@ -2062,7 +2062,7 @@ static int jedec_probe_chip(struct map_info *map, __u32 base,
                         return 0;
                 }
         }
-        
+
         /* Check each previous chip locations to see if it's an alias */
         for (i=0; i < (base >> cfi->chipshift); i++) {
                 unsigned long start;
@@ -2083,7 +2083,7 @@ static int jedec_probe_chip(struct map_info *map, __u32 base,
                                        map->name, base, start);
                                 return 0;
                         }
-                        
+
                         /* Yes, it's actually got the device IDs as data. Most
                          * unfortunate. Stick the new chip in read mode
                          * too and if it's the same, assume it's an alias. */
@@ -2097,20 +2097,20 @@ static int jedec_probe_chip(struct map_info *map, __u32 base,
                         }
                 }
         }
-                
+
         /* OK, if we got to here, then none of the previous chips appear to
            be aliases for the current one. */
         set_bit((base >> cfi->chipshift), chip_map); /* Update chip map */
         cfi->numchips++;
-                
+
 ok_out:
         /* Put it back into Read Mode */
         jedec_reset(base, map, cfi);
 
         printk(KERN_INFO "%s: Found %d x%d devices at 0x%x in %d-bit bank\n",
-               map->name, cfi_interleave(cfi), cfi->device_type*8, base, 
+               map->name, cfi_interleave(cfi), cfi->device_type*8, base,
                map->bankwidth*8);
-        
+
         return 1;
 }
 
diff --git a/drivers/mtd/chips/map_absent.c b/drivers/mtd/chips/map_absent.c
index c6c83833cc32..a611de9b1515 100644
--- a/drivers/mtd/chips/map_absent.c
+++ b/drivers/mtd/chips/map_absent.c
@@ -1,11 +1,11 @@
 /*
  * Common code to handle absent "placeholder" devices
  * Copyright 2001 Resilience Corporation <ebrower@resilience.com>
- * $Id: map_absent.c,v 1.5 2004/11/16 18:29:00 dwmw2 Exp $
+ * $Id: map_absent.c,v 1.6 2005/11/07 11:14:23 gleixner Exp $
  *
  * This map driver is used to allocate "placeholder" MTD
- * devices on systems that have socketed/removable media. 
- * Use of this driver as a fallback preserves the expected 
+ * devices on systems that have socketed/removable media.
+ * Use of this driver as a fallback preserves the expected
  * registration of MTD device nodes regardless of probe outcome.
  * A usage example is as follows:
  *
@@ -80,7 +80,7 @@ static int map_absent_read(struct mtd_info *mtd, loff_t from, size_t len, size_t
 static int map_absent_write(struct mtd_info *mtd, loff_t to, size_t len, size_t *retlen, const u_char *buf)
 {
         *retlen = 0;
-        return -ENODEV; 
+        return -ENODEV;
 }
 
 static int map_absent_erase(struct mtd_info *mtd, struct erase_info *instr)
diff --git a/drivers/mtd/chips/sharp.c b/drivers/mtd/chips/sharp.c
index c3cf0f63bc93..2d26bdef82d5 100644
--- a/drivers/mtd/chips/sharp.c
+++ b/drivers/mtd/chips/sharp.c
@@ -4,7 +4,7 @@
  * Copyright 2000,2001 David A. Schleef <ds@schleef.org>
  *           2000,2001 Lineo, Inc.
  *
- * $Id: sharp.c,v 1.14 2004/08/09 13:19:43 dwmw2 Exp $
+ * $Id: sharp.c,v 1.16 2005/11/07 11:14:23 gleixner Exp $
  *
  * Devices supported:
  *   LH28F016SCT Symmetrical block flash memory, 2Mx8
@@ -31,6 +31,7 @@
 #include <linux/mtd/cfi.h>
 #include <linux/delay.h>
 #include <linux/init.h>
+#include <linux/slab.h>
 
 #define CMD_RESET               0xffffffff
 #define CMD_READ_ID             0x90909090
@@ -214,7 +215,7 @@ static int sharp_probe_map(struct map_info *map,struct mtd_info *mtd)
 /* This function returns with the chip->mutex lock held. */
 static int sharp_wait(struct map_info *map, struct flchip *chip)
 {
-        __u16 status;
+        int status, i;
         unsigned long timeo = jiffies + HZ;
         DECLARE_WAITQUEUE(wait, current);
         int adr = 0;
@@ -227,13 +228,11 @@ retry:
                 map_write32(map,CMD_READ_STATUS,adr);
                 chip->state = FL_STATUS;
         case FL_STATUS:
-                status = map_read32(map,adr);
-//printk("status=%08x\n",status);
-
-                udelay(100);
-                if((status & SR_READY)!=SR_READY){
-//printk(".status=%08x\n",status);
-                        udelay(100);
+                for(i=0;i<100;i++){
+                        status = map_read32(map,adr);
+                        if((status & SR_READY)==SR_READY)
+                                break;
+                        udelay(1);
                 }
                 break;
         default:
@@ -460,12 +459,12 @@ static int sharp_do_wait_for_ready(struct map_info *map, struct flchip *chip,
                 remove_wait_queue(&chip->wq, &wait);
 
                 //spin_lock_bh(chip->mutex);
-                
+
                 if (signal_pending(current)){
                         ret = -EINTR;
                         goto out;
                 }
-                
+
         }
         ret = -ETIME;
 out:
@@ -564,7 +563,7 @@ static int sharp_suspend(struct mtd_info *mtd)
 static void sharp_resume(struct mtd_info *mtd)
 {
         printk("sharp_resume()\n");
-        
+
 }
 
 static void sharp_destroy(struct mtd_info *mtd)
diff --git a/drivers/mtd/cmdlinepart.c b/drivers/mtd/cmdlinepart.c
index ef24837019d3..6b8bb2e4dcfd 100644
--- a/drivers/mtd/cmdlinepart.c
+++ b/drivers/mtd/cmdlinepart.c
@@ -1,24 +1,24 @@
 /*
- * $Id: cmdlinepart.c,v 1.18 2005/06/07 15:04:26 joern Exp $
+ * $Id: cmdlinepart.c,v 1.19 2005/11/07 11:14:19 gleixner Exp $
  *
  * Read flash partition table from command line
  *
  * Copyright 2002 SYSGO Real-Time Solutions GmbH
  *
  * The format for the command line is as follows:
- * 
+ *
  * mtdparts=<mtddef>[;<mtddef]
  * <mtddef>  := <mtd-id>:<partdef>[,<partdef>]
  * <partdef> := <size>[@offset][<name>][ro]
  * <mtd-id>  := unique name used in mapping driver/device (mtd->name)
  * <size>    := standard linux memsize OR "-" to denote all remaining space
  * <name>    := '(' NAME ')'
- * 
+ *
  * Examples:
- * 
+ *
  * 1 NOR Flash, with 1 single writable partition:
  * edb7312-nor:-
- * 
+ *
  * 1 NOR Flash with 2 partitions, 1 NAND with one
  * edb7312-nor:256k(ARMboot)ro,-(root);edb7312-nand:-(home)
  */
@@ -60,17 +60,17 @@ static int cmdline_parsed = 0;
 
 /*
  * Parse one partition definition for an MTD. Since there can be many
- * comma separated partition definitions, this function calls itself 
+ * comma separated partition definitions, this function calls itself
  * recursively until no more partition definitions are found. Nice side
  * effect: the memory to keep the mtd_partition structs and the names
  * is allocated upon the last definition being found. At that point the
  * syntax has been verified ok.
  */
-static struct mtd_partition * newpart(char *s, 
+static struct mtd_partition * newpart(char *s,
                                       char **retptr,
                                       int *num_parts,
-                                      int this_part, 
-                                      unsigned char **extra_mem_ptr, 
+                                      int this_part,
+                                      unsigned char **extra_mem_ptr,
                                       int extra_mem_size)
 {
         struct mtd_partition *parts;
@@ -102,7 +102,7 @@ static struct mtd_partition * newpart(char *s,
         mask_flags = 0; /* this is going to be a regular partition */
         delim = 0;
         /* check for offset */
-        if (*s == '@') 
+        if (*s == '@')
         {
                 s++;
                 offset = memparse(s, &s);
@@ -112,7 +112,7 @@ static struct mtd_partition * newpart(char *s,
         {
                 delim = ')';
         }
-                
+
         if (delim)
         {
                 char *p;
@@ -131,12 +131,12 @@ static struct mtd_partition * newpart(char *s,
                 name = NULL;
                 name_len = 13; /* Partition_000 */
         }
-   
+
         /* record name length for memory allocation later */
         extra_mem_size += name_len + 1;
 
         /* test for options */
-        if (strncmp(s, "ro", 2) == 0) 
+        if (strncmp(s, "ro", 2) == 0)
         {
                 mask_flags |= MTD_WRITEABLE;
                 s += 2;
@@ -151,7 +151,7 @@ static struct mtd_partition * newpart(char *s,
                         return NULL;
                 }
                 /* more partitions follow, parse them */
-                if ((parts = newpart(s + 1, &s, num_parts, 
+                if ((parts = newpart(s + 1, &s, num_parts,
                                      this_part + 1, &extra_mem, extra_mem_size)) == 0)
                   return NULL;
         }
@@ -187,7 +187,7 @@ static struct mtd_partition * newpart(char *s,
         extra_mem += name_len + 1;
 
         dbg(("partition %d: name <%s>, offset %x, size %x, mask flags %x\n",
-             this_part, 
+             this_part,
              parts[this_part].name,
              parts[this_part].offset,
              parts[this_part].size,
@@ -204,8 +204,8 @@ static struct mtd_partition * newpart(char *s,
         return parts;
 }
 
-/* 
- * Parse the command line. 
+/*
+ * Parse the command line.
  */
 static int mtdpart_setup_real(char *s)
 {
@@ -230,7 +230,7 @@ static int mtdpart_setup_real(char *s)
 
                 dbg(("parsing <%s>\n", p+1));
 
-                /* 
+                /*
                  * parse one mtd. have it reserve memory for the
                  * struct cmdline_mtd_partition and the mtd-id string.
                  */
@@ -239,7 +239,7 @@ static int mtdpart_setup_real(char *s)
                                 &num_parts,     /* out: number of parts */
                                 0,              /* first partition */
                                 (unsigned char**)&this_mtd, /* out: extra mem */
-                                mtd_id_len + 1 + sizeof(*this_mtd) + 
+                                mtd_id_len + 1 + sizeof(*this_mtd) +
                                 sizeof(void*)-1 /*alignment*/);
                 if(!parts)
                 {
@@ -254,21 +254,21 @@ static int mtdpart_setup_real(char *s)
                  }
 
                 /* align this_mtd */
-                this_mtd = (struct cmdline_mtd_partition *) 
+                this_mtd = (struct cmdline_mtd_partition *)
                         ALIGN((unsigned long)this_mtd, sizeof(void*));
-                /* enter results */         
+                /* enter results */
                 this_mtd->parts = parts;
                 this_mtd->num_parts = num_parts;
                 this_mtd->mtd_id = (char*)(this_mtd + 1);
                 strlcpy(this_mtd->mtd_id, mtd_id, mtd_id_len + 1);
 
                 /* link into chain */
-                this_mtd->next = partitions;            
+                this_mtd->next = partitions;
                 partitions = this_mtd;
 
-                dbg(("mtdid=<%s> num_parts=<%d>\n", 
+                dbg(("mtdid=<%s> num_parts=<%d>\n",
                      this_mtd->mtd_id, this_mtd->num_parts));
-                
+
 
                 /* EOS - we're done */
                 if (*s == 0)
@@ -292,7 +292,7 @@ static int mtdpart_setup_real(char *s)
  * information. It returns partitions for the requested mtd device, or
  * the first one in the chain if a NULL mtd_id is passed in.
  */
-static int parse_cmdline_partitions(struct mtd_info *master, 
+static int parse_cmdline_partitions(struct mtd_info *master,
                              struct mtd_partition **pparts,
                              unsigned long origin)
 {
@@ -322,7 +322,7 @@ static int parse_cmdline_partitions(struct mtd_info *master,
                                   part->parts[i].size = master->size - offset;
                                 if (offset + part->parts[i].size > master->size)
                                 {
-                                        printk(KERN_WARNING ERRP 
+                                        printk(KERN_WARNING ERRP
                                                "%s: partitioning exceeds flash size, truncating\n",
                                                part->mtd_id);
                                         part->parts[i].size = master->size - offset;
@@ -338,8 +338,8 @@ static int parse_cmdline_partitions(struct mtd_info *master,
 }
 
 
-/* 
- * This is the handler for our kernel parameter, called from 
+/*
+ * This is the handler for our kernel parameter, called from
  * main.c::checksetup(). Note that we can not yet kmalloc() anything,
  * so we only save the commandline for later processing.
  *
diff --git a/drivers/mtd/devices/Kconfig b/drivers/mtd/devices/Kconfig
index c4a56a4ac5e2..9a2aa4033c6a 100644
--- a/drivers/mtd/devices/Kconfig
+++ b/drivers/mtd/devices/Kconfig
@@ -1,5 +1,5 @@
 # drivers/mtd/maps/Kconfig
-# $Id: Kconfig,v 1.15 2004/12/22 17:51:15 joern Exp $
+# $Id: Kconfig,v 1.18 2005/11/07 11:14:24 gleixner Exp $
 
 menu "Self-contained MTD device drivers"
         depends on MTD!=n
@@ -110,7 +110,7 @@ config MTDRAM_ABS_POS
           If you have system RAM accessible by the CPU but not used by Linux
           in normal operation, you can give the physical address at which the
           available RAM starts, and the MTDRAM driver will use it instead of
-          allocating space from Linux's available memory. Otherwise, leave 
+          allocating space from Linux's available memory. Otherwise, leave
           this set to zero. Most people will want to leave this as zero.
 
 config MTD_BLKMTD
@@ -165,7 +165,7 @@ config MTD_DOC2001
         select MTD_DOCPROBE
         select MTD_NAND_IDS
         ---help---
-          This provides an alternative MTD device driver for the M-Systems 
+          This provides an alternative MTD device driver for the M-Systems
           DiskOnChip Millennium devices.  Use this if you have problems with
           the combined DiskOnChip 2000 and Millennium driver above.  To get
           the DiskOnChip probe code to load and use this driver instead of
@@ -192,7 +192,7 @@ config MTD_DOC2001PLUS
 
           If you use this device, you probably also want to enable the INFTL
           'Inverse NAND Flash Translation Layer' option below, which is used
-          to emulate a block device by using a kind of file system on the 
+          to emulate a block device by using a kind of file system on the
           flash chips.
 
           NOTE: This driver will soon be replaced by the new DiskOnChip driver
diff --git a/drivers/mtd/devices/blkmtd.c b/drivers/mtd/devices/blkmtd.c
index 662e807801ed..f9db52f6bf00 100644
--- a/drivers/mtd/devices/blkmtd.c
+++ b/drivers/mtd/devices/blkmtd.c
@@ -1,5 +1,5 @@
 /*
- * $Id: blkmtd.c,v 1.24 2004/11/16 18:29:01 dwmw2 Exp $
+ * $Id: blkmtd.c,v 1.27 2005/11/07 11:14:24 gleixner Exp $
  *
  * blkmtd.c - use a block device as a fake MTD
  *
@@ -39,7 +39,7 @@
 
 /* Default erase size in K, always make it a multiple of PAGE_SIZE */
 #define CONFIG_MTD_BLKDEV_ERASESIZE (128 << 10) /* 128KiB */
-#define VERSION "$Revision: 1.24 $"
+#define VERSION "$Revision: 1.27 $"
 
 /* Info for the block device */
 struct blkmtd_dev {
@@ -117,7 +117,7 @@ static int bi_write_complete(struct bio *bio, unsigned int bytes_done, int error
                 unlock_page(page);
                 page_cache_release(page);
         } while (bvec >= bio->bi_io_vec);
-        
+
         complete((struct completion*)bio->bi_private);
         return 0;
 }
@@ -135,7 +135,7 @@ static int blkmtd_readpage(struct blkmtd_dev *dev, struct page *page)
                 unlock_page(page);
                 return 0;
         }
-        
+
         ClearPageUptodate(page);
         ClearPageError(page);
 
@@ -539,11 +539,8 @@ static void free_device(struct blkmtd_dev *dev)
 {
         DEBUG(2, "blkmtd: free_device() dev = %p\n", dev);
         if(dev) {
-                if(dev->mtd_info.eraseregions)
-                        kfree(dev->mtd_info.eraseregions);
-                if(dev->mtd_info.name)
-                        kfree(dev->mtd_info.name);
-
+                kfree(dev->mtd_info.eraseregions);
+                kfree(dev->mtd_info.name);
                 if(dev->blkdev) {
                         invalidate_inode_pages(dev->blkdev->bd_inode->i_mapping);
                         close_bdev_excl(dev->blkdev);
@@ -710,7 +707,7 @@ static struct blkmtd_dev *add_device(char *devname, int readonly, int erase_size
                      dev->mtd_info.erasesize >> 10,
                      readonly ? "(read-only)" : "");
         }
-        
+
         return dev;
 
  devinit_err:
diff --git a/drivers/mtd/devices/block2mtd.c b/drivers/mtd/devices/block2mtd.c
index 4a7a805e7564..0aaa0ced9aba 100644
--- a/drivers/mtd/devices/block2mtd.c
+++ b/drivers/mtd/devices/block2mtd.c
@@ -1,5 +1,5 @@
 /*
- * $Id: block2mtd.c,v 1.28 2005/03/19 22:40:44 gleixner Exp $
+ * $Id: block2mtd.c,v 1.29 2005/11/07 11:14:24 gleixner Exp $
  *
  * block2mtd.c - create an mtd from a block device
  *
@@ -19,7 +19,7 @@
 #include <linux/mtd/mtd.h>
 #include <linux/buffer_head.h>
 
-#define VERSION "$Revision: 1.28 $"
+#define VERSION "$Revision: 1.29 $"
 
 
 #define ERROR(fmt, args...) printk(KERN_ERR "block2mtd: " fmt "\n" , ## args)
@@ -111,7 +111,7 @@ static int _block2mtd_erase(struct block2mtd_dev *dev, loff_t to, size_t len)
                         return PTR_ERR(page);
 
                 max = (u_long*)page_address(page) + PAGE_SIZE;
-                for (p=(u_long*)page_address(page); p<max; p++) 
+                for (p=(u_long*)page_address(page); p<max; p++)
                         if (*p != -1UL) {
                                 lock_page(page);
                                 memset(page_address(page), 0xff, PAGE_SIZE);
@@ -206,7 +206,7 @@ static int _block2mtd_write(struct block2mtd_dev *dev, const u_char *buf,
         if (retlen)
                 *retlen = 0;
         while (len) {
-                if ((offset+len) > PAGE_SIZE) 
+                if ((offset+len) > PAGE_SIZE)
                         cpylen = PAGE_SIZE - offset;    // multiple pages
                 else
                         cpylen = len;                   // this page
diff --git a/drivers/mtd/devices/doc2000.c b/drivers/mtd/devices/doc2000.c
index 5fc532895a24..be5e88b3888d 100644
--- a/drivers/mtd/devices/doc2000.c
+++ b/drivers/mtd/devices/doc2000.c
@@ -4,7 +4,7 @@
  * (c) 1999 Machine Vision Holdings, Inc.
  * (c) 1999, 2000 David Woodhouse <dwmw2@infradead.org>
  *
- * $Id: doc2000.c,v 1.66 2005/01/05 18:05:12 dwmw2 Exp $
+ * $Id: doc2000.c,v 1.67 2005/11/07 11:14:24 gleixner Exp $
  */
 
 #include <linux/kernel.h>
@@ -58,7 +58,7 @@ static int doc_read_ecc(struct mtd_info *mtd, loff_t from, size_t len,
                         size_t *retlen, u_char *buf, u_char *eccbuf, struct nand_oobinfo *oobsel);
 static int doc_write_ecc(struct mtd_info *mtd, loff_t to, size_t len,
                          size_t *retlen, const u_char *buf, u_char *eccbuf, struct nand_oobinfo *oobsel);
-static int doc_writev_ecc(struct mtd_info *mtd, const struct kvec *vecs, 
+static int doc_writev_ecc(struct mtd_info *mtd, const struct kvec *vecs,
                           unsigned long count, loff_t to, size_t *retlen,
                           u_char *eccbuf, struct nand_oobinfo *oobsel);
 static int doc_read_oob(struct mtd_info *mtd, loff_t ofs, size_t len,
@@ -76,14 +76,14 @@ static void DoC_Delay(struct DiskOnChip *doc, unsigned short cycles)
 {
         volatile char dummy;
         int i;
-        
+
         for (i = 0; i < cycles; i++) {
                 if (DoC_is_Millennium(doc))
                         dummy = ReadDOC(doc->virtadr, NOP);
                 else
                         dummy = ReadDOC(doc->virtadr, DOCStatus);
         }
-        
+
 }
 
 /* DOC_WaitReady: Wait for RDY line to be asserted by the flash chip */
@@ -220,8 +220,8 @@ static int DoC_Address(struct DiskOnChip *doc, int numbytes, unsigned long ofs,
                 WriteDOC(ofs & 0xff, docptr, WritePipeTerm);
 
         DoC_Delay(doc, 2);      /* Needed for some slow flash chips. mf. */
-        
-        /* FIXME: The SlowIO's for millennium could be replaced by 
+
+        /* FIXME: The SlowIO's for millennium could be replaced by
            a single WritePipeTerm here. mf. */
 
         /* Lower the ALE line */
@@ -377,9 +377,9 @@ static int DoC_IdentChip(struct DiskOnChip *doc, int floor, int chip)
         if (mfr == 0xff || mfr == 0)
                 return 0;
 
-        /* Check it's the same as the first chip we identified. 
+        /* Check it's the same as the first chip we identified.
          * M-Systems say that any given DiskOnChip device should only
-         * contain _one_ type of flash part, although that's not a 
+         * contain _one_ type of flash part, although that's not a
          * hardware restriction. */
         if (doc->mfr) {
                 if (doc->mfr == mfr && doc->id == id)
@@ -397,7 +397,7 @@ static int DoC_IdentChip(struct DiskOnChip *doc, int floor, int chip)
                         for (j = 0; nand_manuf_ids[j].id != 0x0; j++) {
                                 if (nand_manuf_ids[j].id == mfr)
                                         break;
-                        }       
+                        }
                         printk(KERN_INFO
                                "Flash chip found: Manufacturer ID: %2.2X, "
                                "Chip ID: %2.2X (%s:%s)\n", mfr, id,
@@ -405,7 +405,7 @@ static int DoC_IdentChip(struct DiskOnChip *doc, int floor, int chip)
                         if (!doc->mfr) {
                                 doc->mfr = mfr;
                                 doc->id = id;
-                                doc->chipshift = 
+                                doc->chipshift =
                                         ffs((nand_flash_ids[i].chipsize << 20)) - 1;
                                 doc->page256 = (nand_flash_ids[i].pagesize == 256) ? 1 : 0;
                                 doc->pageadrlen = doc->chipshift > 25 ? 3 : 2;
@@ -467,7 +467,7 @@ static void DoC_ScanChips(struct DiskOnChip *this, int maxchips)
 
         ret = 0;
 
-        /* Fill out the chip array with {floor, chipno} for each 
+        /* Fill out the chip array with {floor, chipno} for each
          * detected chip in the device. */
         for (floor = 0; floor < MAX_FLOORS; floor++) {
                 for (chip = 0; chip < numchips[floor]; chip++) {
@@ -757,12 +757,12 @@ static int doc_read_ecc(struct mtd_info *mtd, loff_t from, size_t len,
                                      (long)from, eccbuf[0], eccbuf[1], eccbuf[2],
                                      eccbuf[3], eccbuf[4], eccbuf[5]);
 #endif
-                
+
                         /* disable the ECC engine */
                         WriteDOC(DOC_ECC_DIS, docptr , ECCConf);
                 }
 
-                /* according to 11.4.1, we need to wait for the busy line 
+                /* according to 11.4.1, we need to wait for the busy line
                  * drop if we read to the end of the page.  */
                 if(0 == ((from + len) & 0x1ff))
                 {
@@ -941,7 +941,7 @@ static int doc_write_ecc(struct mtd_info *mtd, loff_t to, size_t len,
 
                 /* Let the caller know we completed it */
                 *retlen += len;
-                
+
                 if (eccbuf) {
                         unsigned char x[8];
                         size_t dummy;
@@ -950,10 +950,10 @@ static int doc_write_ecc(struct mtd_info *mtd, loff_t to, size_t len,
                         /* Write the ECC data to flash */
                         for (di=0; di<6; di++)
                                 x[di] = eccbuf[di];
-                
+
                         x[6]=0x55;
                         x[7]=0x55;
-                
+
                         ret = doc_write_oob_nolock(mtd, to, 8, &dummy, x);
                         if (ret) {
                                 up(&this->lock);
@@ -970,7 +970,7 @@ static int doc_write_ecc(struct mtd_info *mtd, loff_t to, size_t len,
         return 0;
 }
 
-static int doc_writev_ecc(struct mtd_info *mtd, const struct kvec *vecs, 
+static int doc_writev_ecc(struct mtd_info *mtd, const struct kvec *vecs,
                           unsigned long count, loff_t to, size_t *retlen,
                           u_char *eccbuf, struct nand_oobinfo *oobsel)
 {
@@ -1022,7 +1022,7 @@ static int doc_writev_ecc(struct mtd_info *mtd, const struct kvec *vecs,
                         break;
 
                 to += thislen;
-        }               
+        }
 
         up(&writev_buf_sem);
         *retlen = totretlen;
@@ -1080,7 +1080,7 @@ static int doc_read_oob(struct mtd_info *mtd, loff_t ofs, size_t len,
         /* Reading the full OOB data drops us off of the end of the page,
          * causing the flash device to go into busy mode, so we need
          * to wait until ready 11.4.1 and Toshiba TC58256FT docs */
-        
+
         ret = DoC_WaitReady(this);
 
         up(&this->lock);
@@ -1190,7 +1190,7 @@ static int doc_write_oob_nolock(struct mtd_info *mtd, loff_t ofs, size_t len,
         return 0;
 
 }
- 
+
 static int doc_write_oob(struct mtd_info *mtd, loff_t ofs, size_t len,
                          size_t * retlen, const u_char * buf)
 {
@@ -1222,7 +1222,7 @@ static int doc_erase(struct mtd_info *mtd, struct erase_info *instr)
         }
 
         instr->state = MTD_ERASING;
-                
+
         /* FIXME: Do this in the background. Use timers or schedule_task() */
         while(len) {
                 mychip = &this->chips[ofs >> this->chipshift];
diff --git a/drivers/mtd/devices/doc2001.c b/drivers/mtd/devices/doc2001.c
index 1e704915ef08..fcb28a6fd89f 100644
--- a/drivers/mtd/devices/doc2001.c
+++ b/drivers/mtd/devices/doc2001.c
@@ -4,7 +4,7 @@
  * (c) 1999 Machine Vision Holdings, Inc.
  * (c) 1999, 2000 David Woodhouse <dwmw2@infradead.org>
  *
- * $Id: doc2001.c,v 1.48 2005/01/05 18:05:12 dwmw2 Exp $
+ * $Id: doc2001.c,v 1.49 2005/11/07 11:14:24 gleixner Exp $
  */
 
 #include <linux/kernel.h>
@@ -196,10 +196,10 @@ static int DoC_IdentChip(struct DiskOnChip *doc, int floor, int chip)
         DoC_Command(doc->virtadr, NAND_CMD_RESET, CDSN_CTRL_WP);
         DoC_WaitReady(doc->virtadr);
 
-        /* Read the NAND chip ID: 1. Send ReadID command */ 
+        /* Read the NAND chip ID: 1. Send ReadID command */
         DoC_Command(doc->virtadr, NAND_CMD_READID, CDSN_CTRL_WP);
 
-        /* Read the NAND chip ID: 2. Send address byte zero */ 
+        /* Read the NAND chip ID: 2. Send address byte zero */
         DoC_Address(doc->virtadr, 1, 0x00, CDSN_CTRL_WP, 0x00);
 
         /* Read the manufacturer and device id codes of the flash device through
@@ -223,7 +223,7 @@ static int DoC_IdentChip(struct DiskOnChip *doc, int floor, int chip)
                         for (j = 0; nand_manuf_ids[j].id != 0x0; j++) {
                                 if (nand_manuf_ids[j].id == mfr)
                                         break;
-                        }       
+                        }
                         printk(KERN_INFO "Flash chip found: Manufacturer ID: %2.2X, "
                                "Chip ID: %2.2X (%s:%s)\n",
                                mfr, id, nand_manuf_ids[j].name, nand_flash_ids[i].name);
@@ -275,7 +275,7 @@ static void DoC_ScanChips(struct DiskOnChip *this)
                 return;
         }
 
-        /* Fill out the chip array with {floor, chipno} for each 
+        /* Fill out the chip array with {floor, chipno} for each
          * detected chip in the device. */
         for (floor = 0, ret = 0; floor < MAX_FLOORS_MIL; floor++) {
                 for (chip = 0 ; chip < numchips[floor] ; chip++) {
@@ -309,7 +309,7 @@ static int DoCMil_is_alias(struct DiskOnChip *doc1, struct DiskOnChip *doc2)
         tmp2 = ReadDOC(doc2->virtadr, AliasResolution);
         if (tmp1 != tmp2)
                 return 0;
-        
+
         WriteDOC((tmp1+1) % 0xff, doc1->virtadr, AliasResolution);
         tmp2 = ReadDOC(doc2->virtadr, AliasResolution);
         if (tmp2 == (tmp1+1) % 0xff)
@@ -425,7 +425,7 @@ static int doc_read_ecc (struct mtd_info *mtd, loff_t from, size_t len,
                 return -EINVAL;
 
         /* Don't allow a single read to cross a 512-byte block boundary */
-        if (from + len > ((from | 0x1ff) + 1)) 
+        if (from + len > ((from | 0x1ff) + 1))
                 len = ((from | 0x1ff) + 1) - from;
 
         /* Find the chip which is to be used and select it */
@@ -552,7 +552,7 @@ static int doc_write_ecc (struct mtd_info *mtd, loff_t to, size_t len,
 
 #if 0
         /* Don't allow a single write to cross a 512-byte block boundary */
-        if (to + len > ( (to | 0x1ff) + 1)) 
+        if (to + len > ( (to | 0x1ff) + 1))
                 len = ((to | 0x1ff) + 1) - to;
 #else
         /* Don't allow writes which aren't exactly one block */
@@ -632,7 +632,7 @@ static int doc_write_ecc (struct mtd_info *mtd, loff_t to, size_t len,
 
                 /* write the block status BLOCK_USED (0x5555) at the end of ECC data
                    FIXME: this is only a hack for programming the IPL area for LinuxBIOS
-                   and should be replace with proper codes in user space utilities */ 
+                   and should be replace with proper codes in user space utilities */
                 WriteDOC(0x55, docptr, Mil_CDSN_IO);
                 WriteDOC(0x55, docptr, Mil_CDSN_IO + 1);
 
@@ -802,7 +802,7 @@ int doc_erase (struct mtd_info *mtd, struct erase_info *instr)
         void __iomem *docptr = this->virtadr;
         struct Nand *mychip = &this->chips[ofs >> this->chipshift];
 
-        if (len != mtd->erasesize) 
+        if (len != mtd->erasesize)
                 printk(KERN_WARNING "Erase not right size (%x != %x)n",
                        len, mtd->erasesize);
 
@@ -870,9 +870,9 @@ static void __exit cleanup_doc2001(void)
         while ((mtd=docmillist)) {
                 this = mtd->priv;
                 docmillist = this->nextdoc;
-                        
+
                 del_mtd_device(mtd);
-                        
+
                 iounmap(this->virtadr);
                 kfree(this->chips);
                 kfree(mtd);
diff --git a/drivers/mtd/devices/doc2001plus.c b/drivers/mtd/devices/doc2001plus.c
index ed47bafb2ce2..0595cc7324b2 100644
--- a/drivers/mtd/devices/doc2001plus.c
+++ b/drivers/mtd/devices/doc2001plus.c
@@ -6,7 +6,7 @@
  * (c) 1999 Machine Vision Holdings, Inc.
  * (c) 1999, 2000 David Woodhouse <dwmw2@infradead.org>
  *
- * $Id: doc2001plus.c,v 1.13 2005/01/05 18:05:12 dwmw2 Exp $
+ * $Id: doc2001plus.c,v 1.14 2005/11/07 11:14:24 gleixner Exp $
  *
  * Released under GPL
  */
@@ -293,10 +293,10 @@ static int DoC_IdentChip(struct DiskOnChip *doc, int floor, int chip)
         DoC_Command(docptr, NAND_CMD_RESET, 0);
         DoC_WaitReady(docptr);
 
-        /* Read the NAND chip ID: 1. Send ReadID command */ 
+        /* Read the NAND chip ID: 1. Send ReadID command */
         DoC_Command(docptr, NAND_CMD_READID, 0);
 
-        /* Read the NAND chip ID: 2. Send address byte zero */ 
+        /* Read the NAND chip ID: 2. Send address byte zero */
         DoC_Address(doc, 1, 0x00, 0, 0x00);
 
         WriteDOC(0, docptr, Mplus_FlashControl);
@@ -365,7 +365,7 @@ static void DoC_ScanChips(struct DiskOnChip *this)
                 this->interleave = 1;
 
         /* Check the ASIC agrees */
-        if ( (this->interleave << 2) != 
+        if ( (this->interleave << 2) !=
              (ReadDOC(this->virtadr, Mplus_Configuration) & 4)) {
                 u_char conf = ReadDOC(this->virtadr, Mplus_Configuration);
                 printk(KERN_NOTICE "Setting DiskOnChip Millennium Plus interleave to %s\n",
@@ -398,7 +398,7 @@ static void DoC_ScanChips(struct DiskOnChip *this)
                 return;
         }
 
-        /* Fill out the chip array with {floor, chipno} for each 
+        /* Fill out the chip array with {floor, chipno} for each
          * detected chip in the device. */
         for (floor = 0, ret = 0; floor < MAX_FLOORS_MPLUS; floor++) {
                 for (chip = 0 ; chip < numchips[floor] ; chip++) {
@@ -432,7 +432,7 @@ static int DoCMilPlus_is_alias(struct DiskOnChip *doc1, struct DiskOnChip *doc2)
         tmp2 = ReadDOC(doc2->virtadr, Mplus_AliasResolution);
         if (tmp1 != tmp2)
                 return 0;
-        
+
         WriteDOC((tmp1+1) % 0xff, doc1->virtadr, Mplus_AliasResolution);
         tmp2 = ReadDOC(doc2->virtadr, Mplus_AliasResolution);
         if (tmp2 == (tmp1+1) % 0xff)
@@ -624,7 +624,7 @@ static int doc_read_ecc(struct mtd_info *mtd, loff_t from, size_t len,
                 return -EINVAL;
 
         /* Don't allow a single read to cross a 512-byte block boundary */
-        if (from + len > ((from | 0x1ff) + 1)) 
+        if (from + len > ((from | 0x1ff) + 1))
                 len = ((from | 0x1ff) + 1) - from;
 
         DoC_CheckASIC(docptr);
@@ -1066,7 +1066,7 @@ int doc_erase(struct mtd_info *mtd, struct erase_info *instr)
 
         DoC_CheckASIC(docptr);
 
-        if (len != mtd->erasesize) 
+        if (len != mtd->erasesize)
                 printk(KERN_WARNING "MTD: Erase not right size (%x != %x)n",
                        len, mtd->erasesize);
 
@@ -1136,9 +1136,9 @@ static void __exit cleanup_doc2001plus(void)
         while ((mtd=docmilpluslist)) {
                 this = mtd->priv;
                 docmilpluslist = this->nextdoc;
-                        
+
                 del_mtd_device(mtd);
-                        
+
                 iounmap(this->virtadr);
                 kfree(this->chips);
                 kfree(mtd);
diff --git a/drivers/mtd/devices/docecc.c b/drivers/mtd/devices/docecc.c
index 24f670b5a4f3..cd3db72bef96 100644
--- a/drivers/mtd/devices/docecc.c
+++ b/drivers/mtd/devices/docecc.c
@@ -4,10 +4,10 @@
  * GNU GPL License. The rest is simply to convert the disk on chip
  * syndrom into a standard syndom.
  *
- * Author: Fabrice Bellard (fabrice.bellard@netgem.com) 
+ * Author: Fabrice Bellard (fabrice.bellard@netgem.com)
  * Copyright (C) 2000 Netgem S.A.
  *
- * $Id: docecc.c,v 1.5 2003/05/21 15:15:06 dwmw2 Exp $
+ * $Id: docecc.c,v 1.7 2005/11/07 11:14:25 gleixner Exp $
  *
  * 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
@@ -122,7 +122,7 @@ for(ci=(n)-1;ci >=0;ci--)\
         a(0) + a(1) @ + a(2) @^2 + ... + a(m-1) @^(m-1)
    we consider the integer "i" whose binary representation with a(0) being LSB
    and a(m-1) MSB is (a(0),a(1),...,a(m-1)) and locate the entry
-   "index_of[i]". Now, @^index_of[i] is that element whose polynomial 
+   "index_of[i]". Now, @^index_of[i] is that element whose polynomial
     representation is (a(0),a(1),a(2),...,a(m-1)).
    NOTE:
         The element alpha_to[2^m-1] = 0 always signifying that the
@@ -130,7 +130,7 @@ for(ci=(n)-1;ci >=0;ci--)\
         Similarily, the element index_of[0] = A0 always signifying
    that the power of alpha which has the polynomial representation
    (0,0,...,0) is "infinity".
- 
+
 */
 
 static void
@@ -176,7 +176,7 @@ generate_gf(dtype Alpha_to[NN + 1], dtype Index_of[NN + 1])
  * are written back. NOTE! This array must be at least NN-KK elements long.
  * The corrected data are written in eras_val[]. They must be xor with the data
  * to retrieve the correct data : data[erase_pos[i]] ^= erase_val[i] .
- * 
+ *
  * First "no_eras" erasures are declared by the calling program. Then, the
  * maximum # of errors correctable is t_after_eras = floor((NN-KK-no_eras)/2).
  * If the number of channel errors is not greater than "t_after_eras" the
@@ -189,7 +189,7 @@ generate_gf(dtype Alpha_to[NN + 1], dtype Index_of[NN + 1])
  * */
 static int
 eras_dec_rs(dtype Alpha_to[NN + 1], dtype Index_of[NN + 1],
-            gf bb[NN - KK + 1], gf eras_val[NN-KK], int eras_pos[NN-KK], 
+            gf bb[NN - KK + 1], gf eras_val[NN-KK], int eras_pos[NN-KK],
             int no_eras)
 {
   int deg_lambda, el, deg_omega;
@@ -212,7 +212,7 @@ eras_dec_rs(dtype Alpha_to[NN + 1], dtype Index_of[NN + 1],
     count = 0;
     goto finish;
   }
-  
+
   for(i=1;i<=NN-KK;i++){
     s[i] = bb[0];
   }
@@ -220,7 +220,7 @@ eras_dec_rs(dtype Alpha_to[NN + 1], dtype Index_of[NN + 1],
     if(bb[j] == 0)
       continue;
     tmp = Index_of[bb[j]];
-    
+
     for(i=1;i<=NN-KK;i++)
       s[i] ^= Alpha_to[modnn(tmp + (B0+i-1)*PRIM*j)];
   }
@@ -234,7 +234,7 @@ eras_dec_rs(dtype Alpha_to[NN + 1], dtype Index_of[NN + 1],
           tmp = modnn(tmp + 2 * KK * (B0+i-1)*PRIM);
       s[i] = tmp;
   }
-  
+
   CLEAR(&lambda[1],NN-KK);
   lambda[0] = 1;
 
@@ -252,7 +252,7 @@ eras_dec_rs(dtype Alpha_to[NN + 1], dtype Index_of[NN + 1],
 #if DEBUG_ECC >= 1
     /* Test code that verifies the erasure locator polynomial just constructed
        Needed only for decoder debugging. */
-    
+
     /* find roots of the erasure location polynomial */
     for(i=1;i<=no_eras;i++)
       reg[i] = Index_of[lambda[i]];
@@ -286,7 +286,7 @@ eras_dec_rs(dtype Alpha_to[NN + 1], dtype Index_of[NN + 1],
   }
   for(i=0;i<NN-KK+1;i++)
     b[i] = Index_of[lambda[i]];
-  
+
   /*
    * Begin Berlekamp-Massey algorithm to determine error+erasure
    * locator polynomial
@@ -389,7 +389,7 @@ eras_dec_rs(dtype Alpha_to[NN + 1], dtype Index_of[NN + 1],
     omega[i] = Index_of[tmp];
   }
   omega[NN-KK] = A0;
-  
+
   /*
    * Compute error values in poly-form. num1 = omega(inv(X(l))), num2 =
    * inv(X(l))**(B0-1) and den = lambda_pr(inv(X(l))) all in poly-form
@@ -402,7 +402,7 @@ eras_dec_rs(dtype Alpha_to[NN + 1], dtype Index_of[NN + 1],
     }
     num2 = Alpha_to[modnn(root[j] * (B0 - 1) + NN)];
     den = 0;
-    
+
     /* lambda[i+1] for i even is the formal derivative lambda_pr of lambda[i] */
     for (i = min(deg_lambda,NN-KK-1) & ~1; i >= 0; i -=2) {
       if(lambda[i+1] != A0)
@@ -436,11 +436,11 @@ eras_dec_rs(dtype Alpha_to[NN + 1], dtype Index_of[NN + 1],
 /* The sector bytes are packed into NB_DATA MM bits words */
 #define NB_DATA (((SECTOR_SIZE + 1) * 8 + 6) / MM)
 
-/* 
+/*
  * Correct the errors in 'sector[]' by using 'ecc1[]' which is the
  * content of the feedback shift register applyied to the sector and
  * the ECC. Return the number of errors corrected (and correct them in
- * sector), or -1 if error 
+ * sector), or -1 if error
  */
 int doc_decode_ecc(unsigned char sector[SECTOR_SIZE], unsigned char ecc1[6])
 {
@@ -454,7 +454,7 @@ int doc_decode_ecc(unsigned char sector[SECTOR_SIZE], unsigned char ecc1[6])
     Alpha_to = kmalloc((NN + 1) * sizeof(dtype), GFP_KERNEL);
     if (!Alpha_to)
         return -1;
-    
+
     Index_of = kmalloc((NN + 1) * sizeof(dtype), GFP_KERNEL);
     if (!Index_of) {
         kfree(Alpha_to);
@@ -470,7 +470,7 @@ int doc_decode_ecc(unsigned char sector[SECTOR_SIZE], unsigned char ecc1[6])
     bb[2] = ((ecc1[2] & 0xf0) >> 4) | ((ecc1[3] & 0x3f) << 4);
     bb[3] = ((ecc1[3] & 0xc0) >> 6) | ((ecc1[0] & 0xff) << 2);
 
-    nb_errors = eras_dec_rs(Alpha_to, Index_of, bb, 
+    nb_errors = eras_dec_rs(Alpha_to, Index_of, bb,
                             error_val, error_pos, 0);
     if (nb_errors <= 0)
         goto the_end;
@@ -489,7 +489,7 @@ int doc_decode_ecc(unsigned char sector[SECTOR_SIZE], unsigned char ecc1[6])
                can be modified since pos is even */
             index = (pos >> 3) ^ 1;
             bitpos = pos & 7;
-            if ((index >= 0 && index < SECTOR_SIZE) || 
+            if ((index >= 0 && index < SECTOR_SIZE) ||
                 index == (SECTOR_SIZE + 1)) {
                 val = error_val[i] >> (2 + bitpos);
                 parity ^= val;
@@ -500,7 +500,7 @@ int doc_decode_ecc(unsigned char sector[SECTOR_SIZE], unsigned char ecc1[6])
             bitpos = (bitpos + 10) & 7;
             if (bitpos == 0)
                 bitpos = 8;
-            if ((index >= 0 && index < SECTOR_SIZE) || 
+            if ((index >= 0 && index < SECTOR_SIZE) ||
                 index == (SECTOR_SIZE + 1)) {
                 val = error_val[i] << (8 - bitpos);
                 parity ^= val;
@@ -509,7 +509,7 @@ int doc_decode_ecc(unsigned char sector[SECTOR_SIZE], unsigned char ecc1[6])
             }
         }
     }
-    
+
     /* use parity to test extra errors */
     if ((parity & 0xff) != 0)
         nb_errors = -1;
diff --git a/drivers/mtd/devices/docprobe.c b/drivers/mtd/devices/docprobe.c
index 197d67045e1e..13178b9dd00a 100644
--- a/drivers/mtd/devices/docprobe.c
+++ b/drivers/mtd/devices/docprobe.c
@@ -4,22 +4,22 @@
 /* (C) 1999 Machine Vision Holdings, Inc.                       */
 /* (C) 1999-2003 David Woodhouse <dwmw2@infradead.org>          */
 
-/* $Id: docprobe.c,v 1.44 2005/01/05 12:40:36 dwmw2 Exp $       */
+/* $Id: docprobe.c,v 1.46 2005/11/07 11:14:25 gleixner Exp $    */
 
 
 
 /* DOC_PASSIVE_PROBE:
-   In order to ensure that the BIOS checksum is correct at boot time, and 
-   hence that the onboard BIOS extension gets executed, the DiskOnChip 
-   goes into reset mode when it is read sequentially: all registers 
-   return 0xff until the chip is woken up again by writing to the 
-   DOCControl register. 
-
-   Unfortunately, this means that the probe for the DiskOnChip is unsafe, 
-   because one of the first things it does is write to where it thinks 
-   the DOCControl register should be - which may well be shared memory 
-   for another device. I've had machines which lock up when this is 
-   attempted. Hence the possibility to do a passive probe, which will fail 
+   In order to ensure that the BIOS checksum is correct at boot time, and
+   hence that the onboard BIOS extension gets executed, the DiskOnChip
+   goes into reset mode when it is read sequentially: all registers
+   return 0xff until the chip is woken up again by writing to the
+   DOCControl register.
+
+   Unfortunately, this means that the probe for the DiskOnChip is unsafe,
+   because one of the first things it does is write to where it thinks
+   the DOCControl register should be - which may well be shared memory
+   for another device. I've had machines which lock up when this is
+   attempted. Hence the possibility to do a passive probe, which will fail
    to detect a chip in reset mode, but is at least guaranteed not to lock
    the machine.
 
@@ -33,9 +33,9 @@
 
    The old Millennium-only driver has been retained just in case there
    are problems with the new code. If the combined driver doesn't work
-   for you, you can try the old one by undefining DOC_SINGLE_DRIVER 
+   for you, you can try the old one by undefining DOC_SINGLE_DRIVER
    below and also enabling it in your configuration. If this fixes the
-   problems, please send a report to the MTD mailing list at 
+   problems, please send a report to the MTD mailing list at
    <linux-mtd@lists.infradead.org>.
 */
 #define DOC_SINGLE_DRIVER
@@ -68,16 +68,16 @@ MODULE_PARM_DESC(doc_config_location, "Physical memory address at which to probe
 static unsigned long __initdata doc_locations[] = {
 #if defined (__alpha__) || defined(__i386__) || defined(__x86_64__)
 #ifdef CONFIG_MTD_DOCPROBE_HIGH
-        0xfffc8000, 0xfffca000, 0xfffcc000, 0xfffce000, 
+        0xfffc8000, 0xfffca000, 0xfffcc000, 0xfffce000,
         0xfffd0000, 0xfffd2000, 0xfffd4000, 0xfffd6000,
-        0xfffd8000, 0xfffda000, 0xfffdc000, 0xfffde000, 
-        0xfffe0000, 0xfffe2000, 0xfffe4000, 0xfffe6000, 
+        0xfffd8000, 0xfffda000, 0xfffdc000, 0xfffde000,
+        0xfffe0000, 0xfffe2000, 0xfffe4000, 0xfffe6000,
         0xfffe8000, 0xfffea000, 0xfffec000, 0xfffee000,
 #else /*  CONFIG_MTD_DOCPROBE_HIGH */
-        0xc8000, 0xca000, 0xcc000, 0xce000, 
+        0xc8000, 0xca000, 0xcc000, 0xce000,
         0xd0000, 0xd2000, 0xd4000, 0xd6000,
-        0xd8000, 0xda000, 0xdc000, 0xde000, 
-        0xe0000, 0xe2000, 0xe4000, 0xe6000, 
+        0xd8000, 0xda000, 0xdc000, 0xde000,
+        0xe0000, 0xe2000, 0xe4000, 0xe6000,
         0xe8000, 0xea000, 0xec000, 0xee000,
 #endif /*  CONFIG_MTD_DOCPROBE_HIGH */
 #elif defined(__PPC__)
@@ -111,35 +111,35 @@ static inline int __init doccheck(void __iomem *potential, unsigned long physadr
                 return 0;
 #endif /* CONFIG_MTD_DOCPROBE_55AA */
 
-#ifndef DOC_PASSIVE_PROBE       
+#ifndef DOC_PASSIVE_PROBE
         /* It's not possible to cleanly detect the DiskOnChip - the
          * bootup procedure will put the device into reset mode, and
          * it's not possible to talk to it without actually writing
          * to the DOCControl register. So we store the current contents
          * of the DOCControl register's location, in case we later decide
          * that it's not a DiskOnChip, and want to put it back how we
-         * found it. 
+         * found it.
          */
         tmp2 = ReadDOC(window, DOCControl);
-        
+
         /* Reset the DiskOnChip ASIC */
-        WriteDOC(DOC_MODE_CLR_ERR | DOC_MODE_MDWREN | DOC_MODE_RESET, 
+        WriteDOC(DOC_MODE_CLR_ERR | DOC_MODE_MDWREN | DOC_MODE_RESET,
                  window, DOCControl);
-        WriteDOC(DOC_MODE_CLR_ERR | DOC_MODE_MDWREN | DOC_MODE_RESET, 
+        WriteDOC(DOC_MODE_CLR_ERR | DOC_MODE_MDWREN | DOC_MODE_RESET,
                  window, DOCControl);
-        
+
         /* Enable the DiskOnChip ASIC */
-        WriteDOC(DOC_MODE_CLR_ERR | DOC_MODE_MDWREN | DOC_MODE_NORMAL, 
+        WriteDOC(DOC_MODE_CLR_ERR | DOC_MODE_MDWREN | DOC_MODE_NORMAL,
                  window, DOCControl);
-        WriteDOC(DOC_MODE_CLR_ERR | DOC_MODE_MDWREN | DOC_MODE_NORMAL, 
+        WriteDOC(DOC_MODE_CLR_ERR | DOC_MODE_MDWREN | DOC_MODE_NORMAL,
                  window, DOCControl);
-#endif /* !DOC_PASSIVE_PROBE */ 
+#endif /* !DOC_PASSIVE_PROBE */
 
         /* We need to read the ChipID register four times. For some
            newer DiskOnChip 2000 units, the first three reads will
            return the DiskOnChip Millennium ident. Don't ask. */
         ChipID = ReadDOC(window, ChipID);
-  
+
         switch (ChipID) {
         case DOC_ChipID_Doc2k:
                 /* Check the TOGGLE bit in the ECC register */
@@ -149,7 +149,7 @@ static inline int __init doccheck(void __iomem *potential, unsigned long physadr
                 if (tmp != tmpb && tmp == tmpc)
                                 return ChipID;
                 break;
-                
+
         case DOC_ChipID_DocMil:
                 /* Check for the new 2000 with Millennium ASIC */
                 ReadDOC(window, ChipID);
@@ -164,7 +164,7 @@ static inline int __init doccheck(void __iomem *potential, unsigned long physadr
                 if (tmp != tmpb && tmp == tmpc)
                                 return ChipID;
                 break;
-                
+
         case DOC_ChipID_DocMilPlus16:
         case DOC_ChipID_DocMilPlus32:
         case 0:
@@ -179,7 +179,7 @@ static inline int __init doccheck(void __iomem *potential, unsigned long physadr
                         DOC_MODE_BDECT;
                 WriteDOC(tmp, window, Mplus_DOCControl);
                 WriteDOC(~tmp, window, Mplus_CtrlConfirm);
-        
+
                 mdelay(1);
                 /* Enable the DiskOnChip ASIC */
                 tmp = DOC_MODE_NORMAL | DOC_MODE_MDWREN | DOC_MODE_RST_LAT |
@@ -187,7 +187,7 @@ static inline int __init doccheck(void __iomem *potential, unsigned long physadr
                 WriteDOC(tmp, window, Mplus_DOCControl);
                 WriteDOC(~tmp, window, Mplus_CtrlConfirm);
                 mdelay(1);
-#endif /* !DOC_PASSIVE_PROBE */ 
+#endif /* !DOC_PASSIVE_PROBE */
 
                 ChipID = ReadDOC(window, ChipID);
 
@@ -227,7 +227,7 @@ static inline int __init doccheck(void __iomem *potential, unsigned long physadr
         WriteDOC(tmp2, window, DOCControl);
 #endif
         return 0;
-}   
+}
 
 static int docfound;
 
@@ -244,10 +244,10 @@ static void __init DoC_Probe(unsigned long physadr)
         void (*initroutine)(struct mtd_info *) = NULL;
 
         docptr = ioremap(physadr, DOC_IOREMAP_LEN);
-        
+
         if (!docptr)
                 return;
-        
+
         if ((ChipID = doccheck(docptr, physadr))) {
                 if (ChipID == DOC_ChipID_Doc2kTSOP) {
                         /* Remove this at your own peril. The hardware driver works but nothing prevents you from erasing bad blocks */
@@ -263,9 +263,9 @@ static void __init DoC_Probe(unsigned long physadr)
                         iounmap(docptr);
                         return;
                 }
-                
+
                 this = (struct DiskOnChip *)(&mtd[1]);
-                
+
                 memset((char *)mtd,0, sizeof(struct mtd_info));
                 memset((char *)this, 0, sizeof(struct DiskOnChip));
 
@@ -281,13 +281,13 @@ static void __init DoC_Probe(unsigned long physadr)
                         im_funcname = "DoC2k_init";
                         im_modname = "doc2000";
                         break;
-                        
+
                 case DOC_ChipID_Doc2k:
                         name="2000";
                         im_funcname = "DoC2k_init";
                         im_modname = "doc2000";
                         break;
-                        
+
                 case DOC_ChipID_DocMil:
                         name="Millennium";
 #ifdef DOC_SINGLE_DRIVER
@@ -331,7 +331,7 @@ static void __init DoC_Probe(unsigned long physadr)
 static int __init init_doc(void)
 {
         int i;
-        
+
         if (doc_config_location) {
                 printk(KERN_INFO "Using configured DiskOnChip probe address 0x%lx\n", doc_config_location);
                 DoC_Probe(doc_config_location);
diff --git a/drivers/mtd/devices/lart.c b/drivers/mtd/devices/lart.c
index df987a53ed9c..1e876fcb0408 100644
--- a/drivers/mtd/devices/lart.c
+++ b/drivers/mtd/devices/lart.c
@@ -2,7 +2,7 @@
 /*
  * MTD driver for the 28F160F3 Flash Memory (non-CFI) on LART.
  *
- * $Id: lart.c,v 1.7 2004/08/09 13:19:44 dwmw2 Exp $
+ * $Id: lart.c,v 1.9 2005/11/07 11:14:25 gleixner Exp $
  *
  * Author: Abraham vd Merwe <abraham@2d3d.co.za>
  *
@@ -122,7 +122,7 @@ static char module_name[] = "lart";
 
 /*
  * The data line mapping on LART is as follows:
- * 
+ *
  *       U2  CPU |   U3  CPU
  *       -------------------
  *        0  20  |   0   12
@@ -181,7 +181,7 @@ static char module_name[] = "lart";
                 (((x) & 0x00004000) >> 13)              \
         )
 
-/* 
+/*
  * The address line mapping on LART is as follows:
  *
  *       U3  CPU |   U2  CPU
@@ -204,7 +204,7 @@ static char module_name[] = "lart";
  *       12  15  |   12  15
  *       13  14  |   13  14
  *       14  16  |   14  16
- * 
+ *
  *       MAIN BLOCK BOUNDARY
  *
  *       15  17  |   15  18
diff --git a/drivers/mtd/devices/phram.c b/drivers/mtd/devices/phram.c
index 765c0179c8df..e8685ee6c1e4 100644
--- a/drivers/mtd/devices/phram.c
+++ b/drivers/mtd/devices/phram.c
@@ -1,5 +1,5 @@
 /**
- * $Id: phram.c,v 1.14 2005/03/07 21:43:38 joern Exp $
+ * $Id: phram.c,v 1.16 2005/11/07 11:14:25 gleixner Exp $
  *
  * Copyright (c) ????           Jochen Schäuble <psionic@psionic.de>
  * Copyright (c) 2003-2004      Jörn Engel <joern@wh.fh-wedel.de>
@@ -41,10 +41,10 @@ static int phram_erase(struct mtd_info *mtd, struct erase_info *instr)
 
         if (instr->addr + instr->len > mtd->size)
                 return -EINVAL;
-        
+
         memset(start + instr->addr, 0xff, instr->len);
 
-        /* This'll catch a few races. Free the thing before returning :) 
+        /* This'll catch a few races. Free the thing before returning :)
          * I don't feel at all ashamed. This kind of thing is possible anyway
          * with flash, but unlikely.
          */
@@ -63,7 +63,7 @@ static int phram_point(struct mtd_info *mtd, loff_t from, size_t len,
 
         if (from + len > mtd->size)
                 return -EINVAL;
-        
+
         *mtdbuf = start + from;
         *retlen = len;
         return 0;
@@ -84,7 +84,7 @@ static int phram_read(struct mtd_info *mtd, loff_t from, size_t len,
 
         if (len > mtd->size - from)
                 len = mtd->size - from;
-        
+
         memcpy(buf, start + from, len);
 
         *retlen = len;
@@ -101,7 +101,7 @@ static int phram_write(struct mtd_info *mtd, loff_t to, size_t len,
 
         if (len > mtd->size - to)
                 len = mtd->size - to;
-        
+
         memcpy(start + to, buf, len);
 
         *retlen = len;
@@ -159,7 +159,7 @@ static int register_device(char *name, unsigned long start, unsigned long len)
         }
 
         list_add_tail(&new->list, &phram_list);
-        return 0;       
+        return 0;
 
 out2:
         iounmap(new->mtd.priv);
diff --git a/drivers/mtd/devices/pmc551.c b/drivers/mtd/devices/pmc551.c
index 5b3defadf884..de48b35f5609 100644
--- a/drivers/mtd/devices/pmc551.c
+++ b/drivers/mtd/devices/pmc551.c
@@ -1,5 +1,5 @@
 /*
- * $Id: pmc551.c,v 1.30 2005/01/05 18:05:13 dwmw2 Exp $
+ * $Id: pmc551.c,v 1.32 2005/11/07 11:14:25 gleixner Exp $
  *
  * PMC551 PCI Mezzanine Ram Device
  *
@@ -27,7 +27,7 @@
  *       it as high speed swap or for a high speed disk device of some
  *       sort.  Which becomes very useful on diskless systems in the
  *       embedded market I might add.
- *       
+ *
  * Notes:
  *       Due to what I assume is more buggy SROM, the 64M PMC551 I
  *       have available claims that all 4 of it's DRAM banks have 64M
@@ -63,10 +63,10 @@
  *       Minyard set up the card to utilize a 1M sliding apature.
  *
  *       Corey Minyard <minyard@nortelnetworks.com>
- *       * Modified driver to utilize a sliding aperture instead of 
+ *       * Modified driver to utilize a sliding aperture instead of
  *         mapping all memory into kernel space which turned out to
  *         be very wasteful.
- *       * Located a bug in the SROM's initialization sequence that 
+ *       * Located a bug in the SROM's initialization sequence that
  *         made the memory unusable, added a fix to code to touch up
  *         the DRAM some.
  *
@@ -390,7 +390,7 @@ static u32 fixup_pmc551 (struct pci_dev *dev)
         bcmd |= (0x40|0x20);
         pci_write_config_byte(dev, PMC551_SYS_CTRL_REG, bcmd);
 
-        /* 
+        /*
          * Take care and turn off the memory on the device while we
          * tweak the configurations
          */
@@ -408,7 +408,7 @@ static u32 fixup_pmc551 (struct pci_dev *dev)
          * Grab old BAR0 config so that we can figure out memory size
          * This is another bit of kludge going on.  The reason for the
          * redundancy is I am hoping to retain the original configuration
-         * previously assigned to the card by the BIOS or some previous 
+         * previously assigned to the card by the BIOS or some previous
          * fixup routine in the kernel.  So we read the old config into cfg,
          * then write all 1's to the memory space, read back the result into
          * "size", and then write back all the old config.
@@ -480,7 +480,7 @@ static u32 fixup_pmc551 (struct pci_dev *dev)
         } while ( (PCI_COMMAND_IO) & cmd );
 
         /*
-         * Turn on auto refresh 
+         * Turn on auto refresh
          * The loop is taken directly from Ramix's example code.  I assume that
          * this must be held high for some duration of time, but I can find no
          * documentation refrencing the reasons why.
@@ -615,7 +615,7 @@ static u32 fixup_pmc551 (struct pci_dev *dev)
         pci_read_config_byte(dev, PMC551_SYS_CTRL_REG, &bcmd );
         printk( KERN_DEBUG "pmc551: EEPROM is under %s control\n"
                            "pmc551: System Control Register is %slocked to PCI access\n"
-                           "pmc551: System Control Register is %slocked to EEPROM access\n", 
+                           "pmc551: System Control Register is %slocked to EEPROM access\n",
                 (bcmd&0x1)?"software":"hardware",
                 (bcmd&0x20)?"":"un", (bcmd&0x40)?"":"un");
 #endif
@@ -744,7 +744,7 @@ static int __init init_pmc551(void)
                 priv->start = ioremap(((PCI_Device->resource[0].start)
                                        & PCI_BASE_ADDRESS_MEM_MASK),
                                       priv->asize);
-                
+
                 if (!priv->start) {
                         printk(KERN_NOTICE "pmc551: Unable to map IO space\n");
                         kfree(mtd->priv);
@@ -765,7 +765,7 @@ static int __init init_pmc551(void)
                                          priv->curr_map0 );
 
 #ifdef CONFIG_MTD_PMC551_DEBUG
-                printk( KERN_DEBUG "pmc551: aperture set to %d\n", 
+                printk( KERN_DEBUG "pmc551: aperture set to %d\n",
                         (priv->base_map0 & 0xF0)>>4 );
 #endif
 
@@ -823,13 +823,13 @@ static void __exit cleanup_pmc551(void)
         while((mtd=pmc551list)) {
                 priv = mtd->priv;
                 pmc551list = priv->nextpmc551;
-                
+
                 if(priv->start) {
                         printk (KERN_DEBUG "pmc551: unmapping %dM starting at 0x%p\n",
                                 priv->asize>>20, priv->start);
                         iounmap (priv->start);
                 }
-                
+
                 kfree (mtd->priv);
                 del_mtd_device (mtd);
                 kfree (mtd);
diff --git a/drivers/mtd/devices/slram.c b/drivers/mtd/devices/slram.c
index 84fa91392a8c..6faee6c6958c 100644
--- a/drivers/mtd/devices/slram.c
+++ b/drivers/mtd/devices/slram.c
@@ -1,6 +1,6 @@
 /*======================================================================
 
-  $Id: slram.c,v 1.34 2005/01/06 21:16:42 jwboyer Exp $
+  $Id: slram.c,v 1.36 2005/11/07 11:14:25 gleixner Exp $
 
   This driver provides a method to access memory not used by the kernel
   itself (i.e. if the kernel commandline mem=xxx is used). To actually
@@ -18,14 +18,14 @@
   <start>: start of the memory region, decimal or hex (0xabcdef)
   <end/offset>: end of the memory region. It's possible to use +0x1234
                 to specify the offset instead of the absolute address
-    
+
   NOTE:
   With slram it's only possible to map a contigous memory region. Therfore
   if there's a device mapped somewhere in the region specified slram will
   fail to load (see kernel log if modprobe fails).
 
   -
-  
+
   Jochen Schaeuble <psionic@psionic.de>
 
 ======================================================================*/
@@ -89,10 +89,10 @@ static int slram_erase(struct mtd_info *mtd, struct erase_info *instr)
         if (instr->addr + instr->len > mtd->size) {
                 return(-EINVAL);
         }
-        
+
         memset(priv->start + instr->addr, 0xff, instr->len);
 
-        /* This'll catch a few races. Free the thing before returning :) 
+        /* This'll catch a few races. Free the thing before returning :)
          * I don't feel at all ashamed. This kind of thing is possible anyway
          * with flash, but unlikely.
          */
@@ -170,12 +170,12 @@ static int register_device(char *name, unsigned long start, unsigned long length
         }
         (*curmtd)->mtdinfo = kmalloc(sizeof(struct mtd_info), GFP_KERNEL);
         (*curmtd)->next = NULL;
-        
+
         if ((*curmtd)->mtdinfo) {
                 memset((char *)(*curmtd)->mtdinfo, 0, sizeof(struct mtd_info));
                 (*curmtd)->mtdinfo->priv =
                         kmalloc(sizeof(slram_priv_t), GFP_KERNEL);
-                
+
                 if (!(*curmtd)->mtdinfo->priv) {
                         kfree((*curmtd)->mtdinfo);
                         (*curmtd)->mtdinfo = NULL;
@@ -188,7 +188,7 @@ static int register_device(char *name, unsigned long start, unsigned long length
                 E("slram: Cannot allocate new MTD device.\n");
                 return(-ENOMEM);
         }
-        
+
         if (!(((slram_priv_t *)(*curmtd)->mtdinfo->priv)->start =
                                 ioremap(start, length))) {
                 E("slram: ioremap failed\n");
@@ -223,7 +223,7 @@ static int register_device(char *name, unsigned long start, unsigned long length
         T("slram: Mapped from 0x%p to 0x%p\n",
                         ((slram_priv_t *)(*curmtd)->mtdinfo->priv)->start,
                         ((slram_priv_t *)(*curmtd)->mtdinfo->priv)->end);
-        return(0);      
+        return(0);
 }
 
 static void unregister_devices(void)
@@ -256,7 +256,7 @@ static int parse_cmdline(char *devname, char *szstart, char *szlength)
         char *buffer;
         unsigned long devstart;
         unsigned long devlength;
-        
+
         if ((!devname) || (!szstart) || (!szlength)) {
                 unregister_devices();
                 return(-EINVAL);
@@ -264,7 +264,7 @@ static int parse_cmdline(char *devname, char *szstart, char *szlength)
 
         devstart = simple_strtoul(szstart, &buffer, 0);
         devstart = handle_unit(devstart, buffer);
-        
+
         if (*(szlength) != '+') {
                 devlength = simple_strtoul(szlength, &buffer, 0);
                 devlength = handle_unit(devlength, buffer) - devstart;
@@ -278,7 +278,7 @@ static int parse_cmdline(char *devname, char *szstart, char *szlength)
                 E("slram: Illegal start / length parameter.\n");
                 return(-EINVAL);
         }
-        
+
         if ((devstart = register_device(devname, devstart, devlength))){
                 unregister_devices();
                 return((int)devstart);
@@ -335,7 +335,7 @@ static int init_slram(void)
         }
 #else
         int count;
-        
+
         for (count = 0; (map[count]) && (count < SLRAM_MAX_DEVICES_PARAMS);
                         count++) {
         }
@@ -350,10 +350,10 @@ static int init_slram(void)
                 if (parse_cmdline(devname, map[i * 3 + 1], map[i * 3 + 2])!=0) {
                         return(-EINVAL);
                 }
-                
+
         }
 #endif /* !MODULE */
-        
+
         return(0);
 }
 
diff --git a/drivers/mtd/ftl.c b/drivers/mtd/ftl.c
index d32c1b3a8ce3..de7e231d6d18 100644
--- a/drivers/mtd/ftl.c
+++ b/drivers/mtd/ftl.c
@@ -1,5 +1,5 @@
 /* This version ported to the Linux-MTD system by dwmw2@infradead.org
- * $Id: ftl.c,v 1.55 2005/01/17 13:47:21 hvr Exp $
+ * $Id: ftl.c,v 1.58 2005/11/07 11:14:19 gleixner Exp $
  *
  * Fixes: Arnaldo Carvalho de Melo <acme@conectiva.com.br>
  * - fixes some leaks on failure in build_maps and ftl_notify_add, cleanups
@@ -53,7 +53,7 @@
     Use of the FTL format for non-PCMCIA applications may be an
     infringement of these patents.  For additional information,
     contact M-Systems (http://www.m-sys.com) directly.
-      
+
 ======================================================================*/
 #include <linux/mtd/blktrans.h>
 #include <linux/module.h>
@@ -160,7 +160,7 @@ static void ftl_erase_callback(struct erase_info *done);
     Scan_header() checks to see if a memory region contains an FTL
     partition.  build_maps() reads all the erase unit headers, builds
     the erase unit map, and then builds the virtual page map.
-    
+
 ======================================================================*/
 
 static int scan_header(partition_t *part)
@@ -176,10 +176,10 @@ static int scan_header(partition_t *part)
          (offset + sizeof(header)) < max_offset;
          offset += part->mbd.mtd->erasesize ? : 0x2000) {
 
-        err = part->mbd.mtd->read(part->mbd.mtd, offset, sizeof(header), &ret, 
+        err = part->mbd.mtd->read(part->mbd.mtd, offset, sizeof(header), &ret,
                               (unsigned char *)&header);
-        
-        if (err) 
+
+        if (err)
             return err;
 
         if (strcmp(header.DataOrgTuple+3, "FTL100") == 0) break;
@@ -232,10 +232,10 @@ static int build_maps(partition_t *part)
     for (i = 0; i < le16_to_cpu(part->header.NumEraseUnits); i++) {
         offset = ((i + le16_to_cpu(part->header.FirstPhysicalEUN))
                       << part->header.EraseUnitSize);
-        ret = part->mbd.mtd->read(part->mbd.mtd, offset, sizeof(header), &retval, 
+        ret = part->mbd.mtd->read(part->mbd.mtd, offset, sizeof(header), &retval,
                               (unsigned char *)&header);
-        
-        if (ret) 
+
+        if (ret)
             goto out_XferInfo;
 
         ret = -1;
@@ -274,7 +274,7 @@ static int build_maps(partition_t *part)
                "don't add up!\n");
         goto out_XferInfo;
     }
-    
+
     /* Set up virtual page map */
     blocks = le32_to_cpu(header.FormattedSize) >> header.BlockSize;
     part->VirtualBlockMap = vmalloc(blocks * sizeof(u_int32_t));
@@ -296,12 +296,12 @@ static int build_maps(partition_t *part)
         part->EUNInfo[i].Free = 0;
         part->EUNInfo[i].Deleted = 0;
         offset = part->EUNInfo[i].Offset + le32_to_cpu(header.BAMOffset);
-        
-        ret = part->mbd.mtd->read(part->mbd.mtd, offset,  
-                              part->BlocksPerUnit * sizeof(u_int32_t), &retval, 
+
+        ret = part->mbd.mtd->read(part->mbd.mtd, offset,
+                              part->BlocksPerUnit * sizeof(u_int32_t), &retval,
                               (unsigned char *)part->bam_cache);
-        
-        if (ret) 
+
+        if (ret)
                 goto out_bam_cache;
 
         for (j = 0; j < part->BlocksPerUnit; j++) {
@@ -316,7 +316,7 @@ static int build_maps(partition_t *part)
                 part->EUNInfo[i].Deleted++;
         }
     }
-    
+
     ret = 0;
     goto out;
 
@@ -336,7 +336,7 @@ out:
 
     Erase_xfer() schedules an asynchronous erase operation for a
     transfer unit.
-    
+
 ======================================================================*/
 
 static int erase_xfer(partition_t *part,
@@ -351,10 +351,10 @@ static int erase_xfer(partition_t *part,
     xfer->state = XFER_ERASING;
 
     /* Is there a free erase slot? Always in MTD. */
-    
-    
+
+
     erase=kmalloc(sizeof(struct erase_info), GFP_KERNEL);
-    if (!erase) 
+    if (!erase)
             return -ENOMEM;
 
     erase->mtd = part->mbd.mtd;
@@ -362,7 +362,7 @@ static int erase_xfer(partition_t *part,
     erase->addr = xfer->Offset;
     erase->len = 1 << part->header.EraseUnitSize;
     erase->priv = (u_long)part;
-    
+
     ret = part->mbd.mtd->erase(part->mbd.mtd, erase);
 
     if (!ret)
@@ -377,7 +377,7 @@ static int erase_xfer(partition_t *part,
 
     Prepare_xfer() takes a freshly erased transfer unit and gives
     it an appropriate header.
-    
+
 ======================================================================*/
 
 static void ftl_erase_callback(struct erase_info *erase)
@@ -385,7 +385,7 @@ static void ftl_erase_callback(struct erase_info *erase)
     partition_t *part;
     struct xfer_info_t *xfer;
     int i;
-    
+
     /* Look up the transfer unit */
     part = (partition_t *)(erase->priv);
 
@@ -422,7 +422,7 @@ static int prepare_xfer(partition_t *part, int i)
 
     xfer = &part->XferInfo[i];
     xfer->state = XFER_FAILED;
-    
+
     DEBUG(1, "ftl_cs: preparing xfer unit at 0x%x\n", xfer->Offset);
 
     /* Write the transfer unit header */
@@ -446,7 +446,7 @@ static int prepare_xfer(partition_t *part, int i)
 
     for (i = 0; i < nbam; i++, offset += sizeof(u_int32_t)) {
 
-        ret = part->mbd.mtd->write(part->mbd.mtd, offset, sizeof(u_int32_t), 
+        ret = part->mbd.mtd->write(part->mbd.mtd, offset, sizeof(u_int32_t),
                                &retlen, (u_char *)&ctl);
 
         if (ret)
@@ -454,7 +454,7 @@ static int prepare_xfer(partition_t *part, int i)
     }
     xfer->state = XFER_PREPARED;
     return 0;
-    
+
 } /* prepare_xfer */
 
 /*======================================================================
@@ -466,7 +466,7 @@ static int prepare_xfer(partition_t *part, int i)
     All data blocks are copied to the corresponding blocks in the
     target unit, so the virtual block map does not need to be
     updated.
-    
+
 ======================================================================*/
 
 static int copy_erase_unit(partition_t *part, u_int16_t srcunit,
@@ -486,14 +486,14 @@ static int copy_erase_unit(partition_t *part, u_int16_t srcunit,
     xfer = &part->XferInfo[xferunit];
     DEBUG(2, "ftl_cs: copying block 0x%x to 0x%x\n",
           eun->Offset, xfer->Offset);
-        
-    
+
+
     /* Read current BAM */
     if (part->bam_index != srcunit) {
 
         offset = eun->Offset + le32_to_cpu(part->header.BAMOffset);
 
-        ret = part->mbd.mtd->read(part->mbd.mtd, offset, 
+        ret = part->mbd.mtd->read(part->mbd.mtd, offset,
                               part->BlocksPerUnit * sizeof(u_int32_t),
                               &retlen, (u_char *) (part->bam_cache));
 
@@ -501,11 +501,11 @@ static int copy_erase_unit(partition_t *part, u_int16_t srcunit,
         part->bam_index = 0xffff;
 
         if (ret) {
-            printk( KERN_WARNING "ftl: Failed to read BAM cache in copy_erase_unit()!\n");                
+            printk( KERN_WARNING "ftl: Failed to read BAM cache in copy_erase_unit()!\n");
             return ret;
         }
     }
-    
+
     /* Write the LogicalEUN for the transfer unit */
     xfer->state = XFER_UNKNOWN;
     offset = xfer->Offset + 20; /* Bad! */
@@ -513,12 +513,12 @@ static int copy_erase_unit(partition_t *part, u_int16_t srcunit,
 
     ret = part->mbd.mtd->write(part->mbd.mtd, offset, sizeof(u_int16_t),
                            &retlen, (u_char *) &unit);
-    
+
     if (ret) {
         printk( KERN_WARNING "ftl: Failed to write back to BAM cache in copy_erase_unit()!\n");
         return ret;
     }
-    
+
     /* Copy all data blocks from source unit to transfer unit */
     src = eun->Offset; dest = xfer->Offset;
 
@@ -558,15 +558,15 @@ static int copy_erase_unit(partition_t *part, u_int16_t srcunit,
     }
 
     /* Write the BAM to the transfer unit */
-    ret = part->mbd.mtd->write(part->mbd.mtd, xfer->Offset + le32_to_cpu(part->header.BAMOffset), 
-                    part->BlocksPerUnit * sizeof(int32_t), &retlen, 
+    ret = part->mbd.mtd->write(part->mbd.mtd, xfer->Offset + le32_to_cpu(part->header.BAMOffset),
+                    part->BlocksPerUnit * sizeof(int32_t), &retlen,
                     (u_char *)part->bam_cache);
     if (ret) {
         printk( KERN_WARNING "ftl: Error writing BAM in copy_erase_unit\n");
         return ret;
     }
 
-    
+
     /* All clear? Then update the LogicalEUN again */
     ret = part->mbd.mtd->write(part->mbd.mtd, xfer->Offset + 20, sizeof(u_int16_t),
                            &retlen, (u_char *)&srcunitswap);
@@ -574,9 +574,9 @@ static int copy_erase_unit(partition_t *part, u_int16_t srcunit,
     if (ret) {
         printk(KERN_WARNING "ftl: Error writing new LogicalEUN in copy_erase_unit\n");
         return ret;
-    }    
-    
-    
+    }
+
+
     /* Update the maps and usage stats*/
     i = xfer->EraseCount;
     xfer->EraseCount = eun->EraseCount;
@@ -588,10 +588,10 @@ static int copy_erase_unit(partition_t *part, u_int16_t srcunit,
     part->FreeTotal += free;
     eun->Free = free;
     eun->Deleted = 0;
-    
+
     /* Now, the cache should be valid for the new block */
     part->bam_index = srcunit;
-    
+
     return 0;
 } /* copy_erase_unit */
 
@@ -608,7 +608,7 @@ static int copy_erase_unit(partition_t *part, u_int16_t srcunit,
     oldest data unit instead.  This means that we generally postpone
     the next reclaimation as long as possible, but shuffle static
     stuff around a bit for wear leveling.
-    
+
 ======================================================================*/
 
 static int reclaim_block(partition_t *part)
@@ -666,7 +666,7 @@ static int reclaim_block(partition_t *part)
                 else
                     DEBUG(1, "ftl_cs: reclaim failed: no "
                           "suitable transfer units!\n");
-                        
+
                 return -EIO;
             }
         }
@@ -715,7 +715,7 @@ static int reclaim_block(partition_t *part)
     returns the block index -- the erase unit is just the currently
     cached unit.  If there are no free blocks, it returns 0 -- this
     is never a valid data block because it contains the header.
-    
+
 ======================================================================*/
 
 #ifdef PSYCHO_DEBUG
@@ -737,7 +737,7 @@ static u_int32_t find_free(partition_t *part)
     u_int32_t blk;
     size_t retlen;
     int ret;
-    
+
     /* Find an erase unit with some free space */
     stop = (part->bam_index == 0xffff) ? 0 : part->bam_index;
     eun = stop;
@@ -749,17 +749,17 @@ static u_int32_t find_free(partition_t *part)
 
     if (part->EUNInfo[eun].Free == 0)
         return 0;
-    
+
     /* Is this unit's BAM cached? */
     if (eun != part->bam_index) {
         /* Invalidate cache */
         part->bam_index = 0xffff;
 
-        ret = part->mbd.mtd->read(part->mbd.mtd, 
+        ret = part->mbd.mtd->read(part->mbd.mtd,
                        part->EUNInfo[eun].Offset + le32_to_cpu(part->header.BAMOffset),
                        part->BlocksPerUnit * sizeof(u_int32_t),
                        &retlen, (u_char *) (part->bam_cache));
-        
+
         if (ret) {
             printk(KERN_WARNING"ftl: Error reading BAM in find_free\n");
             return 0;
@@ -781,14 +781,14 @@ static u_int32_t find_free(partition_t *part)
     }
     DEBUG(2, "ftl_cs: found free block at %d in %d\n", blk, eun);
     return blk;
-    
+
 } /* find_free */
 
 
 /*======================================================================
 
     Read a series of sectors from an FTL partition.
-    
+
 ======================================================================*/
 
 static int ftl_read(partition_t *part, caddr_t buffer,
@@ -798,7 +798,7 @@ static int ftl_read(partition_t *part, caddr_t buffer,
     u_long i;
     int ret;
     size_t offset, retlen;
-    
+
     DEBUG(2, "ftl_cs: ftl_read(0x%p, 0x%lx, %ld)\n",
           part, sector, nblocks);
     if (!(part->state & FTL_FORMATTED)) {
@@ -834,7 +834,7 @@ static int ftl_read(partition_t *part, caddr_t buffer,
 /*======================================================================
 
     Write a series of sectors to an FTL partition
-    
+
 ======================================================================*/
 
 static int set_bam_entry(partition_t *part, u_int32_t log_addr,
@@ -855,7 +855,7 @@ static int set_bam_entry(partition_t *part, u_int32_t log_addr,
     blk = (log_addr % bsize) / SECTOR_SIZE;
     offset = (part->EUNInfo[eun].Offset + blk * sizeof(u_int32_t) +
                   le32_to_cpu(part->header.BAMOffset));
-    
+
 #ifdef PSYCHO_DEBUG
     ret = part->mbd.mtd->read(part->mbd.mtd, offset, sizeof(u_int32_t),
                         &retlen, (u_char *)&old_addr);
@@ -925,7 +925,7 @@ static int ftl_write(partition_t *part, caddr_t buffer,
         if (ret)
             return ret;
     }
-    
+
     bsize = 1 << part->header.EraseUnitSize;
 
     virt_addr = sector * SECTOR_SIZE | BLOCK_DATA;
@@ -949,12 +949,12 @@ static int ftl_write(partition_t *part, caddr_t buffer,
         log_addr = part->bam_index * bsize + blk * SECTOR_SIZE;
         part->EUNInfo[part->bam_index].Free--;
         part->FreeTotal--;
-        if (set_bam_entry(part, log_addr, 0xfffffffe)) 
+        if (set_bam_entry(part, log_addr, 0xfffffffe))
             return -EIO;
         part->EUNInfo[part->bam_index].Deleted++;
         offset = (part->EUNInfo[part->bam_index].Offset +
                       blk * SECTOR_SIZE);
-        ret = part->mbd.mtd->write(part->mbd.mtd, offset, SECTOR_SIZE, &retlen, 
+        ret = part->mbd.mtd->write(part->mbd.mtd, offset, SECTOR_SIZE, &retlen,
                                      buffer);
 
         if (ret) {
@@ -964,7 +964,7 @@ static int ftl_write(partition_t *part, caddr_t buffer,
                    offset);
             return -EIO;
         }
-        
+
         /* Only delete the old entry when the new entry is ready */
         old_addr = part->VirtualBlockMap[sector+i];
         if (old_addr != 0xffffffff) {
@@ -979,7 +979,7 @@ static int ftl_write(partition_t *part, caddr_t buffer,
             return -EIO;
         part->VirtualBlockMap[sector+i] = log_addr;
         part->EUNInfo[part->bam_index].Deleted--;
-        
+
         buffer += SECTOR_SIZE;
         virt_addr += SECTOR_SIZE;
     }
@@ -1034,20 +1034,20 @@ static void ftl_add_mtd(struct mtd_blktrans_ops *tr, struct mtd_info *mtd)
         partition_t *partition;
 
         partition = kmalloc(sizeof(partition_t), GFP_KERNEL);
-                
+
         if (!partition) {
                 printk(KERN_WARNING "No memory to scan for FTL on %s\n",
                        mtd->name);
                 return;
-        }    
+        }
 
         memset(partition, 0, sizeof(partition_t));
 
         partition->mbd.mtd = mtd;
 
-        if ((scan_header(partition) == 0) && 
+        if ((scan_header(partition) == 0) &&
             (build_maps(partition) == 0)) {
-                
+
                 partition->state = FTL_FORMATTED;
 #ifdef PCMCIA_DEBUG
                 printk(KERN_INFO "ftl_cs: opening %d KiB FTL partition\n",
@@ -1086,7 +1086,7 @@ struct mtd_blktrans_ops ftl_tr = {
 
 int init_ftl(void)
 {
-        DEBUG(0, "$Id: ftl.c,v 1.55 2005/01/17 13:47:21 hvr Exp $\n");
+        DEBUG(0, "$Id: ftl.c,v 1.58 2005/11/07 11:14:19 gleixner Exp $\n");
 
         return register_mtd_blktrans(&ftl_tr);
 }
diff --git a/drivers/mtd/inftlcore.c b/drivers/mtd/inftlcore.c
index 39eb53f6551f..8a544890173d 100644
--- a/drivers/mtd/inftlcore.c
+++ b/drivers/mtd/inftlcore.c
@@ -1,4 +1,4 @@
-/* 
+/*
  * inftlcore.c -- Linux driver for Inverse Flash Translation Layer (INFTL)
  *
  * (C) Copyright 2002, Greg Ungerer (gerg@snapgear.com)
@@ -7,7 +7,7 @@
  * (c) 1999 Machine Vision Holdings, Inc.
  * Author: David Woodhouse <dwmw2@infradead.org>
  *
- * $Id: inftlcore.c,v 1.18 2004/11/16 18:28:59 dwmw2 Exp $
+ * $Id: inftlcore.c,v 1.19 2005/11/07 11:14:20 gleixner Exp $
  *
  * 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
@@ -113,23 +113,21 @@ static void inftl_add_mtd(struct mtd_blktrans_ops *tr, struct mtd_info *mtd)
 
         if (inftl->mbd.size != inftl->heads * inftl->cylinders * inftl->sectors) {
                 /*
-                  Oh no we don't have 
+                  Oh no we don't have
                    mbd.size == heads * cylinders * sectors
                 */
                 printk(KERN_WARNING "INFTL: cannot calculate a geometry to "
                        "match size of 0x%lx.\n", inftl->mbd.size);
                 printk(KERN_WARNING "INFTL: using C:%d H:%d S:%d "
                         "(== 0x%lx sects)\n",
-                        inftl->cylinders, inftl->heads , inftl->sectors, 
+                        inftl->cylinders, inftl->heads , inftl->sectors,
                         (long)inftl->cylinders * (long)inftl->heads *
                         (long)inftl->sectors );
         }
 
         if (add_mtd_blktrans_dev(&inftl->mbd)) {
-                if (inftl->PUtable)
-                        kfree(inftl->PUtable);
-                if (inftl->VUtable)
-                        kfree(inftl->VUtable);
+                kfree(inftl->PUtable);
+                kfree(inftl->VUtable);
                 kfree(inftl);
                 return;
         }
@@ -147,10 +145,8 @@ static void inftl_remove_dev(struct mtd_blktrans_dev *dev)
 
         del_mtd_blktrans_dev(dev);
 
-        if (inftl->PUtable)
-                kfree(inftl->PUtable);
-        if (inftl->VUtable)
-                kfree(inftl->VUtable);
+        kfree(inftl->PUtable);
+        kfree(inftl->VUtable);
         kfree(inftl);
 }
 
@@ -223,7 +219,7 @@ static u16 INFTL_foldchain(struct INFTLrecord *inftl, unsigned thisVUC, unsigned
                        "Virtual Unit Chain %d!\n", thisVUC);
                 return BLOCK_NIL;
         }
-        
+
         /*
          * Scan to find the Erase Unit which holds the actual data for each
          * 512-byte block within the Chain.
@@ -264,7 +260,7 @@ static u16 INFTL_foldchain(struct INFTLrecord *inftl, unsigned thisVUC, unsigned
                                 "Unit Chain 0x%x\n", thisVUC);
                         return BLOCK_NIL;
                 }
-                
+
                 thisEUN = inftl->PUtable[thisEUN];
         }
 
@@ -295,15 +291,15 @@ static u16 INFTL_foldchain(struct INFTLrecord *inftl, unsigned thisVUC, unsigned
                  */
                 if (BlockMap[block] == BLOCK_NIL)
                         continue;
-                
+
                 ret = MTD_READ(inftl->mbd.mtd, (inftl->EraseSize *
                         BlockMap[block]) + (block * SECTORSIZE), SECTORSIZE,
-                        &retlen, movebuf); 
+                        &retlen, movebuf);
                 if (ret < 0) {
                         ret = MTD_READ(inftl->mbd.mtd, (inftl->EraseSize *
                                 BlockMap[block]) + (block * SECTORSIZE),
                                 SECTORSIZE, &retlen, movebuf);
-                        if (ret != -EIO) 
+                        if (ret != -EIO)
                                 DEBUG(MTD_DEBUG_LEVEL1, "INFTL: error went "
                                         "away on retry?\n");
                 }
@@ -355,7 +351,7 @@ static u16 INFTL_foldchain(struct INFTLrecord *inftl, unsigned thisVUC, unsigned
 static u16 INFTL_makefreeblock(struct INFTLrecord *inftl, unsigned pendingblock)
 {
         /*
-         * This is the part that needs some cleverness applied. 
+         * This is the part that needs some cleverness applied.
          * For now, I'm doing the minimum applicable to actually
          * get the thing to work.
          * Wear-levelling and other clever stuff needs to be implemented
@@ -414,7 +410,7 @@ static int nrbits(unsigned int val, int bitcount)
 }
 
 /*
- * INFTL_findwriteunit: Return the unit number into which we can write 
+ * INFTL_findwriteunit: Return the unit number into which we can write
  *                      for this block. Make it available if it isn't already.
  */
 static inline u16 INFTL_findwriteunit(struct INFTLrecord *inftl, unsigned block)
@@ -463,10 +459,10 @@ static inline u16 INFTL_findwriteunit(struct INFTLrecord *inftl, unsigned block)
                                  * Invalid block. Don't use it any more.
                                  * Must implement.
                                  */
-                                break;                  
+                                break;
                         }
-                        
-                        if (!silly--) { 
+
+                        if (!silly--) {
                                 printk(KERN_WARNING "INFTL: infinite loop in "
                                         "Virtual Unit Chain 0x%x\n", thisVUC);
                                 return 0xffff;
@@ -482,7 +478,7 @@ hitused:
 
 
                 /*
-                 * OK. We didn't find one in the existing chain, or there 
+                 * OK. We didn't find one in the existing chain, or there
                  * is no existing chain. Allocate a new one.
                  */
                 writeEUN = INFTL_findfreeblock(inftl, 0);
@@ -506,8 +502,8 @@ hitused:
                         if (writeEUN == BLOCK_NIL) {
                                 /*
                                  * Ouch. This should never happen - we should
-                                 * always be able to make some room somehow. 
-                                 * If we get here, we've allocated more storage 
+                                 * always be able to make some room somehow.
+                                 * If we get here, we've allocated more storage
                                  * space than actual media, or our makefreeblock
                                  * routine is missing something.
                                  */
@@ -518,7 +514,7 @@ hitused:
                                 INFTL_dumpVUchains(inftl);
 #endif
                                 return BLOCK_NIL;
-                        }                       
+                        }
                 }
 
                 /*
@@ -543,7 +539,7 @@ hitused:
                 parity |= (nrbits(prev_block, 16) & 0x1) ? 0x2 : 0;
                 parity |= (nrbits(anac, 8) & 0x1) ? 0x4 : 0;
                 parity |= (nrbits(nacs, 8) & 0x1) ? 0x8 : 0;
- 
+
                 oob.u.a.virtualUnitNo = cpu_to_le16(thisVUC);
                 oob.u.a.prevUnitNo = cpu_to_le16(prev_block);
                 oob.u.a.ANAC = anac;
@@ -562,7 +558,7 @@ hitused:
                 oob.u.b.parityPerField = parity;
                 oob.u.b.discarded = 0xaa;
 
-                MTD_WRITEOOB(inftl->mbd.mtd, writeEUN * inftl->EraseSize + 
+                MTD_WRITEOOB(inftl->mbd.mtd, writeEUN * inftl->EraseSize +
                         SECTORSIZE * 4 + 8, 8, &retlen, (char *)&oob.u);
 
                 inftl->PUtable[writeEUN] = inftl->VUtable[thisVUC];
@@ -602,7 +598,7 @@ static void INFTL_trydeletechain(struct INFTLrecord *inftl, unsigned thisVUC)
                        "Virtual Unit Chain %d!\n", thisVUC);
                 return;
         }
-        
+
         /*
          * Scan through the Erase Units to determine whether any data is in
          * each of the 512-byte blocks within the Chain.
@@ -642,7 +638,7 @@ static void INFTL_trydeletechain(struct INFTLrecord *inftl, unsigned thisVUC)
                                 "Unit Chain 0x%x\n", thisVUC);
                         return;
                 }
-                
+
                 thisEUN = inftl->PUtable[thisEUN];
         }
 
@@ -758,7 +754,7 @@ foundit:
         return 0;
 }
 
-static int inftl_writeblock(struct mtd_blktrans_dev *mbd, unsigned long block, 
+static int inftl_writeblock(struct mtd_blktrans_dev *mbd, unsigned long block,
                             char *buffer)
 {
         struct INFTLrecord *inftl = (void *)mbd;
@@ -893,7 +889,7 @@ extern char inftlmountrev[];
 
 static int __init init_inftl(void)
 {
-        printk(KERN_INFO "INFTL: inftlcore.c $Revision: 1.18 $, "
+        printk(KERN_INFO "INFTL: inftlcore.c $Revision: 1.19 $, "
                 "inftlmount.c %s\n", inftlmountrev);
 
         return register_mtd_blktrans(&inftl_tr);
diff --git a/drivers/mtd/inftlmount.c b/drivers/mtd/inftlmount.c
index b5dda47395a7..43fdc9433882 100644
--- a/drivers/mtd/inftlmount.c
+++ b/drivers/mtd/inftlmount.c
@@ -1,14 +1,14 @@
-/* 
+/*
  * inftlmount.c -- INFTL mount code with extensive checks.
  *
  * Author: Greg Ungerer (gerg@snapgear.com)
  * (C) Copyright 2002-2003, Greg Ungerer (gerg@snapgear.com)
  *
  * Based heavily on the nftlmount.c code which is:
- * Author: Fabrice Bellard (fabrice.bellard@netgem.com) 
+ * Author: Fabrice Bellard (fabrice.bellard@netgem.com)
  * Copyright (C) 2000 Netgem S.A.
  *
- * $Id: inftlmount.c,v 1.16 2004/11/22 13:50:53 kalev Exp $
+ * $Id: inftlmount.c,v 1.18 2005/11/07 11:14:20 gleixner Exp $
  *
  * 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
@@ -41,7 +41,7 @@
 #include <linux/mtd/inftl.h>
 #include <linux/mtd/compatmac.h>
 
-char inftlmountrev[]="$Revision: 1.16 $";
+char inftlmountrev[]="$Revision: 1.18 $";
 
 /*
  * find_boot_record: Find the INFTL Media Header and its Spare copy which
@@ -273,7 +273,7 @@ static int find_boot_record(struct INFTLrecord *inftl)
                                 inftl->nb_boot_blocks);
                         return -1;
                 }
-                
+
                 inftl->mbd.size  = inftl->numvunits *
                         (inftl->EraseSize / SECTORSIZE);
 
@@ -302,7 +302,7 @@ static int find_boot_record(struct INFTLrecord *inftl)
                                 inftl->nb_blocks * sizeof(u16));
                         return -ENOMEM;
                 }
-                
+
                 /* Mark the blocks before INFTL MediaHeader as reserved */
                 for (i = 0; i < inftl->nb_boot_blocks; i++)
                         inftl->PUtable[i] = BLOCK_RESERVED;
@@ -380,7 +380,7 @@ static int check_free_sectors(struct INFTLrecord *inftl, unsigned int address,
  *
  * Return: 0 when succeed, -1 on error.
  *
- * ToDo: 1. Is it neceressary to check_free_sector after erasing ?? 
+ * ToDo: 1. Is it neceressary to check_free_sector after erasing ??
  */
 int INFTL_formatblock(struct INFTLrecord *inftl, int block)
 {
@@ -563,7 +563,7 @@ int INFTL_mount(struct INFTLrecord *s)
         /* Search for INFTL MediaHeader and Spare INFTL Media Header */
         if (find_boot_record(s) < 0) {
                 printk(KERN_WARNING "INFTL: could not find valid boot record?\n");
-                return -1;
+                return -ENXIO;
         }
 
         /* Init the logical to physical table */
@@ -574,6 +574,12 @@ int INFTL_mount(struct INFTLrecord *s)
 
         /* Temporary buffer to store ANAC numbers. */
         ANACtable = kmalloc(s->nb_blocks * sizeof(u8), GFP_KERNEL);
+        if (!ANACtable) {
+                printk(KERN_WARNING "INFTL: allocation of ANACtable "
+                                "failed (%zd bytes)\n",
+                                s->nb_blocks * sizeof(u8));
+                return -ENOMEM;
+        }
         memset(ANACtable, 0, s->nb_blocks);
 
         /*
@@ -595,7 +601,7 @@ int INFTL_mount(struct INFTLrecord *s)
 
                 for (chain_length = 0; ; chain_length++) {
 
-                        if ((chain_length == 0) && 
+                        if ((chain_length == 0) &&
                             (s->PUtable[block] != BLOCK_NOTEXPLORED)) {
                                 /* Nothing to do here, onto next block */
                                 break;
@@ -742,7 +748,7 @@ int INFTL_mount(struct INFTLrecord *s)
                                         "in virtual chain %d\n",
                                         s->PUtable[block], logical_block);
                                 s->PUtable[block] = BLOCK_NIL;
-                                        
+
                         }
                         if (ANACtable[block] != ANAC) {
                                 /*
diff --git a/drivers/mtd/maps/Kconfig b/drivers/mtd/maps/Kconfig
index 44781a83b2e7..48638c8097a5 100644
--- a/drivers/mtd/maps/Kconfig
+++ b/drivers/mtd/maps/Kconfig
@@ -1,5 +1,5 @@
 # drivers/mtd/maps/Kconfig
-# $Id: Kconfig,v 1.55 2005/07/02 01:53:24 tpoynor Exp $
+# $Id: Kconfig,v 1.61 2005/11/07 11:14:26 gleixner Exp $
 
 menu "Mapping drivers for chip access"
         depends on MTD!=n
@@ -64,9 +64,9 @@ config MTD_SUN_UFLASH
         tristate "Sun Microsystems userflash support"
         depends on (SPARC32 || SPARC64) && MTD_CFI
         help
-          This provides a 'mapping' driver which supports the way in 
-          which user-programmable flash chips are connected on various 
-          Sun Microsystems boardsets.  This driver will require CFI support 
+          This provides a 'mapping' driver which supports the way in
+          which user-programmable flash chips are connected on various
+          Sun Microsystems boardsets.  This driver will require CFI support
           in the kernel, so if you did not enable CFI previously, do that now.
 
 config MTD_PNC2000
@@ -89,22 +89,22 @@ config MTD_NETSC520
         depends on X86 && MTD_CFI && MTD_PARTITIONS
         help
           This enables access routines for the flash chips on the AMD NetSc520
-          demonstration board. If you have one of these boards and would like 
+          demonstration board. If you have one of these boards and would like
           to use the flash chips on it, say 'Y'.
 
 config MTD_TS5500
         tristate "JEDEC Flash device mapped on Technologic Systems TS-5500"
-        depends on X86 && MTD_JEDECPROBE && MTD_PARTITIONS
+        depends on ELAN
+        select MTD_PARTITIONS
+        select MTD_JEDECPROBE
+        select MTD_CFI_AMDSTD
         help
           This provides a driver for the on-board flash of the Technologic
-          System's TS-5500 board. The flash is split into 3 partitions
+          System's TS-5500 board. The 2MB flash is split into 3 partitions
           which are accessed as separate MTD devices.
 
-          mtd0 and mtd2 are the two BIOS drives. Unfortunately the BIOS
-          uses a proprietary flash translation layer from General Software,
-          which is not supported (the drives cannot be mounted). You can
-          create your own file system (jffs for example), but the BIOS
-          won't be able to boot from it.
+          mtd0 and mtd2 are the two BIOS drives, which use the resident
+          flash disk (RFD) flash translation layer.
 
           mtd1 allows you to reprogram your BIOS. BE VERY CAREFUL.
 
@@ -212,11 +212,18 @@ config MTD_NETtel
           Support for flash chips on NETtel/SecureEdge/SnapGear boards.
 
 config MTD_ALCHEMY
-        tristate '  AMD Alchemy Pb1xxx/Db1xxx/RDK MTD support' 
-        depends on MIPS && SOC_AU1X00
+        tristate '  AMD Alchemy Pb1xxx/Db1xxx/RDK MTD support'
+        depends on SOC_AU1X00
         help
           Flash memory access on AMD Alchemy Pb/Db/RDK Reference Boards
 
+config MTD_MTX1
+        tristate "4G Systems MTX-1 Flash device"
+        depends on MIPS && MIPS_MTX1
+        help
+          Flash memory access on 4G Systems MTX-1 Board. If you have one of
+          these boards and would like to use the flash chips on it, say 'Y'.
+
 config MTD_DILNETPC
         tristate "CFI Flash device mapped on DIL/Net PC"
         depends on X86 && MTD_CONCAT && MTD_PARTITIONS && MTD_CFI_INTELEXT
@@ -244,14 +251,14 @@ config MTD_L440GX
 
 config MTD_SBC8240
         tristate "Flash device on SBC8240"
-        depends on PPC32 && MTD_JEDECPROBE && 6xx && 8260
+        depends on MTD_JEDECPROBE && 8260
         help
           Flash access on the SBC8240 board from Wind River.  See
           <http://www.windriver.com/products/sbc8240/>
 
 config MTD_TQM8XXL
         tristate "CFI Flash device mapped on TQM8XXL"
-        depends on MTD_CFI && PPC32 && 8xx && TQM8xxL
+        depends on MTD_CFI && TQM8xxL
         help
           The TQM8xxL PowerPC board has up to two banks of CFI-compliant
           chips, currently uses AMD one. This 'mapping' driver supports
@@ -261,7 +268,7 @@ config MTD_TQM8XXL
 
 config MTD_RPXLITE
         tristate "CFI Flash device mapped on RPX Lite or CLLF"
-        depends on MTD_CFI && PPC32 && 8xx && (RPXCLASSIC || RPXLITE)
+        depends on MTD_CFI && (RPXCLASSIC || RPXLITE)
         help
           The RPXLite PowerPC board has CFI-compliant chips mapped in
           a strange sparse mapping. This 'mapping' driver supports that
@@ -271,7 +278,7 @@ config MTD_RPXLITE
 
 config MTD_MBX860
         tristate "System flash on MBX860 board"
-        depends on MTD_CFI && PPC32 && 8xx && MBX
+        depends on MTD_CFI && MBX
         help
           This enables access routines for the flash chips on the Motorola
           MBX860 board. If you have one of these boards and would like
@@ -279,7 +286,7 @@ config MTD_MBX860
 
 config MTD_DBOX2
         tristate "CFI Flash device mapped on D-Box2"
-        depends on PPC32 && 8xx && DBOX2 && MTD_CFI_INTELSTD && MTD_CFI_INTELEXT && MTD_CFI_AMDSTD
+        depends on DBOX2 && MTD_CFI_INTELSTD && MTD_CFI_INTELEXT && MTD_CFI_AMDSTD
         help
           This enables access routines for the flash chips on the Nokia/Sagem
           D-Box 2 board. If you have one of these boards and would like to use
@@ -287,14 +294,14 @@ config MTD_DBOX2
 
 config MTD_CFI_FLAGADM
         tristate "CFI Flash device mapping on FlagaDM"
-        depends on PPC32 && 8xx && MTD_CFI
+        depends on 8xx && MTD_CFI
         help
           Mapping for the Flaga digital module. If you don't have one, ignore
           this setting.
 
 config MTD_BEECH
         tristate "CFI Flash device mapped on IBM 405LP Beech"
-        depends on MTD_CFI && PPC32 && 40x && BEECH
+        depends on MTD_CFI && BEECH
         help
           This enables access routines for the flash chips on the IBM
           405LP Beech board. If you have one of these boards and would like
@@ -302,7 +309,7 @@ config MTD_BEECH
 
 config MTD_ARCTIC
         tristate "CFI Flash device mapped on IBM 405LP Arctic"
-        depends on MTD_CFI && PPC32 && 40x && ARCTIC2
+        depends on MTD_CFI && ARCTIC2
         help
           This enables access routines for the flash chips on the IBM 405LP
           Arctic board. If you have one of these boards and would like to
@@ -310,7 +317,7 @@ config MTD_ARCTIC
 
 config MTD_WALNUT
         tristate "Flash device mapped on IBM 405GP Walnut"
-        depends on MTD_JEDECPROBE && PPC32 && 40x && WALNUT
+        depends on MTD_JEDECPROBE && WALNUT
         help
           This enables access routines for the flash chips on the IBM 405GP
           Walnut board. If you have one of these boards and would like to
@@ -318,7 +325,7 @@ config MTD_WALNUT
 
 config MTD_EBONY
         tristate "Flash devices mapped on IBM 440GP Ebony"
-        depends on MTD_JEDECPROBE && PPC32 && 44x && EBONY
+        depends on MTD_JEDECPROBE && EBONY
         help
           This enables access routines for the flash chips on the IBM 440GP
           Ebony board. If you have one of these boards and would like to
@@ -326,7 +333,7 @@ config MTD_EBONY
 
 config MTD_OCOTEA
         tristate "Flash devices mapped on IBM 440GX Ocotea"
-        depends on MTD_CFI && PPC32 && 44x && OCOTEA
+        depends on MTD_CFI && OCOTEA
         help
           This enables access routines for the flash chips on the IBM 440GX
           Ocotea board. If you have one of these boards and would like to
@@ -334,12 +341,20 @@ config MTD_OCOTEA
 
 config MTD_REDWOOD
         tristate "CFI Flash devices mapped on IBM Redwood"
-        depends on MTD_CFI && PPC32 && 4xx && 40x && ( REDWOOD_4 || REDWOOD_5 || REDWOOD_6 )
+        depends on MTD_CFI && ( REDWOOD_4 || REDWOOD_5 || REDWOOD_6 )
         help
           This enables access routines for the flash chips on the IBM
           Redwood board. If you have one of these boards and would like to
           use the flash chips on it, say 'Y'.
 
+config MTD_TQM834x
+        tristate "Flash device mapped on TQ Components TQM834x Boards"
+        depends on MTD_CFI && TQM834x
+        help
+          This enables access routines for the flash chips on the
+          TQ Components TQM834x boards. If you have one of these boards
+          and would like to use the flash chips on it, say 'Y'.
+
 config MTD_CSTM_MIPS_IXX
         tristate "Flash chip mapping on ITE QED-4N-S01B, Globespan IVR or custom board"
         depends on MIPS && MTD_CFI && MTD_JEDECPROBE && MTD_PARTITIONS
@@ -362,8 +377,8 @@ config MTD_CSTM_MIPS_IXX_START
         default "0x8000000"
         help
           This is the physical memory location that the MTD driver will
-          use for the flash chips on your particular target board. 
-          Refer to the memory map which should hopefully be in the 
+          use for the flash chips on your particular target board.
+          Refer to the memory map which should hopefully be in the
           documentation for your board.
 
 config MTD_CSTM_MIPS_IXX_LEN
@@ -371,7 +386,7 @@ config MTD_CSTM_MIPS_IXX_LEN
         depends on MTD_CSTM_MIPS_IXX
         default "0x4000000"
         help
-          This is the total length that the MTD driver will use for the 
+          This is the total length that the MTD driver will use for the
           flash chips on your particular board.  Refer to the memory
           map which should hopefully be in the documentation for your
           board.
@@ -405,14 +420,14 @@ config MTD_ARM_INTEGRATOR
 
 config MTD_CDB89712
         tristate "Cirrus CDB89712 evaluation board mappings"
-        depends on ARM && MTD_CFI && ARCH_CDB89712
+        depends on MTD_CFI && ARCH_CDB89712
         help
           This enables access to the flash or ROM chips on the CDB89712 board.
           If you have such a board, say 'Y'.
 
 config MTD_SA1100
         tristate "CFI Flash device mapped on StrongARM SA11x0"
-        depends on ARM && MTD_CFI && ARCH_SA1100 && MTD_PARTITIONS
+        depends on MTD_CFI && ARCH_SA1100 && MTD_PARTITIONS
         help
           This enables access to the flash chips on most platforms based on
           the SA1100 and SA1110, including the Assabet and the Compaq iPAQ.
@@ -420,13 +435,13 @@ config MTD_SA1100
 
 config MTD_IPAQ
         tristate "CFI Flash device mapped on Compaq/HP iPAQ"
-        depends on ARM && IPAQ_HANDHELD && MTD_CFI
+        depends on IPAQ_HANDHELD && MTD_CFI
         help
           This provides a driver for the on-board flash of the iPAQ.
 
 config MTD_DC21285
         tristate "CFI Flash device mapped on DC21285 Footbridge"
-        depends on ARM && MTD_CFI && ARCH_FOOTBRIDGE && MTD_COMPLEX_MAPPINGS
+        depends on MTD_CFI && ARCH_FOOTBRIDGE && MTD_COMPLEX_MAPPINGS
         help
           This provides a driver for the flash accessed using Intel's
           21285 bridge used with Intel's StrongARM processors. More info at
@@ -434,33 +449,33 @@ config MTD_DC21285
 
 config MTD_IQ80310
         tristate "CFI Flash device mapped on the XScale IQ80310 board"
-        depends on ARM && MTD_CFI && ARCH_IQ80310
+        depends on MTD_CFI && ARCH_IQ80310
         help
           This enables access routines for the flash chips on the Intel XScale
-          IQ80310 evaluation board. If you have one of these boards and would 
+          IQ80310 evaluation board. If you have one of these boards and would
           like to use the flash chips on it, say 'Y'.
 
 config MTD_IXP4XX
         tristate "CFI Flash device mapped on Intel IXP4xx based systems"
-        depends on ARM && MTD_CFI && MTD_COMPLEX_MAPPINGS && ARCH_IXP4XX
+        depends on MTD_CFI && MTD_COMPLEX_MAPPINGS && ARCH_IXP4XX
         help
-          This enables MTD access to flash devices on platforms based 
+          This enables MTD access to flash devices on platforms based
           on Intel's IXP4xx family of network processors such as the
           IXDP425 and Coyote. If you have an IXP4xx based board and
           would like to use the flash chips on it, say 'Y'.
 
 config MTD_IXP2000
         tristate "CFI Flash device mapped on Intel IXP2000 based systems"
-        depends on ARM && MTD_CFI && MTD_COMPLEX_MAPPINGS && ARCH_IXP2000
+        depends on MTD_CFI && MTD_COMPLEX_MAPPINGS && ARCH_IXP2000
         help
-          This enables MTD access to flash devices on platforms based 
+          This enables MTD access to flash devices on platforms based
           on Intel's IXP2000 family of network processors such as the
           IXDP425 and Coyote. If you have an IXP2000 based board and
           would like to use the flash chips on it, say 'Y'.
 
 config MTD_EPXA10DB
         tristate "CFI Flash device mapped on Epxa10db"
-        depends on ARM && MTD_CFI && MTD_PARTITIONS && ARCH_CAMELOT
+        depends on MTD_CFI && MTD_PARTITIONS && ARCH_CAMELOT
         help
           This enables support for the flash devices on the Altera
           Excalibur XA10 Development Board. If you are building a kernel
@@ -468,21 +483,21 @@ config MTD_EPXA10DB
 
 config MTD_FORTUNET
         tristate "CFI Flash device mapped on the FortuNet board"
-        depends on ARM && MTD_CFI && MTD_PARTITIONS && SA1100_FORTUNET
+        depends on MTD_CFI && MTD_PARTITIONS && SA1100_FORTUNET
         help
           This enables access to the Flash on the FortuNet board.  If you
           have such a board, say 'Y'.
 
 config MTD_AUTCPU12
         tristate "NV-RAM mapping AUTCPU12 board"
-        depends on ARM && ARCH_AUTCPU12
+        depends on ARCH_AUTCPU12
         help
           This enables access to the NV-RAM on autronix autcpu12 board.
           If you have such a board, say 'Y'.
 
 config MTD_EDB7312
         tristate "CFI Flash device mapped on EDB7312"
-        depends on ARM && MTD_CFI
+        depends on ARCH_EDB7312 && MTD_CFI
         help
           This enables access to the CFI Flash on the Cogent EDB7312 board.
           If you have such a board, say 'Y' here.
@@ -496,7 +511,7 @@ config MTD_IMPA7
 
 config MTD_CEIVA
         tristate "JEDEC Flash device mapped on Ceiva/Polaroid PhotoMax Digital Picture Frame"
-        depends on ARM && MTD_JEDECPROBE && ARCH_CEIVA
+        depends on MTD_JEDECPROBE && ARCH_CEIVA
         help
           This enables access to the flash chips on the Ceiva/Polaroid
           PhotoMax Digital Picture Frame.
@@ -504,25 +519,31 @@ config MTD_CEIVA
 
 config MTD_NOR_TOTO
         tristate "NOR Flash device on TOTO board"
-        depends on ARM && ARCH_OMAP && OMAP_TOTO
+        depends on ARCH_OMAP && OMAP_TOTO
         help
           This enables access to the NOR flash on the Texas Instruments
           TOTO board.
 
 config MTD_H720X
         tristate "Hynix evaluation board mappings"
-        depends on ARM && MTD_CFI && ( ARCH_H7201 || ARCH_H7202 )
+        depends on MTD_CFI && ( ARCH_H7201 || ARCH_H7202 )
         help
           This enables access to the flash chips on the Hynix evaluation boards.
           If you have such a board, say 'Y'.
 
 config MTD_MPC1211
         tristate "CFI Flash device mapped on Interface MPC-1211"
-        depends on SUPERH && SH_MPC1211 && MTD_CFI
+        depends on SH_MPC1211 && MTD_CFI
         help
           This enables access to the flash chips on the Interface MPC-1211(CTP/PCI/MPC-SH02).
           If you have such a board, say 'Y'.
 
+config MTD_PQ2FADS
+        tristate "JEDEC flash SIMM mapped on PQ2FADS and 8272ADS boards"
+        depends on (ADS8272 || PQ2FADS) && MTD_PARTITIONS && MTD_JEDECPROBE && MTD_PHYSMAP && MTD_CFI_GEOMETRY && MTD_CFI_INTELEXT
+        help
+         This enables access to flash SIMM on PQ2FADS-like boards
+
 config MTD_OMAP_NOR
         tristate "TI OMAP board mappings"
         depends on MTD_CFI && ARCH_OMAP
diff --git a/drivers/mtd/maps/Makefile b/drivers/mtd/maps/Makefile
index 7bcbc49e329f..7d9e940a1dcd 100644
--- a/drivers/mtd/maps/Makefile
+++ b/drivers/mtd/maps/Makefile
@@ -1,7 +1,7 @@
 #
 # linux/drivers/maps/Makefile
 #
-# $Id: Makefile.common,v 1.30 2005/07/02 01:53:24 tpoynor Exp $
+# $Id: Makefile.common,v 1.34 2005/11/07 11:14:26 gleixner Exp $
 
 ifeq ($(CONFIG_MTD_COMPLEX_MAPPINGS),y)
 obj-$(CONFIG_MTD)               += map_funcs.o
@@ -26,7 +26,7 @@ obj-$(CONFIG_MTD_MAINSTONE)	+= mainstone-flash.o
 obj-$(CONFIG_MTD_MBX860)        += mbx860.o
 obj-$(CONFIG_MTD_CEIVA)         += ceiva.o
 obj-$(CONFIG_MTD_OCTAGON)       += octagon-5066.o
-obj-$(CONFIG_MTD_PHYSMAP)       += physmap.o 
+obj-$(CONFIG_MTD_PHYSMAP)       += physmap.o
 obj-$(CONFIG_MTD_PNC2000)       += pnc2000.o
 obj-$(CONFIG_MTD_PCMCIA)        += pcmciamtd.o
 obj-$(CONFIG_MTD_RPXLITE)       += rpxlite.o
@@ -70,3 +70,6 @@ obj-$(CONFIG_MTD_DMV182)	+= dmv182.o
 obj-$(CONFIG_MTD_SHARP_SL)      += sharpsl-flash.o
 obj-$(CONFIG_MTD_PLATRAM)       += plat-ram.o
 obj-$(CONFIG_MTD_OMAP_NOR)      += omap_nor.o
+obj-$(CONFIG_MTD_PQ2FADS)       += pq2fads.o
+obj-$(CONFIG_MTD_MTX1)          += mtx-1_flash.o
+obj-$(CONFIG_MTD_TQM834x)       += tqm834x.o
diff --git a/drivers/mtd/maps/alchemy-flash.c b/drivers/mtd/maps/alchemy-flash.c
index 27fd2a3c3b60..a57791a6ce40 100644
--- a/drivers/mtd/maps/alchemy-flash.c
+++ b/drivers/mtd/maps/alchemy-flash.c
@@ -1,10 +1,10 @@
 /*
  * Flash memory access on AMD Alchemy evaluation boards
- * 
- * $Id: alchemy-flash.c,v 1.1 2005/02/27 21:50:21 ppopov Exp $
+ *
+ * $Id: alchemy-flash.c,v 1.2 2005/11/07 11:14:26 gleixner Exp $
  *
  * (C) 2003, 2004 Pete Popov <ppopov@embeddedalley.com>
- * 
+ *
  */
 
 #include <linux/config.h>
@@ -22,7 +22,7 @@
 #ifdef  DEBUG_RW
 #define DBG(x...)       printk(x)
 #else
-#define DBG(x...)       
+#define DBG(x...)
 #endif
 
 #ifdef CONFIG_MIPS_PB1000
@@ -136,7 +136,7 @@ int __init alchemy_mtd_init(void)
         int nb_parts = 0;
         unsigned long window_addr;
         unsigned long window_size;
-        
+
         /* Default flash buswidth */
         alchemy_map.bankwidth = BOARD_FLASH_WIDTH;
 
@@ -161,7 +161,7 @@ int __init alchemy_mtd_init(void)
          * Now let's probe for the actual flash.  Do it here since
          * specific machine settings might have been set above.
          */
-        printk(KERN_NOTICE BOARD_MAP_NAME ": probing %d-bit flash bus\n", 
+        printk(KERN_NOTICE BOARD_MAP_NAME ": probing %d-bit flash bus\n",
                         alchemy_map.bankwidth*8);
         alchemy_map.virt = ioremap(window_addr, window_size);
         mymtd = do_map_probe("cfi_probe", &alchemy_map);
diff --git a/drivers/mtd/maps/amd76xrom.c b/drivers/mtd/maps/amd76xrom.c
index e8a900a77685..c350878d4592 100644
--- a/drivers/mtd/maps/amd76xrom.c
+++ b/drivers/mtd/maps/amd76xrom.c
@@ -2,7 +2,7 @@
  * amd76xrom.c
  *
  * Normal mappings of chips in physical memory
- * $Id: amd76xrom.c,v 1.20 2005/03/18 14:04:35 gleixner Exp $
+ * $Id: amd76xrom.c,v 1.21 2005/11/07 11:14:26 gleixner Exp $
  */
 
 #include <linux/module.h>
@@ -70,7 +70,7 @@ static void amd76xrom_cleanup(struct amd76xrom_window *window)
                 list_del(&map->list);
                 kfree(map);
         }
-        if (window->rsrc.parent) 
+        if (window->rsrc.parent)
                 release_resource(&window->rsrc);
 
         if (window->virt) {
@@ -107,7 +107,7 @@ static int __devinit amd76xrom_init_one (struct pci_dev *pdev,
                 window->phys = 0xffff0000; /* 64KiB */
         }
         window->size = 0xffffffffUL - window->phys + 1UL;
-        
+
         /*
          * Try to reserve the window mem region.  If this fails then
          * it is likely due to a fragment of the window being
@@ -138,7 +138,7 @@ static int __devinit amd76xrom_init_one (struct pci_dev *pdev,
         /* Enable writes through the rom window */
         pci_read_config_byte(pdev, 0x40, &byte);
         pci_write_config_byte(pdev, 0x40, byte | 1);
-        
+
         /* FIXME handle registers 0x80 - 0x8C the bios region locks */
 
         /* For write accesses caches are useless */
@@ -186,7 +186,7 @@ static int __devinit amd76xrom_init_one (struct pci_dev *pdev,
                         MOD_NAME, map->map.phys);
 
                 /* There is no generic VPP support */
-                for(map->map.bankwidth = 32; map->map.bankwidth; 
+                for(map->map.bankwidth = 32; map->map.bankwidth;
                         map->map.bankwidth >>= 1)
                 {
                         char **probe_type;
@@ -239,7 +239,7 @@ static int __devinit amd76xrom_init_one (struct pci_dev *pdev,
                 for(i = 0; i < cfi->numchips; i++) {
                         cfi->chips[i].start += offset;
                 }
-                
+
                 /* Now that the mtd devices is complete claim and export it */
                 map->mtd->owner = THIS_MODULE;
                 if (add_mtd_device(map->mtd)) {
@@ -259,9 +259,7 @@ static int __devinit amd76xrom_init_one (struct pci_dev *pdev,
 
  out:
         /* Free any left over map structures */
-        if (map) {
-                kfree(map);
-        }
+        kfree(map);
         /* See if I have any map structures */
         if (list_empty(&window->maps)) {
                 amd76xrom_cleanup(window);
@@ -279,9 +277,9 @@ static void __devexit amd76xrom_remove_one (struct pci_dev *pdev)
 }
 
 static struct pci_device_id amd76xrom_pci_tbl[] = {
-        { PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_VIPER_7410,  
+        { PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_VIPER_7410,
                 PCI_ANY_ID, PCI_ANY_ID, },
-        { PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_VIPER_7440,  
+        { PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_VIPER_7440,
                 PCI_ANY_ID, PCI_ANY_ID, },
         { PCI_VENDOR_ID_AMD, 0x7468 }, /* amd8111 support */
         { 0, }
diff --git a/drivers/mtd/maps/arctic-mtd.c b/drivers/mtd/maps/arctic-mtd.c
index 777276fd0e15..d95ae582fbe9 100644
--- a/drivers/mtd/maps/arctic-mtd.c
+++ b/drivers/mtd/maps/arctic-mtd.c
@@ -1,7 +1,7 @@
 /*
- * $Id: arctic-mtd.c,v 1.13 2004/11/04 13:24:14 gleixner Exp $
- * 
- * drivers/mtd/maps/arctic-mtd.c MTD mappings and partition tables for 
+ * $Id: arctic-mtd.c,v 1.14 2005/11/07 11:14:26 gleixner Exp $
+ *
+ * drivers/mtd/maps/arctic-mtd.c MTD mappings and partition tables for
  *                              IBM 405LP Arctic boards.
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/drivers/mtd/maps/autcpu12-nvram.c b/drivers/mtd/maps/autcpu12-nvram.c
index cf362ccc3c8e..7ed3424dd959 100644
--- a/drivers/mtd/maps/autcpu12-nvram.c
+++ b/drivers/mtd/maps/autcpu12-nvram.c
@@ -1,8 +1,8 @@
 /*
- * NV-RAM memory access on autcpu12 
+ * NV-RAM memory access on autcpu12
  * (C) 2002 Thomas Gleixner (gleixner@autronix.de)
  *
- * $Id: autcpu12-nvram.c,v 1.8 2004/11/04 13:24:14 gleixner Exp $ 
+ * $Id: autcpu12-nvram.c,v 1.9 2005/11/07 11:14:26 gleixner Exp $
  *
  * 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
@@ -55,10 +55,10 @@ static int __init init_autcpu12_sram (void)
         }
         simple_map_init(&autcpu_sram_map);
 
-        /* 
-         * Check for 32K/128K 
-         * read ofs 0 
-         * read ofs 0x10000 
+        /*
+         * Check for 32K/128K
+         * read ofs 0
+         * read ofs 0x10000
          * Write complement to ofs 0x100000
          * Read and check result on ofs 0x0
          * Restore contents
@@ -66,7 +66,7 @@ static int __init init_autcpu12_sram (void)
         save0 = map_read32(&autcpu12_sram_map,0);
         save1 = map_read32(&autcpu12_sram_map,0x10000);
         map_write32(&autcpu12_sram_map,~save0,0x10000);
-        /* if we find this pattern on 0x0, we have 32K size 
+        /* if we find this pattern on 0x0, we have 32K size
          * restore contents and exit
          */
         if ( map_read32(&autcpu12_sram_map,0) != save0) {
@@ -89,7 +89,7 @@ map:
 
         sram_mtd->owner = THIS_MODULE;
         sram_mtd->erasesize = 16;
-        
+
         if (add_mtd_device(sram_mtd)) {
                 printk("NV-RAM device addition failed\n");
                 err = -ENOMEM;
@@ -97,7 +97,7 @@ map:
         }
 
         printk("NV-RAM device size %ldKiB registered on AUTCPU12\n",autcpu12_sram_map.size/SZ_1K);
-                
+
         return 0;
 
 out_probe:
diff --git a/drivers/mtd/maps/bast-flash.c b/drivers/mtd/maps/bast-flash.c
index bfe994e59265..b7858eb93534 100644
--- a/drivers/mtd/maps/bast-flash.c
+++ b/drivers/mtd/maps/bast-flash.c
@@ -9,7 +9,7 @@
  *      20-Sep-2004  BJD  Initial version
  *      17-Jan-2005  BJD  Add whole device if no partitions found
  *
- * $Id: bast-flash.c,v 1.2 2005/01/18 11:13:47 bjd Exp $
+ * $Id: bast-flash.c,v 1.5 2005/11/07 11:14:26 gleixner Exp $
  *
  * 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
@@ -75,7 +75,7 @@ static void bast_flash_setrw(int to)
 
         local_irq_save(flags);
         val = __raw_readb(BAST_VA_CTRL3);
-        
+
         if (to)
                 val |= BAST_CPLD_CTRL3_ROMWEN;
         else
@@ -93,7 +93,7 @@ static int bast_flash_remove(struct device *dev)
 
         dev_set_drvdata(dev, NULL);
 
-        if (info == NULL) 
+        if (info == NULL)
                 return 0;
 
         if (info->map.virt != NULL)
@@ -104,14 +104,13 @@ static int bast_flash_remove(struct device *dev)
                 map_destroy(info->mtd);
         }
 
-        if (info->partitions)
-                kfree(info->partitions);
+        kfree(info->partitions);
 
         if (info->area) {
                 release_resource(info->area);
                 kfree(info->area);
         }
-        
+
         kfree(info);
 
         return 0;
@@ -138,15 +137,15 @@ static int bast_flash_probe(struct device *dev)
 
         info->map.phys = res->start;
         info->map.size = res->end - res->start + 1;
-        info->map.name = dev->bus_id;   
+        info->map.name = dev->bus_id;
         info->map.bankwidth = 2;
-        
+
         if (info->map.size > AREA_MAXSIZE)
                 info->map.size = AREA_MAXSIZE;
 
         pr_debug("%s: area %08lx, size %ld\n", __FUNCTION__,
                  info->map.phys, info->map.size);
-        
+
         info->area = request_mem_region(res->start, info->map.size,
                                         pdev->name);
         if (info->area == NULL) {
@@ -163,7 +162,7 @@ static int bast_flash_probe(struct device *dev)
                 err = -EIO;
                 goto exit_error;
         }
- 
+
         simple_map_init(&info->map);
 
         /* enable the write to the flash area */
@@ -188,7 +187,7 @@ static int bast_flash_probe(struct device *dev)
         err = parse_mtd_partitions(info->mtd, probes, &info->partitions, 0);
         if (err > 0) {
                 err = add_mtd_partitions(info->mtd, info->partitions, err);
-                if (err) 
+                if (err)
                         printk(KERN_ERR PFX "cannot add/parse partitions\n");
         } else {
                 err = add_mtd_device(info->mtd);
@@ -206,6 +205,7 @@ static int bast_flash_probe(struct device *dev)
 
 static struct device_driver bast_flash_driver = {
         .name           = "bast-nor",
+        .owner          = THIS_MODULE,
         .bus            = &platform_bus_type,
         .probe          = bast_flash_probe,
         .remove         = bast_flash_remove,
diff --git a/drivers/mtd/maps/beech-mtd.c b/drivers/mtd/maps/beech-mtd.c
index 5e79c9d5da2b..5df7361d1407 100644
--- a/drivers/mtd/maps/beech-mtd.c
+++ b/drivers/mtd/maps/beech-mtd.c
@@ -1,7 +1,7 @@
 /*
- * $Id: beech-mtd.c,v 1.10 2004/11/04 13:24:14 gleixner Exp $
- * 
- * drivers/mtd/maps/beech-mtd.c MTD mappings and partition tables for 
+ * $Id: beech-mtd.c,v 1.11 2005/11/07 11:14:26 gleixner Exp $
+ *
+ * drivers/mtd/maps/beech-mtd.c MTD mappings and partition tables for
  *                              IBM 405LP Beech boards.
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/drivers/mtd/maps/cdb89712.c b/drivers/mtd/maps/cdb89712.c
index ab15dac2f936..9f17bb6c5a9d 100644
--- a/drivers/mtd/maps/cdb89712.c
+++ b/drivers/mtd/maps/cdb89712.c
@@ -1,7 +1,7 @@
 /*
  * Flash on Cirrus CDB89712
  *
- * $Id: cdb89712.c,v 1.10 2004/11/04 13:24:14 gleixner Exp $
+ * $Id: cdb89712.c,v 1.11 2005/11/07 11:14:26 gleixner Exp $
  */
 
 #include <linux/module.h>
@@ -37,13 +37,13 @@ struct resource cdb89712_flash_resource = {
 static int __init init_cdb89712_flash (void)
 {
         int err;
-        
+
         if (request_resource (&ioport_resource, &cdb89712_flash_resource)) {
                 printk(KERN_NOTICE "Failed to reserve Cdb89712 FLASH space\n");
                 err = -EBUSY;
                 goto out;
         }
-        
+
         cdb89712_flash_map.virt = ioremap(FLASH_START, FLASH_SIZE);
         if (!cdb89712_flash_map.virt) {
                 printk(KERN_NOTICE "Failed to ioremap Cdb89712 FLASH space\n");
@@ -64,13 +64,13 @@ static int __init init_cdb89712_flash (void)
         }
 
         flash_mtd->owner = THIS_MODULE;
-        
+
         if (add_mtd_device(flash_mtd)) {
                 printk("FLASH device addition failed\n");
                 err = -ENOMEM;
                 goto out_probe;
         }
-                
+
         return 0;
 
 out_probe:
@@ -107,13 +107,13 @@ struct resource cdb89712_sram_resource = {
 static int __init init_cdb89712_sram (void)
 {
         int err;
-        
+
         if (request_resource (&ioport_resource, &cdb89712_sram_resource)) {
                 printk(KERN_NOTICE "Failed to reserve Cdb89712 SRAM space\n");
                 err = -EBUSY;
                 goto out;
         }
-        
+
         cdb89712_sram_map.virt = ioremap(SRAM_START, SRAM_SIZE);
         if (!cdb89712_sram_map.virt) {
                 printk(KERN_NOTICE "Failed to ioremap Cdb89712 SRAM space\n");
@@ -130,13 +130,13 @@ static int __init init_cdb89712_sram (void)
 
         sram_mtd->owner = THIS_MODULE;
         sram_mtd->erasesize = 16;
-        
+
         if (add_mtd_device(sram_mtd)) {
                 printk("SRAM device addition failed\n");
                 err = -ENOMEM;
                 goto out_probe;
         }
-                
+
         return 0;
 
 out_probe:
@@ -175,13 +175,13 @@ struct resource cdb89712_bootrom_resource = {
 static int __init init_cdb89712_bootrom (void)
 {
         int err;
-        
+
         if (request_resource (&ioport_resource, &cdb89712_bootrom_resource)) {
                 printk(KERN_NOTICE "Failed to reserve Cdb89712 BOOTROM space\n");
                 err = -EBUSY;
                 goto out;
         }
-        
+
         cdb89712_bootrom_map.virt = ioremap(BOOTROM_START, BOOTROM_SIZE);
         if (!cdb89712_bootrom_map.virt) {
                 printk(KERN_NOTICE "Failed to ioremap Cdb89712 BootROM space\n");
@@ -198,13 +198,13 @@ static int __init init_cdb89712_bootrom (void)
 
         bootrom_mtd->owner = THIS_MODULE;
         bootrom_mtd->erasesize = 0x10000;
-        
+
         if (add_mtd_device(bootrom_mtd)) {
                 printk("BootROM device addition failed\n");
                 err = -ENOMEM;
                 goto out_probe;
         }
-                
+
         return 0;
 
 out_probe:
@@ -225,16 +225,16 @@ out:
 static int __init init_cdb89712_maps(void)
 {
 
-        printk(KERN_INFO "Cirrus CDB89712 MTD mappings:\n  Flash 0x%x at 0x%x\n  SRAM 0x%x at 0x%x\n  BootROM 0x%x at 0x%x\n", 
+        printk(KERN_INFO "Cirrus CDB89712 MTD mappings:\n  Flash 0x%x at 0x%x\n  SRAM 0x%x at 0x%x\n  BootROM 0x%x at 0x%x\n",
                FLASH_SIZE, FLASH_START, SRAM_SIZE, SRAM_START, BOOTROM_SIZE, BOOTROM_START);
 
         init_cdb89712_flash();
         init_cdb89712_sram();
         init_cdb89712_bootrom();
-        
+
         return 0;
 }
-        
+
 
 static void __exit cleanup_cdb89712_maps(void)
 {
@@ -244,7 +244,7 @@ static void __exit cleanup_cdb89712_maps(void)
                 iounmap((void *)cdb89712_sram_map.virt);
                 release_resource (&cdb89712_sram_resource);
         }
-        
+
         if (flash_mtd) {
                 del_mtd_device(flash_mtd);
                 map_destroy(flash_mtd);
diff --git a/drivers/mtd/maps/ceiva.c b/drivers/mtd/maps/ceiva.c
index c68b31dc7e6d..5a95ab370a97 100644
--- a/drivers/mtd/maps/ceiva.c
+++ b/drivers/mtd/maps/ceiva.c
@@ -313,8 +313,7 @@ static void __init clps_locate_partitions(struct mtd_info *mtd)
 
 static void __exit clps_destroy_partitions(void)
 {
-        if (parsed_parts)
-                kfree(parsed_parts);
+        kfree(parsed_parts);
 }
 
 static struct mtd_info *mymtd;
diff --git a/drivers/mtd/maps/cfi_flagadm.c b/drivers/mtd/maps/cfi_flagadm.c
index f72e4f894b32..6a8c0415bde8 100644
--- a/drivers/mtd/maps/cfi_flagadm.c
+++ b/drivers/mtd/maps/cfi_flagadm.c
@@ -1,8 +1,8 @@
 /*
  *  Copyright © 2001 Flaga hf. Medical Devices, Kári Davíðsson <kd@flaga.is>
  *
- *  $Id: cfi_flagadm.c,v 1.14 2004/11/04 13:24:14 gleixner Exp $
- *  
+ *  $Id: cfi_flagadm.c,v 1.15 2005/11/07 11:14:26 gleixner Exp $
+ *
  *  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
@@ -42,7 +42,7 @@
  */
 
 #define FLASH_PHYS_ADDR 0x40000000
-#define FLASH_SIZE 0x400000  
+#define FLASH_SIZE 0x400000
 
 #define FLASH_PARTITION0_ADDR 0x00000000
 #define FLASH_PARTITION0_SIZE 0x00020000
@@ -79,7 +79,7 @@ struct mtd_partition flagadm_parts[] = {
                 .offset =       FLASH_PARTITION2_ADDR,
                 .size =         FLASH_PARTITION2_SIZE
         },
-        {       
+        {
                 .name =         "Persistant storage",
                 .offset =       FLASH_PARTITION3_ADDR,
                 .size =         FLASH_PARTITION3_SIZE
@@ -91,10 +91,10 @@ struct mtd_partition flagadm_parts[] = {
 static struct mtd_info *mymtd;
 
 int __init init_flagadm(void)
-{       
+{
         printk(KERN_NOTICE "FlagaDM flash device: %x at %x\n",
                         FLASH_SIZE, FLASH_PHYS_ADDR);
-        
+
         flagadm_map.phys = FLASH_PHYS_ADDR;
         flagadm_map.virt = ioremap(FLASH_PHYS_ADDR,
                                         FLASH_SIZE);
diff --git a/drivers/mtd/maps/cstm_mips_ixx.c b/drivers/mtd/maps/cstm_mips_ixx.c
index ae9252fbf176..a370953c1513 100644
--- a/drivers/mtd/maps/cstm_mips_ixx.c
+++ b/drivers/mtd/maps/cstm_mips_ixx.c
@@ -1,10 +1,10 @@
 /*
- * $Id: cstm_mips_ixx.c,v 1.12 2004/11/04 13:24:14 gleixner Exp $
+ * $Id: cstm_mips_ixx.c,v 1.14 2005/11/07 11:14:26 gleixner Exp $
  *
  * Mapping of a custom board with both AMD CFI and JEDEC flash in partitions.
  * Config with both CFI and JEDEC device support.
  *
- * Basically physmap.c with the addition of partitions and 
+ * Basically physmap.c with the addition of partitions and
  * an array of mapping info to accomodate more than one flash type per board.
  *
  * Copyright 2000 MontaVista Software Inc.
@@ -69,7 +69,7 @@ void cstm_mips_ixx_set_vpp(struct map_info *map,int vpp)
                         __u16   data;
                         __u8    data1;
                         static u8 first = 1;
-                
+
                         // Set GPIO port B pin3 to high
                         data = *(__u16 *)(CC_GPBCR);
                         data = (data & 0xff0f) | 0x0040;
@@ -85,7 +85,7 @@ void cstm_mips_ixx_set_vpp(struct map_info *map,int vpp)
         } else {
                 if (!--vpp_count) {
                         __u16   data;
-                
+
                         // Set GPIO port B pin3 to high
                         data = *(__u16 *)(CC_GPBCR);
                         data = (data & 0xff3f) | 0x0040;
@@ -109,8 +109,8 @@ struct cstm_mips_ixx_info {
 };
 
 #if defined(CONFIG_MIPS_ITE8172) || defined(CONFIG_MIPS_IVR)
-#define PHYSMAP_NUMBER  1  // number of board desc structs needed, one per contiguous flash type 
-const struct cstm_mips_ixx_info cstm_mips_ixx_board_desc[PHYSMAP_NUMBER] = 
+#define PHYSMAP_NUMBER  1  // number of board desc structs needed, one per contiguous flash type
+const struct cstm_mips_ixx_info cstm_mips_ixx_board_desc[PHYSMAP_NUMBER] =
 {
     {   // 28F128J3A in 2x16 configuration
         "big flash",     // name
@@ -131,10 +131,10 @@ static struct mtd_partition cstm_mips_ixx_partitions[PHYSMAP_NUMBER][MAX_PHYSMAP
 },
 };
 #else /* defined(CONFIG_MIPS_ITE8172) || defined(CONFIG_MIPS_IVR) */
-#define PHYSMAP_NUMBER  1  // number of board desc structs needed, one per contiguous flash type 
-const struct cstm_mips_ixx_info cstm_mips_ixx_board_desc[PHYSMAP_NUMBER] = 
+#define PHYSMAP_NUMBER  1  // number of board desc structs needed, one per contiguous flash type
+const struct cstm_mips_ixx_info cstm_mips_ixx_board_desc[PHYSMAP_NUMBER] =
 {
-    {  
+    {
         "MTD flash",                   // name
         CONFIG_MTD_CSTM_MIPS_IXX_START,      // window_addr
         CONFIG_MTD_CSTM_MIPS_IXX_LEN,        // window_size
@@ -144,7 +144,7 @@ const struct cstm_mips_ixx_info cstm_mips_ixx_board_desc[PHYSMAP_NUMBER] =
 
 };
 static struct mtd_partition cstm_mips_ixx_partitions[PHYSMAP_NUMBER][MAX_PHYSMAP_PARTITIONS] = {
-{ 
+{
         {
                 .name = "main partition",
                 .size =  CONFIG_MTD_CSTM_MIPS_IXX_LEN,
@@ -165,7 +165,7 @@ int __init init_cstm_mips_ixx(void)
 
         /* Initialize mapping */
         for (i=0;i<PHYSMAP_NUMBER;i++) {
-                printk(KERN_NOTICE "cstm_mips_ixx flash device: 0x%lx at 0x%lx\n", 
+                printk(KERN_NOTICE "cstm_mips_ixx flash device: 0x%lx at 0x%lx\n",
                        cstm_mips_ixx_board_desc[i].window_size, cstm_mips_ixx_board_desc[i].window_addr);
 
 
@@ -235,7 +235,7 @@ void PCISetULongByOffset(__u32 DevNumber, __u32 FuncNumber, __u32 Offset, __u32
 
         offset = ( unsigned long )( 0x80000000 | ( DevNumber << 11 ) + ( FuncNumber << 8 ) + Offset) ;
 
-        *(__u32 *)CC_CONFADDR = offset; 
+        *(__u32 *)CC_CONFADDR = offset;
         *(__u32 *)CC_CONFDATA = data;
 }
 void setup_ITE_IVR_flash()
diff --git a/drivers/mtd/maps/dbox2-flash.c b/drivers/mtd/maps/dbox2-flash.c
index d850a27a4b59..49d90542fc75 100644
--- a/drivers/mtd/maps/dbox2-flash.c
+++ b/drivers/mtd/maps/dbox2-flash.c
@@ -1,5 +1,5 @@
 /*
- * $Id: dbox2-flash.c,v 1.13 2004/11/04 13:24:14 gleixner Exp $
+ * $Id: dbox2-flash.c,v 1.14 2005/11/07 11:14:26 gleixner Exp $
  *
  * D-Box 2 flash driver
  */
@@ -21,38 +21,38 @@
 static struct mtd_partition partition_info[]= {
         {
         .name           = "BR bootloader",
-        .size           = 128 * 1024, 
-        .offset         = 0,                  
+        .size           = 128 * 1024,
+        .offset         = 0,
         .mask_flags     = MTD_WRITEABLE
         },
         {
         .name           = "FLFS (U-Boot)",
-        .size           = 128 * 1024, 
-        .offset         = MTDPART_OFS_APPEND, 
+        .size           = 128 * 1024,
+        .offset         = MTDPART_OFS_APPEND,
         .mask_flags     = 0
         },
         {
-        .name           = "Root (SquashFS)",    
-        .size           = 7040 * 1024, 
-        .offset         = MTDPART_OFS_APPEND, 
+        .name           = "Root (SquashFS)",
+        .size           = 7040 * 1024,
+        .offset         = MTDPART_OFS_APPEND,
         .mask_flags     = 0
         },
         {
         .name           = "var (JFFS2)",
-        .size           = 896 * 1024, 
-        .offset         = MTDPART_OFS_APPEND, 
+        .size           = 896 * 1024,
+        .offset         = MTDPART_OFS_APPEND,
         .mask_flags     = 0
         },
         {
-        .name           = "Flash without bootloader",   
-        .size           = MTDPART_SIZ_FULL, 
-        .offset         = 128 * 1024, 
+        .name           = "Flash without bootloader",
+        .size           = MTDPART_SIZ_FULL,
+        .offset         = 128 * 1024,
         .mask_flags     = 0
         },
         {
-        .name           = "Complete Flash",     
-        .size           = MTDPART_SIZ_FULL, 
-        .offset         = 0, 
+        .name           = "Complete Flash",
+        .size           = MTDPART_SIZ_FULL,
+        .offset         = 0,
         .mask_flags     = MTD_WRITEABLE
         }
 };
@@ -88,16 +88,16 @@ int __init init_dbox2_flash(void)
         if (!mymtd) {
             // Probe for single Intel 28F640
             dbox2_flash_map.bankwidth = 2;
-        
+
             mymtd = do_map_probe("cfi_probe", &dbox2_flash_map);
         }
-            
+
         if (mymtd) {
                 mymtd->owner = THIS_MODULE;
 
                 /* Create MTD devices for each partition. */
                 add_mtd_partitions(mymtd, partition_info, NUM_PARTITIONS);
-                
+
                 return 0;
         }
 
diff --git a/drivers/mtd/maps/dc21285.c b/drivers/mtd/maps/dc21285.c
index e5b74169fde6..701620b6baed 100644
--- a/drivers/mtd/maps/dc21285.c
+++ b/drivers/mtd/maps/dc21285.c
@@ -4,8 +4,8 @@
  * (C) 2000  Nicolas Pitre <nico@cam.org>
  *
  * This code is GPL
- * 
- * $Id: dc21285.c,v 1.22 2004/11/01 13:39:21 rmk Exp $
+ *
+ * $Id: dc21285.c,v 1.24 2005/11/07 11:14:26 gleixner Exp $
  */
 #include <linux/config.h>
 #include <linux/module.h>
@@ -27,9 +27,9 @@
 static struct mtd_info *dc21285_mtd;
 
 #ifdef CONFIG_ARCH_NETWINDER
-/* 
+/*
  * This is really ugly, but it seams to be the only
- * realiable way to do it, as the cpld state machine 
+ * realiable way to do it, as the cpld state machine
  * is unpredictible. So we have a 25us penalty per
  * write access.
  */
@@ -150,7 +150,7 @@ static struct map_info dc21285_map = {
 static struct mtd_partition *dc21285_parts;
 static const char *probes[] = { "RedBoot", "cmdlinepart", NULL };
 #endif
-  
+
 static int __init init_dc21285(void)
 {
 
@@ -160,20 +160,20 @@ static int __init init_dc21285(void)
 
         /* Determine bankwidth */
         switch (*CSR_SA110_CNTL & (3<<14)) {
-                case SA110_CNTL_ROMWIDTH_8: 
+                case SA110_CNTL_ROMWIDTH_8:
                         dc21285_map.bankwidth = 1;
                         dc21285_map.read = dc21285_read8;
                         dc21285_map.write = dc21285_write8;
                         dc21285_map.copy_to = dc21285_copy_to_8;
                         break;
-                case SA110_CNTL_ROMWIDTH_16: 
-                        dc21285_map.bankwidth = 2; 
+                case SA110_CNTL_ROMWIDTH_16:
+                        dc21285_map.bankwidth = 2;
                         dc21285_map.read = dc21285_read16;
                         dc21285_map.write = dc21285_write16;
                         dc21285_map.copy_to = dc21285_copy_to_16;
                         break;
-                case SA110_CNTL_ROMWIDTH_32: 
-                        dc21285_map.bankwidth = 4; 
+                case SA110_CNTL_ROMWIDTH_32:
+                        dc21285_map.bankwidth = 4;
                         dc21285_map.read = dc21285_read32;
                         dc21285_map.write = dc21285_write32;
                         dc21285_map.copy_to = dc21285_copy_to_32;
@@ -201,20 +201,20 @@ static int __init init_dc21285(void)
         if (!dc21285_mtd) {
                 iounmap(dc21285_map.virt);
                 return -ENXIO;
-        }       
-        
+        }
+
         dc21285_mtd->owner = THIS_MODULE;
 
 #ifdef CONFIG_MTD_PARTITIONS
         nrparts = parse_mtd_partitions(dc21285_mtd, probes, &dc21285_parts, 0);
         if (nrparts > 0)
                 add_mtd_partitions(dc21285_mtd, dc21285_parts, nrparts);
-        else    
-#endif  
+        else
+#endif
                 add_mtd_device(dc21285_mtd);
-                        
+
         if(machine_is_ebsa285()) {
-                /* 
+                /*
                  * Flash timing is determined with bits 19-16 of the
                  * CSR_SA110_CNTL.  The value is the number of wait cycles, or
                  * 0 for 16 cycles (the default).  Cycles are 20 ns.
@@ -227,7 +227,7 @@ static int __init init_dc21285(void)
                 /* tristate time */
                 *CSR_SA110_CNTL = ((*CSR_SA110_CNTL & ~0x0f000000) | (7 << 24));
         }
-        
+
         return 0;
 }
 
diff --git a/drivers/mtd/maps/dilnetpc.c b/drivers/mtd/maps/dilnetpc.c
index f99519692cb7..b51c757817d8 100644
--- a/drivers/mtd/maps/dilnetpc.c
+++ b/drivers/mtd/maps/dilnetpc.c
@@ -14,7 +14,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
  *
- * $Id: dilnetpc.c,v 1.17 2004/11/28 09:40:39 dwmw2 Exp $
+ * $Id: dilnetpc.c,v 1.20 2005/11/07 11:14:26 gleixner Exp $
  *
  * The DIL/Net PC is a tiny embedded PC board made by SSV Embedded Systems
  * featuring the AMD Elan SC410 processor. There are two variants of this
@@ -272,13 +272,13 @@ static struct map_info dnpc_map = {
 
 static struct mtd_partition partition_info[]=
 {
-        { 
-                .name =         "ADNP boot", 
-                .offset =       0, 
+        {
+                .name =         "ADNP boot",
+                .offset =       0,
                 .size =         0xf0000,
         },
-        { 
-                .name =         "ADNP system BIOS", 
+        {
+                .name =         "ADNP system BIOS",
                 .offset =       MTDPART_OFS_NXTBLK,
                 .size =         0x10000,
 #ifdef DNPC_BIOS_BLOCKS_WRITEPROTECTED
@@ -291,7 +291,7 @@ static struct mtd_partition partition_info[]=
                 .size =         0x2f0000,
         },
         {
-                .name =         "ADNP system BIOS entry", 
+                .name =         "ADNP system BIOS entry",
                 .offset =       MTDPART_OFS_NXTBLK,
                 .size =         MTDPART_SIZ_FULL,
 #ifdef DNPC_BIOS_BLOCKS_WRITEPROTECTED
@@ -325,9 +325,9 @@ static struct mtd_info *merged_mtd;
 
 static struct mtd_partition higlvl_partition_info[]=
 {
-        { 
-                .name =         "ADNP boot block", 
-                .offset =       0, 
+        {
+                .name =         "ADNP boot block",
+                .offset =       0,
                 .size =         CONFIG_MTD_DILNETPC_BOOTSIZE,
         },
         {
@@ -335,8 +335,8 @@ static struct mtd_partition higlvl_partition_info[]=
                 .offset =       MTDPART_OFS_NXTBLK,
                 .size =         ADNP_WINDOW_SIZE-CONFIG_MTD_DILNETPC_BOOTSIZE-0x20000,
         },
-        { 
-                .name =         "ADNP system BIOS + BIOS Entry", 
+        {
+                .name =         "ADNP system BIOS + BIOS Entry",
                 .offset =       MTDPART_OFS_NXTBLK,
                 .size =         MTDPART_SIZ_FULL,
 #ifdef DNPC_BIOS_BLOCKS_WRITEPROTECTED
@@ -371,7 +371,7 @@ static int __init init_dnpc(void)
 
         /*
         ** determine hardware (DNP/ADNP/invalid)
-        */      
+        */
         if((is_dnp = dnp_adnp_probe()) < 0)
                 return -ENXIO;
 
@@ -397,13 +397,13 @@ static int __init init_dnpc(void)
                 ++dnpc_map.name;
                 for(i = 0; i < NUM_PARTITIONS; i++)
                         ++partition_info[i].name;
-                higlvl_partition_info[1].size = DNP_WINDOW_SIZE - 
+                higlvl_partition_info[1].size = DNP_WINDOW_SIZE -
                         CONFIG_MTD_DILNETPC_BOOTSIZE - 0x20000;
                 for(i = 0; i < NUM_HIGHLVL_PARTITIONS; i++)
                         ++higlvl_partition_info[i].name;
         }
 
-        printk(KERN_NOTICE "DIL/Net %s flash: 0x%lx at 0x%lx\n", 
+        printk(KERN_NOTICE "DIL/Net %s flash: 0x%lx at 0x%lx\n",
                 is_dnp ? "DNPC" : "ADNP", dnpc_map.size, dnpc_map.phys);
 
         dnpc_map.virt = ioremap_nocache(dnpc_map.phys, dnpc_map.size);
@@ -436,7 +436,7 @@ static int __init init_dnpc(void)
                 iounmap(dnpc_map.virt);
                 return -ENXIO;
         }
-                
+
         mymtd->owner = THIS_MODULE;
 
         /*
diff --git a/drivers/mtd/maps/dmv182.c b/drivers/mtd/maps/dmv182.c
index b9bc63503e26..b993ac01a9a5 100644
--- a/drivers/mtd/maps/dmv182.c
+++ b/drivers/mtd/maps/dmv182.c
@@ -1,10 +1,10 @@
 
 /*
  * drivers/mtd/maps/svme182.c
- * 
+ *
  * Flash map driver for the Dy4 SVME182 board
- * 
- * $Id: dmv182.c,v 1.5 2004/11/04 13:24:14 gleixner Exp $
+ *
+ * $Id: dmv182.c,v 1.6 2005/11/07 11:14:26 gleixner Exp $
  *
  * Copyright 2003-2004, TimeSys Corporation
  *
@@ -104,7 +104,7 @@ static int __init init_svme182(void)
         partitions = svme182_partitions;
 
         svme182_map.virt = ioremap(FLASH_BASE_ADDR, svme182_map.size);
-                
+
         if (svme182_map.virt == 0) {
                 printk("Failed to ioremap FLASH memory area.\n");
                 return -EIO;
diff --git a/drivers/mtd/maps/ebony.c b/drivers/mtd/maps/ebony.c
index b9d9cf4854b6..c0daf58357ca 100644
--- a/drivers/mtd/maps/ebony.c
+++ b/drivers/mtd/maps/ebony.c
@@ -1,6 +1,6 @@
 /*
- * $Id: ebony.c,v 1.15 2004/12/09 18:39:54 holindho Exp $
- * 
+ * $Id: ebony.c,v 1.16 2005/11/07 11:14:26 gleixner Exp $
+ *
  * Mapping for Ebony user flash
  *
  * Matt Porter <mporter@kernel.crashing.org>
@@ -85,7 +85,7 @@ int __init init_ebony(void)
                 small_flash_base = EBONY_SMALL_FLASH_LOW2;
         else
                 small_flash_base = EBONY_SMALL_FLASH_LOW1;
-                        
+
         if (EBONY_BOOT_SMALL_FLASH(fpga0_reg) &&
                         !EBONY_ONBRD_FLASH_EN(fpga0_reg))
                 large_flash_base = EBONY_LARGE_FLASH_LOW;
diff --git a/drivers/mtd/maps/edb7312.c b/drivers/mtd/maps/edb7312.c
index 8b0da394f3fa..b48a3473ffc1 100644
--- a/drivers/mtd/maps/edb7312.c
+++ b/drivers/mtd/maps/edb7312.c
@@ -1,10 +1,10 @@
 /*
- * $Id: edb7312.c,v 1.13 2004/11/04 13:24:14 gleixner Exp $
+ * $Id: edb7312.c,v 1.14 2005/11/07 11:14:27 gleixner Exp $
  *
  * Handle mapping of the NOR flash on Cogent EDB7312 boards
  *
  * Copyright 2002 SYSGO Real-Time Solutions GmbH
- * 
+ *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 as
  * published by the Free Software Foundation.
@@ -46,7 +46,7 @@ struct map_info edb7312nor_map = {
 #ifdef CONFIG_MTD_PARTITIONS
 
 /*
- * MTD partitioning stuff 
+ * MTD partitioning stuff
  */
 static struct mtd_partition static_partitions[3] =
 {
@@ -80,7 +80,7 @@ int __init init_edb7312nor(void)
         const char **type;
         const char *part_type = 0;
 
-        printk(KERN_NOTICE MSG_PREFIX "0x%08x at 0x%08x\n", 
+        printk(KERN_NOTICE MSG_PREFIX "0x%08x at 0x%08x\n",
                WINDOW_SIZE, WINDOW_ADDR);
         edb7312nor_map.virt = ioremap(WINDOW_ADDR, WINDOW_SIZE);
 
@@ -88,7 +88,7 @@ int __init init_edb7312nor(void)
                 printk(MSG_PREFIX "failed to ioremap\n");
                 return -EIO;
         }
-        
+
         simple_map_init(&edb7312nor_map);
 
         mymtd = 0;
diff --git a/drivers/mtd/maps/epxa10db-flash.c b/drivers/mtd/maps/epxa10db-flash.c
index 1df6188926b3..265b079fe934 100644
--- a/drivers/mtd/maps/epxa10db-flash.c
+++ b/drivers/mtd/maps/epxa10db-flash.c
@@ -5,7 +5,7 @@
  *  Copyright (C) 2001 Altera Corporation
  *  Copyright (C) 2001 Red Hat, Inc.
  *
- * $Id: epxa10db-flash.c,v 1.13 2004/11/04 13:24:14 gleixner Exp $ 
+ * $Id: epxa10db-flash.c,v 1.15 2005/11/07 11:14:27 gleixner Exp $
  *
  * 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
@@ -62,7 +62,7 @@ static const char *probes[] = { "RedBoot", "afs", NULL };
 static int __init epxa_mtd_init(void)
 {
         int i;
-        
+
         printk(KERN_NOTICE "%s flash device: 0x%x at 0x%x\n", BOARD_NAME, FLASH_SIZE, FLASH_START);
 
         epxa_map.virt = ioremap(FLASH_START, FLASH_SIZE);
@@ -126,8 +126,8 @@ static void __exit epxa_mtd_cleanup(void)
 }
 
 
-/* 
- * This will do for now, once we decide which bootldr we're finally 
+/*
+ * This will do for now, once we decide which bootldr we're finally
  * going to use then we'll remove this function and do it properly
  *
  * Partions are currently (as offsets from base of flash):
@@ -140,7 +140,7 @@ static int __init epxa_default_partitions(struct mtd_info *master, struct mtd_pa
         struct mtd_partition *parts;
         int ret, i;
         int npartitions = 0;
-        char *names; 
+        char *names;
         const char *name = "jffs";
 
         printk("Using default partitions for %s\n",BOARD_NAME);
@@ -152,7 +152,7 @@ static int __init epxa_default_partitions(struct mtd_info *master, struct mtd_pa
                 goto out;
         }
         i=0;
-        names = (char *)&parts[npartitions];    
+        names = (char *)&parts[npartitions];
         parts[i].name = names;
         names += strlen(name) + 1;
         strcpy(parts[i].name, name);
diff --git a/drivers/mtd/maps/fortunet.c b/drivers/mtd/maps/fortunet.c
index 00f7bbe5479e..c6bf4e1219ef 100644
--- a/drivers/mtd/maps/fortunet.c
+++ b/drivers/mtd/maps/fortunet.c
@@ -1,6 +1,6 @@
 /* fortunet.c memory map
  *
- * $Id: fortunet.c,v 1.9 2004/11/04 13:24:14 gleixner Exp $
+ * $Id: fortunet.c,v 1.11 2005/11/07 11:14:27 gleixner Exp $
  */
 
 #include <linux/module.h>
@@ -212,7 +212,7 @@ int __init init_fortunet(void)
 
                         map_regions[ix].map_info.phys = map_regions[ix].window_addr_physical,
 
-                        map_regions[ix].map_info.virt = 
+                        map_regions[ix].map_info.virt =
                                 ioremap_nocache(
                                 map_regions[ix].window_addr_physical,
                                 map_regions[ix].map_info.size);
diff --git a/drivers/mtd/maps/h720x-flash.c b/drivers/mtd/maps/h720x-flash.c
index c73828171d9b..319094821101 100644
--- a/drivers/mtd/maps/h720x-flash.c
+++ b/drivers/mtd/maps/h720x-flash.c
@@ -1,11 +1,11 @@
 /*
- * Flash memory access on Hynix GMS30C7201/HMS30C7202 based 
+ * Flash memory access on Hynix GMS30C7201/HMS30C7202 based
  * evaluation boards
- * 
- * $Id: h720x-flash.c,v 1.11 2004/11/04 13:24:14 gleixner Exp $
+ *
+ * $Id: h720x-flash.c,v 1.12 2005/11/07 11:14:27 gleixner Exp $
  *
  * (C) 2002 Jungjun Kim <jungjun.kim@hynix.com>
- *     2003 Thomas Gleixner <tglx@linutronix.de>        
+ *     2003 Thomas Gleixner <tglx@linutronix.de>
  */
 
 #include <linux/config.h>
@@ -72,7 +72,7 @@ int __init h720x_mtd_init(void)
 {
 
         char    *part_type = NULL;
-        
+
         h720x_map.virt = ioremap(FLASH_PHYS, FLASH_SIZE);
 
         if (!h720x_map.virt) {
@@ -91,7 +91,7 @@ int __init h720x_mtd_init(void)
             h720x_map.bankwidth = 2;
             mymtd = do_map_probe("cfi_probe", &h720x_map);
         }
-            
+
         if (mymtd) {
                 mymtd->owner = THIS_MODULE;
 
@@ -124,11 +124,11 @@ static void __exit h720x_mtd_cleanup(void)
                 del_mtd_partitions(mymtd);
                 map_destroy(mymtd);
         }
-        
+
         /* Free partition info, if commandline partition was used */
         if (mtd_parts && (mtd_parts != h720x_partitions))
                 kfree (mtd_parts);
-        
+
         if (h720x_map.virt) {
                 iounmap((void *)h720x_map.virt);
                 h720x_map.virt = 0;
diff --git a/drivers/mtd/maps/ichxrom.c b/drivers/mtd/maps/ichxrom.c
index e505207cd489..ea5073781b3a 100644
--- a/drivers/mtd/maps/ichxrom.c
+++ b/drivers/mtd/maps/ichxrom.c
@@ -2,7 +2,7 @@
  * ichxrom.c
  *
  * Normal mappings of chips in physical memory
- * $Id: ichxrom.c,v 1.18 2005/07/07 10:26:20 dwmw2 Exp $
+ * $Id: ichxrom.c,v 1.19 2005/11/07 11:14:27 gleixner Exp $
  */
 
 #include <linux/module.h>
@@ -101,7 +101,7 @@ static int __devinit ichxrom_init_one (struct pci_dev *pdev,
          * you can only really attach a FWH to an ICHX there
          * a number of simplifications you can make.
          *
-         * Also you can page firmware hubs if an 8MB window isn't enough 
+         * Also you can page firmware hubs if an 8MB window isn't enough
          * but don't currently handle that case either.
          */
         window->pdev = pdev;
@@ -144,7 +144,7 @@ static int __devinit ichxrom_init_one (struct pci_dev *pdev,
                 window->phys = 0xfff00000;
         }
         else if ((byte & 0x80) == 0x80) {
-                window->phys = 0xfff80000; 
+                window->phys = 0xfff80000;
         }
 
         if (window->phys == 0) {
@@ -233,7 +233,7 @@ static int __devinit ichxrom_init_one (struct pci_dev *pdev,
                  * in a factory setting.  So in-place programming
                  * needs to use a different method.
                  */
-                for(map->map.bankwidth = 32; map->map.bankwidth; 
+                for(map->map.bankwidth = 32; map->map.bankwidth;
                         map->map.bankwidth >>= 1)
                 {
                         char **probe_type;
@@ -286,7 +286,7 @@ static int __devinit ichxrom_init_one (struct pci_dev *pdev,
                 for(i = 0; i < cfi->numchips; i++) {
                         cfi->chips[i].start += offset;
                 }
-                
+
                 /* Now that the mtd devices is complete claim and export it */
                 map->mtd->owner = THIS_MODULE;
                 if (add_mtd_device(map->mtd)) {
@@ -306,9 +306,8 @@ static int __devinit ichxrom_init_one (struct pci_dev *pdev,
 
  out:
         /* Free any left over map structures */
-        if (map) {
-                kfree(map);
-        }
+        kfree(map);
+
         /* See if I have any map structures */
         if (list_empty(&window->maps)) {
                 ichxrom_cleanup(window);
@@ -325,11 +324,11 @@ static void __devexit ichxrom_remove_one (struct pci_dev *pdev)
 }
 
 static struct pci_device_id ichxrom_pci_tbl[] __devinitdata = {
-        { PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82801BA_0, 
+        { PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82801BA_0,
           PCI_ANY_ID, PCI_ANY_ID, },
-        { PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82801CA_0, 
+        { PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82801CA_0,
           PCI_ANY_ID, PCI_ANY_ID, },
-        { PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82801DB_0, 
+        { PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82801DB_0,
           PCI_ANY_ID, PCI_ANY_ID, },
         { PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82801EB_0,
           PCI_ANY_ID, PCI_ANY_ID, },
diff --git a/drivers/mtd/maps/impa7.c b/drivers/mtd/maps/impa7.c
index cb39172c81d2..ba7f40311a7e 100644
--- a/drivers/mtd/maps/impa7.c
+++ b/drivers/mtd/maps/impa7.c
@@ -1,10 +1,10 @@
 /*
- * $Id: impa7.c,v 1.13 2004/11/04 13:24:14 gleixner Exp $
+ * $Id: impa7.c,v 1.14 2005/11/07 11:14:27 gleixner Exp $
  *
  * Handle mapping of the NOR flash on implementa A7 boards
  *
  * Copyright 2002 SYSGO Real-Time Solutions GmbH
- * 
+ *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 as
  * published by the Free Software Foundation.
@@ -55,7 +55,7 @@ static struct map_info impa7_map[NUM_FLASHBANKS] = {
 #ifdef CONFIG_MTD_PARTITIONS
 
 /*
- * MTD partitioning stuff 
+ * MTD partitioning stuff
  */
 static struct mtd_partition static_partitions[] =
 {
@@ -108,9 +108,9 @@ int __init init_impa7(void)
                         impa7_mtd[i]->owner = THIS_MODULE;
                         devicesfound++;
 #ifdef CONFIG_MTD_PARTITIONS
-                        mtd_parts_nb[i] = parse_mtd_partitions(impa7_mtd[i], 
+                        mtd_parts_nb[i] = parse_mtd_partitions(impa7_mtd[i],
                                                                probes,
-                                                               &mtd_parts[i], 
+                                                               &mtd_parts[i],
                                                                0);
                         if (mtd_parts_nb[i] > 0) {
                                 part_type = "command line";
@@ -121,16 +121,16 @@ int __init init_impa7(void)
                         }
 
                         printk(KERN_NOTICE MSG_PREFIX
-                               "using %s partition definition\n", 
+                               "using %s partition definition\n",
                                part_type);
-                        add_mtd_partitions(impa7_mtd[i], 
+                        add_mtd_partitions(impa7_mtd[i],
                                            mtd_parts[i], mtd_parts_nb[i]);
 #else
                         add_mtd_device(impa7_mtd[i]);
 
 #endif
                 }
-                else 
+                else
                         iounmap((void *)impa7_map[i].virt);
         }
         return devicesfound == 0 ? -ENXIO : 0;
diff --git a/drivers/mtd/maps/integrator-flash.c b/drivers/mtd/maps/integrator-flash.c
index d14a0185b8f4..fe738fd8d6f8 100644
--- a/drivers/mtd/maps/integrator-flash.c
+++ b/drivers/mtd/maps/integrator-flash.c
@@ -1,28 +1,28 @@
 /*======================================================================
 
     drivers/mtd/maps/integrator-flash.c: ARM Integrator flash map driver
-  
+
     Copyright (C) 2000 ARM Limited
     Copyright (C) 2003 Deep Blue Solutions Ltd.
-  
+
    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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-  
-   This is access code for flashes using ARM's flash partitioning 
+
+   This is access code for flashes using ARM's flash partitioning
    standards.
 
-   $Id: integrator-flash.c,v 1.18 2004/11/01 13:26:15 rmk Exp $
+   $Id: integrator-flash.c,v 1.20 2005/11/07 11:14:27 gleixner Exp $
 
 ======================================================================*/
 
@@ -148,8 +148,7 @@ static int armflash_probe(struct device *_dev)
                         del_mtd_partitions(info->mtd);
                         map_destroy(info->mtd);
                 }
-                if (info->parts)
-                        kfree(info->parts);
+                kfree(info->parts);
 
  no_device:
                 iounmap(base);
@@ -176,8 +175,7 @@ static int armflash_remove(struct device *_dev)
                         del_mtd_partitions(info->mtd);
                         map_destroy(info->mtd);
                 }
-                if (info->parts)
-                        kfree(info->parts);
+                kfree(info->parts);
 
                 iounmap(info->map.virt);
                 release_resource(info->res);
diff --git a/drivers/mtd/maps/ipaq-flash.c b/drivers/mtd/maps/ipaq-flash.c
index 712401810841..35097c9bbf50 100644
--- a/drivers/mtd/maps/ipaq-flash.c
+++ b/drivers/mtd/maps/ipaq-flash.c
@@ -1,11 +1,11 @@
 /*
  * Flash memory access on iPAQ Handhelds (either SA1100 or PXA250 based)
- * 
+ *
  * (C) 2000 Nicolas Pitre <nico@cam.org>
  * (C) 2002 Hewlett-Packard Company <jamey.hicks@hp.com>
  * (C) 2003 Christian Pellegrin <chri@ascensit.com>, <chri@infis.univ.ts.it>: concatenation of multiple flashes
- * 
- * $Id: ipaq-flash.c,v 1.3 2004/11/04 13:24:15 gleixner Exp $
+ *
+ * $Id: ipaq-flash.c,v 1.5 2005/11/07 11:14:27 gleixner Exp $
  */
 
 #include <linux/config.h>
@@ -107,7 +107,7 @@ static struct mtd_partition h3xxx_partitions[] = {
 #ifndef CONFIG_LAB
                 mask_flags:     MTD_WRITEABLE,  /* force read-only */
 #endif
-        }, 
+        },
         {
                 name:           "H3XXX root jffs2",
 #ifndef CONFIG_LAB
@@ -148,7 +148,7 @@ static DEFINE_SPINLOCK(ipaq_vpp_lock);
 static void h3xxx_set_vpp(struct map_info *map, int vpp)
 {
         static int nest = 0;
-        
+
         spin_lock(&ipaq_vpp_lock);
         if (vpp)
                 nest++;
@@ -191,7 +191,7 @@ static unsigned long cs_phys[] = {
         SA1100_CS3_PHYS,
         SA1100_CS4_PHYS,
         SA1100_CS5_PHYS,
-#else 
+#else
         PXA_CS0_PHYS,
         PXA_CS1_PHYS,
         PXA_CS2_PHYS,
@@ -216,7 +216,7 @@ int __init ipaq_mtd_init(void)
 
         /* Default flash bankwidth */
         // ipaq_map.bankwidth = (MSC0 & MSC_RBW) ? 2 : 4;
-        
+
         if (machine_is_h1900())
         {
                 /* For our intents, the h1900 is not a real iPAQ, so we special-case it. */
@@ -229,7 +229,7 @@ int __init ipaq_mtd_init(void)
         else
                 for(i=0; i<MAX_IPAQ_CS; i++)
                         ipaq_map[i].bankwidth = 4;
-                        
+
         /*
          * Static partition definition selection
          */
@@ -309,7 +309,7 @@ int __init ipaq_mtd_init(void)
                                         return -ENXIO;
                         } else
                                 printk(KERN_NOTICE "iPAQ flash: found %d bytes\n", my_sub_mtd[i]->size);
-                        
+
                         /* do we really need this debugging? --joshua 20030703 */
                         // printk("my_sub_mtd[%d]=%p\n", i, my_sub_mtd[i]);
                         my_sub_mtd[i]->owner = THIS_MODULE;
@@ -333,11 +333,11 @@ int __init ipaq_mtd_init(void)
 #else
                 mymtd = my_sub_mtd[0];
 
-                /* 
+                /*
                  *In the very near future, command line partition parsing
                  * will use the device name as 'mtd-id' instead of a value
                  * passed to the parse_cmdline_partitions() routine. Since
-                 * the bootldr says 'ipaq', make sure it continues to work. 
+                 * the bootldr says 'ipaq', make sure it continues to work.
                  */
                 mymtd->name = "ipaq";
 
@@ -385,7 +385,7 @@ int __init ipaq_mtd_init(void)
          */
 
          i = parse_mtd_partitions(mymtd, part_probes, &parsed_parts, 0);
-                        
+
          if (i > 0) {
                  nb_parts = parsed_nr_parts = i;
                  parts = parsed_parts;
@@ -423,16 +423,15 @@ static void __exit ipaq_mtd_cleanup(void)
 #endif
                 map_destroy(mymtd);
 #ifdef CONFIG_MTD_CONCAT
-                for(i=0; i<MAX_IPAQ_CS; i++) 
+                for(i=0; i<MAX_IPAQ_CS; i++)
 #else
-                        for(i=1; i<MAX_IPAQ_CS; i++) 
-#endif            
+                        for(i=1; i<MAX_IPAQ_CS; i++)
+#endif
                         {
                                 if (my_sub_mtd[i])
                                         map_destroy(my_sub_mtd[i]);
                         }
-                if (parsed_parts)
-                        kfree(parsed_parts);
+                kfree(parsed_parts);
         }
 }
 
@@ -445,14 +444,14 @@ static int __init h1900_special_case(void)
         ipaq_map[0].phys = 0x0;
         ipaq_map[0].virt = __ioremap(0x0, 0x04000000, 0, 1);
         ipaq_map[0].bankwidth = 2;
-        
+
         printk(KERN_NOTICE "iPAQ flash: probing %d-bit flash bus, window=%lx with JEDEC.\n", ipaq_map[0].bankwidth*8, ipaq_map[0].virt);
         mymtd = do_map_probe("jedec_probe", &ipaq_map[0]);
         if (!mymtd)
                 return -ENODEV;
         add_mtd_device(mymtd);
         printk(KERN_NOTICE "iPAQ flash: registered h1910 flash\n");
-        
+
         return 0;
 }
 
diff --git a/drivers/mtd/maps/iq80310.c b/drivers/mtd/maps/iq80310.c
index 558d014e7acc..62d9e87d84e2 100644
--- a/drivers/mtd/maps/iq80310.c
+++ b/drivers/mtd/maps/iq80310.c
@@ -1,11 +1,11 @@
 /*
- * $Id: iq80310.c,v 1.20 2004/11/04 13:24:15 gleixner Exp $
+ * $Id: iq80310.c,v 1.21 2005/11/07 11:14:27 gleixner Exp $
  *
  * Mapping for the Intel XScale IQ80310 evaluation board
  *
  * Author:      Nicolas Pitre
  * Copyright:   (C) 2001 MontaVista Software Inc.
- * 
+ *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 as
  * published by the Free Software Foundation.
@@ -103,8 +103,7 @@ static void __exit cleanup_iq80310(void)
         if (mymtd) {
                 del_mtd_partitions(mymtd);
                 map_destroy(mymtd);
-                if (parsed_parts)
-                        kfree(parsed_parts);
+                kfree(parsed_parts);
         }
         if (iq80310_map.virt)
                 iounmap((void *)iq80310_map.virt);
diff --git a/drivers/mtd/maps/ixp2000.c b/drivers/mtd/maps/ixp2000.c
index 00b9f67580f1..641eb2b55e9f 100644
--- a/drivers/mtd/maps/ixp2000.c
+++ b/drivers/mtd/maps/ixp2000.c
@@ -1,5 +1,5 @@
 /*
- * $Id: ixp2000.c,v 1.6 2005/03/18 14:07:46 gleixner Exp $
+ * $Id: ixp2000.c,v 1.9 2005/11/07 11:14:27 gleixner Exp $
  *
  * drivers/mtd/maps/ixp2000.c
  *
@@ -14,7 +14,7 @@
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 as
  * published by the Free Software Foundation.
- * 
+ *
  */
 
 #include <linux/module.h>
@@ -46,8 +46,8 @@ struct ixp2000_flash_info {
 };
 
 static inline unsigned long flash_bank_setup(struct map_info *map, unsigned long ofs)
-{       
-        unsigned long (*set_bank)(unsigned long) = 
+{
+        unsigned long (*set_bank)(unsigned long) =
                 (unsigned long(*)(unsigned long))map->map_priv_2;
 
         return (set_bank ? set_bank(ofs) : ofs);
@@ -55,8 +55,8 @@ static inline unsigned long flash_bank_setup(struct map_info *map, unsigned long
 
 #ifdef __ARMEB__
 /*
- * Rev A0 and A1 of IXP2400 silicon have a broken addressing unit which 
- * causes the lower address bits to be XORed with 0x11 on 8 bit accesses 
+ * Rev A0 and A1 of IXP2400 silicon have a broken addressing unit which
+ * causes the lower address bits to be XORed with 0x11 on 8 bit accesses
  * and XORed with 0x10 on 16 bit accesses. See the spec update, erratum 44.
  */
 static int erratum44_workaround = 0;
@@ -90,7 +90,7 @@ static void ixp2000_flash_copy_from(struct map_info *map, void *to,
                               unsigned long from, ssize_t len)
 {
         from = flash_bank_setup(map, from);
-        while(len--) 
+        while(len--)
                 *(__u8 *) to++ = *(__u8 *)(map->map_priv_1 + from++);
 }
 
@@ -129,8 +129,7 @@ static int ixp2000_flash_remove(struct device *_dev)
         if (info->map.map_priv_1)
                 iounmap((void *) info->map.map_priv_1);
 
-        if (info->partitions) {
-                kfree(info->partitions); }
+        kfree(info->partitions);
 
         if (info->res) {
                 release_resource(info->res);
@@ -149,11 +148,11 @@ static int ixp2000_flash_probe(struct device *_dev)
         static const char *probes[] = { "RedBoot", "cmdlinepart", NULL };
         struct platform_device *dev = to_platform_device(_dev);
         struct ixp2000_flash_data *ixp_data = dev->dev.platform_data;
-        struct flash_platform_data *plat; 
+        struct flash_platform_data *plat;
         struct ixp2000_flash_info *info;
         unsigned long window_size;
         int err = -1;
-        
+
         if (!ixp_data)
                 return -ENODEV;
 
@@ -162,7 +161,7 @@ static int ixp2000_flash_probe(struct device *_dev)
                 return -ENODEV;
 
         window_size = dev->resource->end - dev->resource->start + 1;
-        dev_info(_dev, "Probe of IXP2000 flash(%d banks x %dMiB)\n", 
+        dev_info(_dev, "Probe of IXP2000 flash(%d banks x %dMiB)\n",
                         ixp_data->nr_banks, ((u32)window_size >> 20));
 
         if (plat->width != 1) {
@@ -175,7 +174,7 @@ static int ixp2000_flash_probe(struct device *_dev)
         if(!info) {
                 err = -ENOMEM;
                 goto Error;
-        }       
+        }
         memzero(info, sizeof(struct ixp2000_flash_info));
 
         dev_set_drvdata(&dev->dev, info);
@@ -185,7 +184,7 @@ static int ixp2000_flash_probe(struct device *_dev)
          * not attempt to do a direct access on us.
          */
         info->map.phys = NO_XIP;
-        
+
         info->nr_banks = ixp_data->nr_banks;
         info->map.size = ixp_data->nr_banks * window_size;
         info->map.bankwidth = 1;
@@ -193,7 +192,7 @@ static int ixp2000_flash_probe(struct device *_dev)
         /*
          * map_priv_2 is used to store a ptr to to the bank_setup routine
          */
-        info->map.map_priv_2 = (void __iomem *) ixp_data->bank_setup;
+        info->map.map_priv_2 = (unsigned long) ixp_data->bank_setup;
 
         info->map.name = dev->dev.bus_id;
         info->map.read = ixp2000_flash_read8;
@@ -201,8 +200,8 @@ static int ixp2000_flash_probe(struct device *_dev)
         info->map.copy_from = ixp2000_flash_copy_from;
         info->map.copy_to = ixp2000_flash_copy_to;
 
-        info->res = request_mem_region(dev->resource->start, 
-                        dev->resource->end - dev->resource->start + 1, 
+        info->res = request_mem_region(dev->resource->start,
+                        dev->resource->end - dev->resource->start + 1,
                         dev->dev.bus_id);
         if (!info->res) {
                 dev_err(_dev, "Could not reserve memory region\n");
@@ -210,7 +209,7 @@ static int ixp2000_flash_probe(struct device *_dev)
                 goto Error;
         }
 
-        info->map.map_priv_1 = ioremap(dev->resource->start, 
+        info->map.map_priv_1 = (unsigned long) ioremap(dev->resource->start,
                                 dev->resource->end - dev->resource->start + 1);
         if (!info->map.map_priv_1) {
                 dev_err(_dev, "Failed to ioremap flash region\n");
diff --git a/drivers/mtd/maps/ixp4xx.c b/drivers/mtd/maps/ixp4xx.c
index 733a9297a562..56b3a355bf7b 100644
--- a/drivers/mtd/maps/ixp4xx.c
+++ b/drivers/mtd/maps/ixp4xx.c
@@ -1,5 +1,5 @@
 /*
- * $Id: ixp4xx.c,v 1.7 2004/11/04 13:24:15 gleixner Exp $
+ * $Id: ixp4xx.c,v 1.12 2005/11/07 11:14:27 gleixner Exp $
  *
  * drivers/mtd/maps/ixp4xx.c
  *
@@ -45,7 +45,7 @@
 static map_word ixp4xx_read16(struct map_info *map, unsigned long ofs)
 {
         map_word val;
-        val.x[0] = *(__u16 *) (map->map_priv_1 + ofs);
+        val.x[0] = le16_to_cpu(readw(map->virt + ofs));
         return val;
 }
 
@@ -59,35 +59,35 @@ static void ixp4xx_copy_from(struct map_info *map, void *to,
 {
         int i;
         u8 *dest = (u8 *) to;
-        u16 *src = (u16 *) (map->map_priv_1 + from);
+        void __iomem *src = map->virt + from;
         u16 data;
 
         for (i = 0; i < (len / 2); i++) {
-                data = src[i];
+                data = le16_to_cpu(readw(src + 2*i));
                 dest[i * 2] = BYTE0(data);
                 dest[i * 2 + 1] = BYTE1(data);
         }
 
         if (len & 1)
-                dest[len - 1] = BYTE0(src[i]);
+                dest[len - 1] = BYTE0(le16_to_cpu(readw(src + 2*i)));
 }
 
-/* 
+/*
  * Unaligned writes are ignored, causing the 8-bit
  * probe to fail and proceed to the 16-bit probe (which succeeds).
  */
 static void ixp4xx_probe_write16(struct map_info *map, map_word d, unsigned long adr)
 {
         if (!(adr & 1))
-               *(__u16 *) (map->map_priv_1 + adr) = d.x[0];
+                writew(cpu_to_le16(d.x[0]), map->virt + adr);
 }
 
-/* 
+/*
  * Fast write16 function without the probing check above
  */
 static void ixp4xx_write16(struct map_info *map, map_word d, unsigned long adr)
 {
-       *(__u16 *) (map->map_priv_1 + adr) = d.x[0];
+        writew(cpu_to_le16(d.x[0]), map->virt + adr);
 }
 
 struct ixp4xx_flash_info {
@@ -104,28 +104,20 @@ static int ixp4xx_flash_remove(struct device *_dev)
         struct platform_device *dev = to_platform_device(_dev);
         struct flash_platform_data *plat = dev->dev.platform_data;
         struct ixp4xx_flash_info *info = dev_get_drvdata(&dev->dev);
-        map_word d;
 
         dev_set_drvdata(&dev->dev, NULL);
 
         if(!info)
                 return 0;
 
-        /*
-         * This is required for a soft reboot to work.
-         */
-        d.x[0] = 0xff;
-        ixp4xx_write16(&info->map, d, 0x55 * 0x2);
-
         if (info->mtd) {
                 del_mtd_partitions(info->mtd);
                 map_destroy(info->mtd);
         }
-        if (info->map.map_priv_1)
-                iounmap((void *) info->map.map_priv_1);
+        if (info->map.virt)
+                iounmap(info->map.virt);
 
-        if (info->partitions)
-                kfree(info->partitions);
+        kfree(info->partitions);
 
         if (info->res) {
                 release_resource(info->res);
@@ -135,9 +127,6 @@ static int ixp4xx_flash_remove(struct device *_dev)
         if (plat->exit)
                 plat->exit();
 
-        /* Disable flash write */
-        *IXP4XX_EXP_CS0 &= ~IXP4XX_FLASH_WRITABLE;
-
         return 0;
 }
 
@@ -161,17 +150,11 @@ static int ixp4xx_flash_probe(struct device *_dev)
         if(!info) {
                 err = -ENOMEM;
                 goto Error;
-        }       
+        }
         memzero(info, sizeof(struct ixp4xx_flash_info));
 
         dev_set_drvdata(&dev->dev, info);
 
-        /* 
-         * Enable flash write 
-         * TODO: Move this out to board specific code
-         */
-        *IXP4XX_EXP_CS0 |= IXP4XX_FLASH_WRITABLE;
-
         /*
          * Tell the MTD layer we're not 1:1 mapped so that it does
          * not attempt to do a direct access on us.
@@ -190,8 +173,8 @@ static int ixp4xx_flash_probe(struct device *_dev)
         info->map.write = ixp4xx_probe_write16,
         info->map.copy_from = ixp4xx_copy_from,
 
-        info->res = request_mem_region(dev->resource->start, 
-                        dev->resource->end - dev->resource->start + 1, 
+        info->res = request_mem_region(dev->resource->start,
+                        dev->resource->end - dev->resource->start + 1,
                         "IXP4XXFlash");
         if (!info->res) {
                 printk(KERN_ERR "IXP4XXFlash: Could not reserve memory region\n");
@@ -199,9 +182,9 @@ static int ixp4xx_flash_probe(struct device *_dev)
                 goto Error;
         }
 
-        info->map.map_priv_1 = ioremap(dev->resource->start,
-                            dev->resource->end - dev->resource->start + 1);
-        if (!info->map.map_priv_1) {
+        info->map.virt = ioremap(dev->resource->start,
+                                 dev->resource->end - dev->resource->start + 1);
+        if (!info->map.virt) {
                 printk(KERN_ERR "IXP4XXFlash: Failed to ioremap region\n");
                 err = -EIO;
                 goto Error;
@@ -214,7 +197,7 @@ static int ixp4xx_flash_probe(struct device *_dev)
                 goto Error;
         }
         info->mtd->owner = THIS_MODULE;
-        
+
         /* Use the fast version */
         info->map.write = ixp4xx_write16,
 
@@ -259,4 +242,3 @@ module_exit(ixp4xx_flash_exit);
 MODULE_LICENSE("GPL");
 MODULE_DESCRIPTION("MTD map driver for Intel IXP4xx systems");
 MODULE_AUTHOR("Deepak Saxena");
-
diff --git a/drivers/mtd/maps/l440gx.c b/drivers/mtd/maps/l440gx.c
index b08668212ab7..851bf9576052 100644
--- a/drivers/mtd/maps/l440gx.c
+++ b/drivers/mtd/maps/l440gx.c
@@ -1,5 +1,5 @@
 /*
- * $Id: l440gx.c,v 1.17 2004/11/28 09:40:39 dwmw2 Exp $
+ * $Id: l440gx.c,v 1.18 2005/11/07 11:14:27 gleixner Exp $
  *
  * BIOS Flash chip on Intel 440GX board.
  *
@@ -49,7 +49,7 @@ static struct map_info l440gx_map = {
         .bankwidth = BUSWIDTH,
         .phys = WINDOW_ADDR,
 #if 0
-        /* FIXME verify that this is the 
+        /* FIXME verify that this is the
          * appripriate code for vpp enable/disable
          */
         .set_vpp = l440gx_set_vpp
@@ -62,10 +62,10 @@ static int __init init_l440gx(void)
         struct resource *pm_iobase;
         __u16 word;
 
-        dev = pci_find_device(PCI_VENDOR_ID_INTEL, 
+        dev = pci_find_device(PCI_VENDOR_ID_INTEL,
                 PCI_DEVICE_ID_INTEL_82371AB_0, NULL);
 
-        pm_dev = pci_find_device(PCI_VENDOR_ID_INTEL, 
+        pm_dev = pci_find_device(PCI_VENDOR_ID_INTEL,
                 PCI_DEVICE_ID_INTEL_82371AB_3, NULL);
 
         if (!dev || !pm_dev) {
@@ -82,10 +82,10 @@ static int __init init_l440gx(void)
         simple_map_init(&l440gx_map);
         printk(KERN_NOTICE "window_addr = 0x%08lx\n", (unsigned long)l440gx_map.virt);
 
-        /* Setup the pm iobase resource 
+        /* Setup the pm iobase resource
          * This code should move into some kind of generic bridge
          * driver but for the moment I'm content with getting the
-         * allocation correct. 
+         * allocation correct.
          */
         pm_iobase = &pm_dev->resource[PIIXE_IOBASE_RESOURCE];
         if (!(pm_iobase->flags & IORESOURCE_IO)) {
@@ -110,7 +110,7 @@ static int __init init_l440gx(void)
         /* Set the iobase */
         iobase = pm_iobase->start;
         pci_write_config_dword(pm_dev, 0x40, iobase | 1);
-        
+
 
         /* Set XBCS# */
         pci_read_config_word(dev, 0x4e, &word);
@@ -122,7 +122,7 @@ static int __init init_l440gx(void)
 
         /* Enable the gate on the WE line */
         outb(inb(TRIBUF_PORT) & ~1, TRIBUF_PORT);
-        
+
         printk(KERN_NOTICE "Enabled WE line to L440GX BIOS flash chip.\n");
 
         mymtd = do_map_probe("jedec_probe", &l440gx_map);
@@ -145,7 +145,7 @@ static void __exit cleanup_l440gx(void)
 {
         del_mtd_device(mymtd);
         map_destroy(mymtd);
-        
+
         iounmap(l440gx_map.virt);
 }
 
diff --git a/drivers/mtd/maps/lubbock-flash.c b/drivers/mtd/maps/lubbock-flash.c
index 2337e0c46750..1aa0447c5e66 100644
--- a/drivers/mtd/maps/lubbock-flash.c
+++ b/drivers/mtd/maps/lubbock-flash.c
@@ -1,11 +1,11 @@
 /*
- * $Id: lubbock-flash.c,v 1.19 2004/11/04 13:24:15 gleixner Exp $
+ * $Id: lubbock-flash.c,v 1.21 2005/11/07 11:14:27 gleixner Exp $
  *
  * Map driver for the Lubbock developer platform.
  *
  * Author:      Nicolas Pitre
  * Copyright:   (C) 2001 MontaVista Software Inc.
- * 
+ *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 as
  * published by the Free Software Foundation.
@@ -76,7 +76,7 @@ static int __init init_lubbock(void)
         int flashboot = (LUB_CONF_SWITCHES & 1);
         int ret = 0, i;
 
-        lubbock_maps[0].bankwidth = lubbock_maps[1].bankwidth = 
+        lubbock_maps[0].bankwidth = lubbock_maps[1].bankwidth =
                 (BOOT_DEF & 1) ? 2 : 4;
 
         /* Compensate for the nROMBT switch which swaps the flash banks */
@@ -100,11 +100,11 @@ static int __init init_lubbock(void)
                 simple_map_init(&lubbock_maps[i]);
 
                 printk(KERN_NOTICE "Probing %s at physical address 0x%08lx (%d-bit bankwidth)\n",
-                       lubbock_maps[i].name, lubbock_maps[i].phys, 
+                       lubbock_maps[i].name, lubbock_maps[i].phys,
                        lubbock_maps[i].bankwidth * 8);
 
                 mymtds[i] = do_map_probe("cfi_probe", &lubbock_maps[i]);
-                
+
                 if (!mymtds[i]) {
                         iounmap((void *)lubbock_maps[i].virt);
                         if (lubbock_maps[i].cached)
@@ -124,7 +124,7 @@ static int __init init_lubbock(void)
 
         if (!mymtds[0] && !mymtds[1])
                 return ret;
-        
+
         for (i = 0; i < 2; i++) {
                 if (!mymtds[i]) {
                         printk(KERN_WARNING "%s is absent. Skipping\n", lubbock_maps[i].name);
@@ -151,15 +151,14 @@ static void __exit cleanup_lubbock(void)
                 if (nr_parsed_parts[i] || !i)
                         del_mtd_partitions(mymtds[i]);
                 else
-                        del_mtd_device(mymtds[i]);                      
+                        del_mtd_device(mymtds[i]);
 
                 map_destroy(mymtds[i]);
                 iounmap((void *)lubbock_maps[i].virt);
                 if (lubbock_maps[i].cached)
                         iounmap(lubbock_maps[i].cached);
 
-                if (parsed_parts[i])
-                        kfree(parsed_parts[i]);
+                kfree(parsed_parts[i]);
         }
 }
 
diff --git a/drivers/mtd/maps/mainstone-flash.c b/drivers/mtd/maps/mainstone-flash.c
index da0f8a692628..eaa4bbb868a3 100644
--- a/drivers/mtd/maps/mainstone-flash.c
+++ b/drivers/mtd/maps/mainstone-flash.c
@@ -5,7 +5,7 @@
  *
  * Author:      Nicolas Pitre
  * Copyright:   (C) 2001 MontaVista Software Inc.
- * 
+ *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 as
  * published by the Free Software Foundation.
@@ -91,27 +91,27 @@ static int __init init_mainstone(void)
                 mainstone_maps[i].virt = ioremap(mainstone_maps[i].phys,
                                                  WINDOW_SIZE);
                 if (!mainstone_maps[i].virt) {
-                        printk(KERN_WARNING "Failed to ioremap %s\n", 
+                        printk(KERN_WARNING "Failed to ioremap %s\n",
                                mainstone_maps[i].name);
                         if (!ret)
                                 ret = -ENOMEM;
                         continue;
                 }
-                mainstone_maps[i].cached = 
+                mainstone_maps[i].cached =
                         ioremap_cached(mainstone_maps[i].phys, WINDOW_SIZE);
                 if (!mainstone_maps[i].cached)
                         printk(KERN_WARNING "Failed to ioremap cached %s\n",
                                mainstone_maps[i].name);
                 simple_map_init(&mainstone_maps[i]);
 
-                printk(KERN_NOTICE 
+                printk(KERN_NOTICE
                        "Probing %s at physical address 0x%08lx"
                        " (%d-bit bankwidth)\n",
-                       mainstone_maps[i].name, mainstone_maps[i].phys, 
+                       mainstone_maps[i].name, mainstone_maps[i].phys,
                        mainstone_maps[i].bankwidth * 8);
 
                 mymtds[i] = do_map_probe("cfi_probe", &mainstone_maps[i]);
-                
+
                 if (!mymtds[i]) {
                         iounmap((void *)mainstone_maps[i].virt);
                         if (mainstone_maps[i].cached)
@@ -131,21 +131,21 @@ static int __init init_mainstone(void)
 
         if (!mymtds[0] && !mymtds[1])
                 return ret;
-        
+
         for (i = 0; i < 2; i++) {
                 if (!mymtds[i]) {
-                        printk(KERN_WARNING "%s is absent. Skipping\n", 
+                        printk(KERN_WARNING "%s is absent. Skipping\n",
                                mainstone_maps[i].name);
                 } else if (nr_parsed_parts[i]) {
-                        add_mtd_partitions(mymtds[i], parsed_parts[i], 
+                        add_mtd_partitions(mymtds[i], parsed_parts[i],
                                            nr_parsed_parts[i]);
                 } else if (!i) {
                         printk("Using static partitions on %s\n",
                                mainstone_maps[i].name);
-                        add_mtd_partitions(mymtds[i], mainstone_partitions, 
+                        add_mtd_partitions(mymtds[i], mainstone_partitions,
                                            ARRAY_SIZE(mainstone_partitions));
                 } else {
-                        printk("Registering %s as whole device\n", 
+                        printk("Registering %s as whole device\n",
                                mainstone_maps[i].name);
                         add_mtd_device(mymtds[i]);
                 }
diff --git a/drivers/mtd/maps/mbx860.c b/drivers/mtd/maps/mbx860.c
index c5c6901a4763..06b118727846 100644
--- a/drivers/mtd/maps/mbx860.c
+++ b/drivers/mtd/maps/mbx860.c
@@ -1,11 +1,11 @@
 /*
- * $Id: mbx860.c,v 1.8 2004/11/04 13:24:15 gleixner Exp $
+ * $Id: mbx860.c,v 1.9 2005/11/07 11:14:27 gleixner Exp $
  *
  * Handle mapping of the flash on MBX860 boards
  *
  * Author:      Anton Todorov
  * Copyright:   (C) 2001 Emness Technology
- * 
+ *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 as
  * published by the Free Software Foundation.
@@ -46,7 +46,7 @@ static struct mtd_partition partition_info[]={
         { .name = "MBX flash APPLICATION partition",
         .offset = (BOOT_PARTITION_SIZE_KiB+KERNEL_PARTITION_SIZE_KiB)*1024 }
 };
-                                   
+
 
 static struct mtd_info *mymtd;
 
diff --git a/drivers/mtd/maps/mtx-1_flash.c b/drivers/mtd/maps/mtx-1_flash.c
new file mode 100644
index 000000000000..d1e66e186746
--- /dev/null
+++ b/drivers/mtd/maps/mtx-1_flash.c
@@ -0,0 +1,96 @@
+/*
+ * Flash memory access on 4G Systems MTX-1 boards
+ *
+ * $Id: mtx-1_flash.c,v 1.2 2005/11/07 11:14:27 gleixner Exp $
+ *
+ * (C) 2005 Bruno Randolf <bruno.randolf@4g-systems.biz>
+ * (C) 2005 Jörn Engel <joern@wohnheim.fh-wedel.de>
+ *
+ */
+
+#include <linux/config.h>
+#include <linux/module.h>
+#include <linux/types.h>
+#include <linux/init.h>
+#include <linux/kernel.h>
+
+#include <linux/mtd/mtd.h>
+#include <linux/mtd/map.h>
+#include <linux/mtd/partitions.h>
+
+#include <asm/io.h>
+
+static struct map_info mtx1_map = {
+        .name = "MTX-1 flash",
+        .bankwidth = 4,
+        .size = 0x2000000,
+        .phys = 0x1E000000,
+};
+
+static struct mtd_partition mtx1_partitions[] = {
+        {
+                .name = "filesystem",
+                .size = 0x01C00000,
+                .offset = 0,
+        },{
+                .name = "yamon",
+                .size = 0x00100000,
+                .offset = MTDPART_OFS_APPEND,
+                .mask_flags = MTD_WRITEABLE,
+        },{
+                .name = "kernel",
+                .size = 0x002c0000,
+                .offset = MTDPART_OFS_APPEND,
+        },{
+                .name = "yamon env",
+                .size = 0x00040000,
+                .offset = MTDPART_OFS_APPEND,
+        }
+};
+
+static struct mtd_info *mtx1_mtd;
+
+int __init mtx1_mtd_init(void)
+{
+        int ret = -ENXIO;
+
+        simple_map_init(&mtx1_map);
+
+        mtx1_map.virt = ioremap(mtx1_map.phys, mtx1_map.size);
+        if (!mtx1_map.virt)
+                return -EIO;
+
+        mtx1_mtd = do_map_probe("cfi_probe", &mtx1_map);
+        if (!mtx1_mtd)
+                goto err;
+
+        mtx1_mtd->owner = THIS_MODULE;
+
+        ret = add_mtd_partitions(mtx1_mtd, mtx1_partitions,
+                        ARRAY_SIZE(mtx1_partitions));
+        if (ret)
+                goto err;
+
+        return 0;
+
+err:
+       iounmap(mtx1_map.virt);
+       return ret;
+}
+
+static void __exit mtx1_mtd_cleanup(void)
+{
+        if (mtx1_mtd) {
+                del_mtd_partitions(mtx1_mtd);
+                map_destroy(mtx1_mtd);
+        }
+        if (mtx1_map.virt)
+                iounmap(mtx1_map.virt);
+}
+
+module_init(mtx1_mtd_init);
+module_exit(mtx1_mtd_cleanup);
+
+MODULE_AUTHOR("Bruno Randolf <bruno.randolf@4g-systems.biz>");
+MODULE_DESCRIPTION("MTX-1 flash map");
+MODULE_LICENSE("GPL");
diff --git a/drivers/mtd/maps/netsc520.c b/drivers/mtd/maps/netsc520.c
index ab7e6358d281..33060a315722 100644
--- a/drivers/mtd/maps/netsc520.c
+++ b/drivers/mtd/maps/netsc520.c
@@ -3,7 +3,7 @@
  * Copyright (C) 2001 Mark Langsdorf (mark.langsdorf@amd.com)
  *      based on sc520cdp.c by Sysgo Real-Time Solutions GmbH
  *
- * $Id: netsc520.c,v 1.13 2004/11/28 09:40:40 dwmw2 Exp $
+ * $Id: netsc520.c,v 1.14 2005/11/07 11:14:27 gleixner Exp $
  *
  * 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
@@ -38,7 +38,7 @@
 ** The single, 16 megabyte flash bank is divided into four virtual
 ** partitions.  The first partition is 768 KiB and is intended to
 ** store the kernel image loaded by the bootstrap loader.  The second
-** partition is 256 KiB and holds the BIOS image.  The third 
+** partition is 256 KiB and holds the BIOS image.  The third
 ** partition is 14.5 MiB and is intended for the flash file system
 ** image.  The last partition is 512 KiB and contains another copy
 ** of the BIOS image and the reset vector.
@@ -51,28 +51,28 @@
 ** recoverable afterwards.
 */
 
-/* partition_info gives details on the logical partitions that the split the 
+/* partition_info gives details on the logical partitions that the split the
  * single flash device into. If the size if zero we use up to the end of the
  * device. */
 static struct mtd_partition partition_info[]={
-    { 
-            .name = "NetSc520 boot kernel", 
-            .offset = 0, 
+    {
+            .name = "NetSc520 boot kernel",
+            .offset = 0,
             .size = 0xc0000
     },
-    { 
-            .name = "NetSc520 Low BIOS", 
-            .offset = 0xc0000, 
+    {
+            .name = "NetSc520 Low BIOS",
+            .offset = 0xc0000,
             .size = 0x40000
     },
-    { 
-            .name = "NetSc520 file system", 
-            .offset = 0x100000, 
+    {
+            .name = "NetSc520 file system",
+            .offset = 0x100000,
             .size = 0xe80000
     },
-    { 
-            .name = "NetSc520 High BIOS", 
-            .offset = 0xf80000, 
+    {
+            .name = "NetSc520 High BIOS",
+            .offset = 0xf80000,
             .size = 0x80000
     },
 };
@@ -114,7 +114,7 @@ static int __init init_netsc520(void)
                 iounmap(netsc520_map.virt);
                 return -ENXIO;
         }
-                
+
         mymtd->owner = THIS_MODULE;
         add_mtd_partitions( mymtd, partition_info, NUM_PARTITIONS );
         return 0;
diff --git a/drivers/mtd/maps/nettel.c b/drivers/mtd/maps/nettel.c
index 61be5a4148c9..f00ee7e54dba 100644
--- a/drivers/mtd/maps/nettel.c
+++ b/drivers/mtd/maps/nettel.c
@@ -6,7 +6,7 @@
  *      (C) Copyright 2000-2001, Greg Ungerer (gerg@snapgear.com)
  *      (C) Copyright 2001-2002, SnapGear (www.snapgear.com)
  *
- *      $Id: nettel.c,v 1.10 2005/01/05 17:11:29 dwmw2 Exp $
+ *      $Id: nettel.c,v 1.11 2005/11/07 11:14:27 gleixner Exp $
  */
 
 /****************************************************************************/
@@ -143,7 +143,7 @@ static int nettel_reboot_notifier(struct notifier_block *nb, unsigned long val,
 {
         struct cfi_private *cfi = nettel_intel_map.fldrv_priv;
         unsigned long b;
-        
+
         /* Make sure all FLASH chips are put back into read mode */
         for (b = 0; (b < nettel_intel_partitions[3].size); b += 0x100000) {
                 cfi_send_gen_cmd(0xff, 0x55, b, &nettel_intel_map, cfi,
@@ -199,7 +199,7 @@ int nettel_eraseconfig(void)
 
                 schedule();  /* Wait for erase to finish. */
                 remove_wait_queue(&wait_q, &wait);
-                
+
                 put_mtd_device(mtd);
         }
 
@@ -430,7 +430,7 @@ int __init nettel_init(void)
                 nettel_intel_partitions[1].size = (intel0size + intel1size) -
                         (1024*1024 + intel_mtd->erasesize);
                 nettel_intel_partitions[3].size = intel0size + intel1size;
-                nettel_intel_partitions[4].offset = 
+                nettel_intel_partitions[4].offset =
                         (intel0size + intel1size) - intel_mtd->erasesize;
                 nettel_intel_partitions[4].size = intel_mtd->erasesize;
                 nettel_intel_partitions[5].offset =
diff --git a/drivers/mtd/maps/ocelot.c b/drivers/mtd/maps/ocelot.c
index 82c3070678c5..6977963d7897 100644
--- a/drivers/mtd/maps/ocelot.c
+++ b/drivers/mtd/maps/ocelot.c
@@ -1,5 +1,5 @@
 /*
- * $Id: ocelot.c,v 1.16 2005/01/05 18:05:13 dwmw2 Exp $
+ * $Id: ocelot.c,v 1.17 2005/11/07 11:14:27 gleixner Exp $
  *
  * Flash on Momenco Ocelot
  */
@@ -31,7 +31,7 @@ static void ocelot_ram_write(struct mtd_info *mtd, loff_t to, size_t len, size_t
         struct map_info *map = mtd->priv;
         size_t done = 0;
 
-        /* If we use memcpy, it does word-wide writes. Even though we told the 
+        /* If we use memcpy, it does word-wide writes. Even though we told the
            GT64120A that it's an 8-bit wide region, word-wide writes don't work.
            We end up just writing the first byte of the four to all four bytes.
            So we have this loop instead */
@@ -68,7 +68,7 @@ static int __init init_ocelot_maps(void)
         int nr_parts;
         unsigned char brd_status;
 
-        printk(KERN_INFO "Momenco Ocelot MTD mappings: Flash 0x%x at 0x%x, NVRAM 0x%x at 0x%x\n", 
+        printk(KERN_INFO "Momenco Ocelot MTD mappings: Flash 0x%x at 0x%x, NVRAM 0x%x at 0x%x\n",
                FLASH_WINDOW_SIZE, FLASH_WINDOW_ADDR, NVRAM_WINDOW_SIZE, NVRAM_WINDOW_ADDR);
 
         /* First check whether the flash jumper is present */
@@ -138,8 +138,8 @@ static int __init init_ocelot_maps(void)
                 add_mtd_device(flash_mtd);
 
         return 0;
-        
- fail3: 
+
+ fail3:
         iounmap((void *)ocelot_flash_map.virt);
         if (ocelot_flash_map.cached)
                         iounmap((void *)ocelot_flash_map.cached);
diff --git a/drivers/mtd/maps/octagon-5066.c b/drivers/mtd/maps/octagon-5066.c
index e5ff83de420e..a6642db3d325 100644
--- a/drivers/mtd/maps/octagon-5066.c
+++ b/drivers/mtd/maps/octagon-5066.c
@@ -1,12 +1,12 @@
-// $Id: octagon-5066.c,v 1.26 2004/07/12 22:38:29 dwmw2 Exp $
+// $Id: octagon-5066.c,v 1.28 2005/11/07 11:14:27 gleixner Exp $
 /* ######################################################################
 
-   Octagon 5066 MTD Driver. 
-  
+   Octagon 5066 MTD Driver.
+
    The Octagon 5066 is a SBC based on AMD's 586-WB running at 133 MHZ. It
    comes with a builtin AMD 29F016 flash chip and a socketed EEPROM that
    is replacable by flash. Both units are mapped through a multiplexer
-   into a 32k memory window at 0xe8000. The control register for the 
+   into a 32k memory window at 0xe8000. The control register for the
    multiplexing unit is located at IO 0x208 with a bit map of
      0-5 Page Selection in 32k increments
      6-7 Device selection:
@@ -14,14 +14,14 @@
         01 SSD 0 (Socket)
         10 SSD 1 (Flash chip)
         11 undefined
-  
+
    On each SSD, the first 128k is reserved for use by the bios
-   (actually it IS the bios..) This only matters if you are booting off the 
+   (actually it IS the bios..) This only matters if you are booting off the
    flash, you must not put a file system starting there.
-   
+
    The driver tries to do a detection algorithm to guess what sort of devices
    are plugged into the sockets.
-   
+
    ##################################################################### */
 
 #include <linux/module.h>
@@ -56,7 +56,7 @@ static void __oct5066_page(struct map_info *map, __u8 byte)
 static inline void oct5066_page(struct map_info *map, unsigned long ofs)
 {
         __u8 byte = map->map_priv_1 | (ofs >> WINDOW_SHIFT);
-        
+
         if (page_n_dev != byte)
                 __oct5066_page(map, byte);
 }
@@ -78,7 +78,7 @@ static void oct5066_copy_from(struct map_info *map, void *to, unsigned long from
                 unsigned long thislen = len;
                 if (len > (WINDOW_LENGTH - (from & WINDOW_MASK)))
                         thislen = WINDOW_LENGTH-(from & WINDOW_MASK);
-                
+
                 spin_lock(&oct5066_spin);
                 oct5066_page(map, from);
                 memcpy_fromio(to, iomapadr + from, thislen);
@@ -103,7 +103,7 @@ static void oct5066_copy_to(struct map_info *map, unsigned long to, const void *
                 unsigned long thislen = len;
                 if (len > (WINDOW_LENGTH - (to & WINDOW_MASK)))
                         thislen = WINDOW_LENGTH-(to & WINDOW_MASK);
-                
+
                 spin_lock(&oct5066_spin);
                 oct5066_page(map, to);
                 memcpy_toio(iomapadr + to, from, thislen);
@@ -144,7 +144,7 @@ static struct mtd_info *oct5066_mtd[2] = {NULL, NULL};
 // OctProbe - Sense if this is an octagon card
 // ---------------------------------------------------------------------
 /* Perform a simple validity test, we map the window select SSD0 and
-   change pages while monitoring the window. A change in the window, 
+   change pages while monitoring the window. A change in the window,
    controlled by the PAGE_IO port is a functioning 5066 board. This will
    fail if the thing in the socket is set to a uniform value. */
 static int __init OctProbe(void)
@@ -161,13 +161,13 @@ static int __init OctProbe(void)
          Values[I%10] = readl(iomapadr);
          if (I > 0 && Values[I%10] == Values[0])
             return -EAGAIN;
-      }      
+      }
       else
       {
          // Make sure we get the same values on the second pass
          if (Values[I%10] != readl(iomapadr))
             return -EAGAIN;
-      }      
+      }
    }
    return 0;
 }
@@ -207,11 +207,11 @@ int __init init_oct5066(void)
                 ret = -EAGAIN;
                 goto out_unmap;
         }
-        
+
         // Print out our little header..
         printk("Octagon 5066 SSD IO:0x%x MEM:0x%x-0x%x\n",PAGE_IO,WINDOW_START,
                WINDOW_START+WINDOW_LENGTH);
-        
+
         for (i=0; i<2; i++) {
                 oct5066_mtd[i] = do_map_probe("cfi_probe", &oct5066_map[i]);
                 if (!oct5066_mtd[i])
@@ -225,11 +225,11 @@ int __init init_oct5066(void)
                         add_mtd_device(oct5066_mtd[i]);
                 }
         }
-        
+
         if (!oct5066_mtd[0] && !oct5066_mtd[1]) {
                 cleanup_oct5066();
                 return -ENXIO;
-        }         
+        }
 
         return 0;
 
diff --git a/drivers/mtd/maps/omap-toto-flash.c b/drivers/mtd/maps/omap-toto-flash.c
index da36e8dddd17..dc3765270057 100644
--- a/drivers/mtd/maps/omap-toto-flash.c
+++ b/drivers/mtd/maps/omap-toto-flash.c
@@ -5,7 +5,7 @@
  *
  *  (C) 2002 MontVista Software, Inc.
  *
- * $Id: omap-toto-flash.c,v 1.3 2004/09/16 23:27:13 gleixner Exp $
+ * $Id: omap-toto-flash.c,v 1.5 2005/11/07 11:14:27 gleixner Exp $
  */
 
 #include <linux/config.h>
@@ -38,7 +38,7 @@ static struct map_info omap_toto_map_flash = {
         .virt =         (void __iomem *)OMAP_TOTO_FLASH_BASE,
 };
 
- 
+
 static struct mtd_partition toto_flash_partitions[] = {
         {
                 .name =         "BootLoader",
@@ -54,21 +54,21 @@ static struct mtd_partition toto_flash_partitions[] = {
                 .name =         "EnvArea",      /* bottom 64KiB for env vars */
                 .size =         MTDPART_SIZ_FULL,
                 .offset =       MTDPART_OFS_APPEND,
-        } 
+        }
 };
 
 static struct mtd_partition *parsed_parts;
 
 static struct mtd_info *flash_mtd;
- 
-static int __init init_flash (void)   
+
+static int __init init_flash (void)
 {
 
         struct mtd_partition *parts;
         int nb_parts = 0;
         int parsed_nr_parts = 0;
         const char *part_type;
- 
+
         /*
          * Static partition definition selection
          */
@@ -89,7 +89,7 @@ static int __init init_flash (void)
         flash_mtd = do_map_probe("jedec_probe", &omap_toto_map_flash);
         if (!flash_mtd)
                 return -ENXIO;
- 
+
         if (parsed_nr_parts > 0) {
                 parts = parsed_parts;
                 nb_parts = parsed_nr_parts;
@@ -108,8 +108,8 @@ static int __init init_flash (void)
         }
         return 0;
 }
- 
-int __init omap_toto_mtd_init(void)  
+
+int __init omap_toto_mtd_init(void)
 {
         int status;
 
@@ -119,13 +119,12 @@ int __init omap_toto_mtd_init(void)
     return status;
 }
 
-static void  __exit omap_toto_mtd_cleanup(void)  
+static void  __exit omap_toto_mtd_cleanup(void)
 {
         if (flash_mtd) {
                 del_mtd_partitions(flash_mtd);
                 map_destroy(flash_mtd);
-                if (parsed_parts)
-                        kfree(parsed_parts);
+                kfree(parsed_parts);
         }
 }
 
diff --git a/drivers/mtd/maps/omap_nor.c b/drivers/mtd/maps/omap_nor.c
index 7f370bb794fe..fd3b4a5fc207 100644
--- a/drivers/mtd/maps/omap_nor.c
+++ b/drivers/mtd/maps/omap_nor.c
@@ -3,7 +3,7 @@
  *
  * Copyright (C) 2001-2002 MontaVista Software Inc.
  * Copyright (C) 2003-2004 Texas Instruments
- * Copyright (C) 2004 Nokia Corporation 
+ * Copyright (C) 2004 Nokia Corporation
  *
  *      Assembled using driver code copyright the companies above
  *      and written by David Brownell, Jian Zhang <jzhang@ti.com>,
diff --git a/drivers/mtd/maps/pci.c b/drivers/mtd/maps/pci.c
index d9c64e99ee32..8b3570b09095 100644
--- a/drivers/mtd/maps/pci.c
+++ b/drivers/mtd/maps/pci.c
@@ -7,8 +7,8 @@
  * it under the terms of the GNU General Public License version 2 as
  * published by the Free Software Foundation.
  *
- *  $Id: pci.c,v 1.10 2005/03/18 14:04:35 gleixner Exp $
- * 
+ *  $Id: pci.c,v 1.13 2005/11/07 11:14:27 gleixner Exp $
+ *
  * Generic PCI memory map driver.  We support the following boards:
  *  - Intel IQ80310 ATU.
  *  - Intel EBSA285 (blank rom programming mode). Tested working 27/09/2001
@@ -38,7 +38,7 @@ struct map_pci_info {
         void (*exit)(struct pci_dev *dev, struct map_pci_info *map);
         unsigned long (*translate)(struct map_pci_info *map, unsigned long ofs);
         struct pci_dev *dev;
-};      
+};
 
 static map_word mtd_pci_read8(struct map_info *_map, unsigned long ofs)
 {
diff --git a/drivers/mtd/maps/pcmciamtd.c b/drivers/mtd/maps/pcmciamtd.c
index ff7c50d10180..af24216a0626 100644
--- a/drivers/mtd/maps/pcmciamtd.c
+++ b/drivers/mtd/maps/pcmciamtd.c
@@ -1,5 +1,5 @@
 /*
- * $Id: pcmciamtd.c,v 1.51 2004/07/12 22:38:29 dwmw2 Exp $
+ * $Id: pcmciamtd.c,v 1.55 2005/11/07 11:14:28 gleixner Exp $
  *
  * pcmciamtd.c - MTD driver for PCMCIA flash memory cards
  *
@@ -48,7 +48,7 @@ static const int debug = 0;
 
 
 #define DRIVER_DESC     "PCMCIA Flash memory card driver"
-#define DRIVER_VERSION  "$Revision: 1.51 $"
+#define DRIVER_VERSION  "$Revision: 1.55 $"
 
 /* Size of the PCMCIA address space: 26 bits = 64 MB */
 #define MAX_PCMCIA_ADDR 0x4000000
@@ -176,7 +176,7 @@ static void pcmcia_copy_from_remap(struct map_info *map, void *to, unsigned long
 
                 if(toread > len)
                         toread = len;
-                
+
                 addr = remap_window(map, from);
                 if(!addr)
                         return;
@@ -386,7 +386,7 @@ static void card_settings(struct pcmciamtd_dev *dev, dev_link_t *link, int *new_
                         cs_error(link->handle, ParseTuple, rc);
                         break;
                 }
-                
+
                 switch(tuple.TupleCode) {
                 case  CISTPL_FORMAT: {
                         cistpl_format_t *t = &parse.format;
@@ -394,9 +394,9 @@ static void card_settings(struct pcmciamtd_dev *dev, dev_link_t *link, int *new_
                         DEBUG(2, "Format type: %u, Error Detection: %u, offset = %u, length =%u",
                               t->type, t->edc, t->offset, t->length);
                         break;
-                        
+
                 }
-                        
+
                 case CISTPL_DEVICE: {
                         cistpl_device_t *t = &parse.device;
                         int i;
@@ -410,7 +410,7 @@ static void card_settings(struct pcmciamtd_dev *dev, dev_link_t *link, int *new_
                         }
                         break;
                 }
-                        
+
                 case CISTPL_VERS_1: {
                         cistpl_vers_1_t *t = &parse.version_1;
                         int i;
@@ -425,7 +425,7 @@ static void card_settings(struct pcmciamtd_dev *dev, dev_link_t *link, int *new_
                         DEBUG(2, "Found name: %s", dev->mtd_name);
                         break;
                 }
-                        
+
                 case CISTPL_JEDEC_C: {
                         cistpl_jedec_t *t = &parse.jedec;
                         int i;
@@ -434,7 +434,7 @@ static void card_settings(struct pcmciamtd_dev *dev, dev_link_t *link, int *new_
                         }
                         break;
                 }
-                        
+
                 case CISTPL_DEVICE_GEO: {
                         cistpl_device_geo_t *t = &parse.device_geo;
                         int i;
@@ -449,11 +449,11 @@ static void card_settings(struct pcmciamtd_dev *dev, dev_link_t *link, int *new_
                         }
                         break;
                 }
-                        
+
                 default:
                         DEBUG(2, "Unknown tuple code %d", tuple.TupleCode);
                 }
-                
+
                 rc = pcmcia_get_next_tuple(link->handle, &tuple);
         }
         if(!dev->pcmcia_map.size)
@@ -470,7 +470,7 @@ static void card_settings(struct pcmciamtd_dev *dev, dev_link_t *link, int *new_
         if(bankwidth) {
                 dev->pcmcia_map.bankwidth = bankwidth;
                 DEBUG(2, "bankwidth forced to %d", bankwidth);
-        }               
+        }
 
         dev->pcmcia_map.name = dev->mtd_name;
         if(!dev->mtd_name[0]) {
@@ -568,7 +568,7 @@ static void pcmciamtd_config(dev_link_t *link)
                 return;
         }
         DEBUG(1, "Allocated a window of %dKiB", dev->win_size >> 10);
-                
+
         /* Get write protect status */
         CS_CHECK(GetStatus, pcmcia_get_status(link->handle, &status));
         DEBUG(2, "status value: 0x%x window handle = 0x%8.8lx",
@@ -624,11 +624,11 @@ static void pcmciamtd_config(dev_link_t *link)
                         mtd = do_map_probe(probes[i], &dev->pcmcia_map);
                         if(mtd)
                                 break;
-                        
+
                         DEBUG(1, "FAILED: %s", probes[i]);
                 }
         }
-        
+
         if(!mtd) {
                 DEBUG(1, "Cant find an MTD");
                 pcmciamtd_release(link);
diff --git a/drivers/mtd/maps/physmap.c b/drivers/mtd/maps/physmap.c
index b853670bfb81..9ee760f97bc6 100644
--- a/drivers/mtd/maps/physmap.c
+++ b/drivers/mtd/maps/physmap.c
@@ -1,5 +1,5 @@
 /*
- * $Id: physmap.c,v 1.37 2004/11/28 09:40:40 dwmw2 Exp $
+ * $Id: physmap.c,v 1.38 2005/11/07 11:14:28 gleixner Exp $
  *
  * Normal mappings of chips in physical memory
  *
@@ -69,7 +69,7 @@ static int __init init_physmap(void)
                 mymtd->owner = THIS_MODULE;
 
 #ifdef CONFIG_MTD_PARTITIONS
-                mtd_parts_nb = parse_mtd_partitions(mymtd, part_probes, 
+                mtd_parts_nb = parse_mtd_partitions(mymtd, part_probes,
                                                     &mtd_parts, 0);
 
                 if (mtd_parts_nb > 0)
@@ -78,9 +78,9 @@ static int __init init_physmap(void)
                         return 0;
                 }
 
-                if (num_physmap_partitions != 0) 
+                if (num_physmap_partitions != 0)
                 {
-                        printk(KERN_NOTICE 
+                        printk(KERN_NOTICE
                                "Using physmap partition definition\n");
                         add_mtd_partitions (mymtd, physmap_partitions, num_physmap_partitions);
                         return 0;
diff --git a/drivers/mtd/maps/plat-ram.c b/drivers/mtd/maps/plat-ram.c
index 104576b5be34..a02eed94a231 100644
--- a/drivers/mtd/maps/plat-ram.c
+++ b/drivers/mtd/maps/plat-ram.c
@@ -6,7 +6,7 @@
  *
  * Generic platfrom device based RAM map
  *
- * $Id: plat-ram.c,v 1.3 2005/03/19 22:41:27 gleixner Exp $
+ * $Id: plat-ram.c,v 1.7 2005/11/07 11:14:28 gleixner Exp $
  *
  * 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
@@ -91,7 +91,7 @@ static int platram_remove(struct device *dev)
 
         dev_dbg(dev, "removing device\n");
 
-        if (info == NULL) 
+        if (info == NULL)
                 return 0;
 
         if (info->mtd) {
@@ -118,7 +118,7 @@ static int platram_remove(struct device *dev)
 
         if (info->map.virt != NULL)
                 iounmap(info->map.virt);
-        
+
         kfree(info);
 
         return 0;
@@ -139,7 +139,7 @@ static int platram_probe(struct device *dev)
         int err = 0;
 
         dev_dbg(dev, "probe entered\n");
-        
+
         if (dev->platform_data == NULL) {
                 dev_err(dev, "no platform data supplied\n");
                 err = -ENOENT;
@@ -177,7 +177,7 @@ static int platram_probe(struct device *dev)
 
         info->map.phys = res->start;
         info->map.size = (res->end - res->start) + 1;
-        info->map.name = pdata->mapname != NULL ? pdata->mapname : pd->name;
+        info->map.name = pdata->mapname != NULL ? pdata->mapname : (char *)pd->name;
         info->map.bankwidth = pdata->bankwidth;
 
         /* register our usage of the memory area */
@@ -240,7 +240,7 @@ static int platram_probe(struct device *dev)
                 dev_err(dev, "add_mtd_device() failed\n");
                 err = -ENOMEM;
         }
-        
+
         dev_info(dev, "registered mtd device\n");
         return err;
 
@@ -254,6 +254,7 @@ static int platram_probe(struct device *dev)
 
 static struct device_driver platram_driver = {
         .name           = "mtd-ram",
+        .owner          = THIS_MODULE,
         .bus            = &platform_bus_type,
         .probe          = platram_probe,
         .remove         = platram_remove,
diff --git a/drivers/mtd/maps/pnc2000.c b/drivers/mtd/maps/pnc2000.c
index a0f43dad8985..d7e16c2d5c44 100644
--- a/drivers/mtd/maps/pnc2000.c
+++ b/drivers/mtd/maps/pnc2000.c
@@ -5,7 +5,7 @@
  *
  * This code is GPL
  *
- * $Id: pnc2000.c,v 1.17 2004/11/16 18:29:02 dwmw2 Exp $
+ * $Id: pnc2000.c,v 1.18 2005/11/07 11:14:28 gleixner Exp $
  */
 
 #include <linux/module.h>
@@ -21,7 +21,7 @@
 #define WINDOW_ADDR 0xbf000000
 #define WINDOW_SIZE 0x00400000
 
-/* 
+/*
  * MAP DRIVER STUFF
  */
 
@@ -36,7 +36,7 @@ static struct map_info pnc_map = {
 
 
 /*
- * MTD 'PARTITIONING' STUFF 
+ * MTD 'PARTITIONING' STUFF
  */
 static struct mtd_partition pnc_partitions[3] = {
         {
@@ -56,7 +56,7 @@ static struct mtd_partition pnc_partitions[3] = {
         }
 };
 
-/* 
+/*
  * This is the master MTD device for which all the others are just
  * auto-relocating aliases.
  */
diff --git a/drivers/mtd/maps/pq2fads.c b/drivers/mtd/maps/pq2fads.c
new file mode 100644
index 000000000000..fb78d87cc130
--- /dev/null
+++ b/drivers/mtd/maps/pq2fads.c
@@ -0,0 +1,88 @@
+/*
+ * drivers/mtd/maps/pq2fads.c
+ *
+ * Mapping for the flash SIMM on 8272ADS and PQ2FADS board
+ *
+ * Author: Vitaly Bordug <vbordug@ru.mvista.com>
+ *
+ * 2005 (c) MontaVista Software, Inc. This file is licensed under
+ * the terms of the GNU General Public License version 2. This program
+ * is licensed "as is" without any warranty of any kind, whether express
+ * or implied.
+ */
+
+#include <linux/module.h>
+#include <linux/types.h>
+#include <linux/kernel.h>
+#include <linux/init.h>
+#include <asm/io.h>
+#include <asm/ppcboot.h>
+#include <linux/mtd/mtd.h>
+#include <linux/mtd/map.h>
+#include <linux/mtd/partitions.h>
+#include <linux/mtd/physmap.h>
+
+/*
+  NOTE: bank width and interleave relative to the installed flash
+  should have been chosen within MTD_CFI_GEOMETRY options.
+  */
+#define PQ2FADS_BANK_WIDTH 4
+
+static struct mtd_partition pq2fads_partitions[] = {
+        {
+#ifdef CONFIG_ADS8272
+                .name           = "HRCW",
+                .size           = 0x40000,
+                .offset         = 0,
+                .mask_flags     = MTD_WRITEABLE,  /* force read-only */
+        }, {
+                .name           = "User FS",
+                .size           = 0x5c0000,
+                .offset         = 0x40000,
+#else
+                .name           = "User FS",
+                .size           = 0x600000,
+                .offset         = 0,
+#endif
+        }, {
+                .name           = "uImage",
+                .size           = 0x100000,
+                .offset         = 0x600000,
+                .mask_flags     = MTD_WRITEABLE,  /* force read-only */
+        }, {
+                .name           = "bootloader",
+                .size           = 0x40000,
+                .offset         = 0x700000,
+                .mask_flags     = MTD_WRITEABLE,  /* force read-only */
+        }, {
+                .name           = "bootloader env",
+                .size           = 0x40000,
+                .offset         = 0x740000,
+                .mask_flags     = MTD_WRITEABLE,  /* force read-only */
+        }
+};
+
+
+/* pointer to MPC885ADS board info data */
+extern unsigned char __res[];
+
+static int __init init_pq2fads_mtd(void)
+{
+        bd_t *bd = (bd_t *)__res;
+        physmap_configure(bd->bi_flashstart, bd->bi_flashsize, PQ2FADS_BANK_WIDTH, NULL);
+
+        physmap_set_partitions(pq2fads_partitions,
+                                sizeof (pq2fads_partitions) /
+                                sizeof (pq2fads_partitions[0]));
+        return 0;
+}
+
+static void __exit cleanup_pq2fads_mtd(void)
+{
+}
+
+module_init(init_pq2fads_mtd);
+module_exit(cleanup_pq2fads_mtd);
+
+MODULE_LICENSE("GPL");
+MODULE_DESCRIPTION("MTD map and partitions for MPC8272ADS boards");
diff --git a/drivers/mtd/maps/redwood.c b/drivers/mtd/maps/redwood.c
index edd01ee4f90b..5b76ed886185 100644
--- a/drivers/mtd/maps/redwood.c
+++ b/drivers/mtd/maps/redwood.c
@@ -1,5 +1,5 @@
 /*
- * $Id: redwood.c,v 1.10 2004/11/04 13:24:15 gleixner Exp $
+ * $Id: redwood.c,v 1.11 2005/11/07 11:14:28 gleixner Exp $
  *
  * drivers/mtd/maps/redwood.c
  *
@@ -79,7 +79,7 @@ static struct mtd_partition redwood_flash_partitions[] = {
 
 #define RW_PART0_OF     0
 #define RW_PART0_SZ     0x400000        /* 4 MiB data */
-#define RW_PART1_OF     RW_PART0_OF + RW_PART0_SZ 
+#define RW_PART1_OF     RW_PART0_OF + RW_PART0_SZ
 #define RW_PART1_SZ     0x10000         /* 64K VPD */
 #define RW_PART2_OF     RW_PART1_OF + RW_PART1_SZ
 #define RW_PART2_SZ     0x400000 - (0x10000 + 0x20000)
diff --git a/drivers/mtd/maps/sa1100-flash.c b/drivers/mtd/maps/sa1100-flash.c
index c8d0da19d897..9e8bb1782be0 100644
--- a/drivers/mtd/maps/sa1100-flash.c
+++ b/drivers/mtd/maps/sa1100-flash.c
@@ -1,9 +1,9 @@
 /*
  * Flash memory access on SA11x0 based devices
- * 
+ *
  * (C) 2000 Nicolas Pitre <nico@cam.org>
- * 
- * $Id: sa1100-flash.c,v 1.47 2004/11/01 13:44:36 rmk Exp $
+ *
+ * $Id: sa1100-flash.c,v 1.51 2005/11/07 11:14:28 gleixner Exp $
  */
 #include <linux/config.h>
 #include <linux/module.h>
@@ -241,8 +241,7 @@ static void sa1100_destroy(struct sa_info *info, struct flash_platform_data *pla
 #endif
         }
 
-        if (info->parts)
-                kfree(info->parts);
+        kfree(info->parts);
 
         for (i = info->num_subdev - 1; i >= 0; i--)
                 sa1100_destroy_subdev(&info->subdev[i]);
diff --git a/drivers/mtd/maps/sbc8240.c b/drivers/mtd/maps/sbc8240.c
index da684d3384e9..225cdd9ba5b2 100644
--- a/drivers/mtd/maps/sbc8240.c
+++ b/drivers/mtd/maps/sbc8240.c
@@ -5,7 +5,7 @@
  *
  * This code is GPLed
  *
- * $Id: sbc8240.c,v 1.4 2004/07/12 22:38:29 dwmw2 Exp $
+ * $Id: sbc8240.c,v 1.5 2005/11/07 11:14:28 gleixner Exp $
  *
  */
 
@@ -205,7 +205,7 @@ int __init init_sbc8240_mtd (void)
                 } else {
                         printk (KERN_NOTICE MSG_PREFIX
                                 "Using %s partition definition\n", sbc8240_part_banks[i].mtd_part->name);
-                        add_mtd_partitions (sbc8240_mtd[i], 
+                        add_mtd_partitions (sbc8240_mtd[i],
                                             sbc8240_part_banks[i].mtd_part,
                                             sbc8240_part_banks[i].nums);
                 }
diff --git a/drivers/mtd/maps/sbc_gxx.c b/drivers/mtd/maps/sbc_gxx.c
index 65add28bde14..7cc4041d096d 100644
--- a/drivers/mtd/maps/sbc_gxx.c
+++ b/drivers/mtd/maps/sbc_gxx.c
@@ -1,35 +1,35 @@
 /* sbc_gxx.c -- MTD map driver for Arcom Control Systems SBC-MediaGX,
                 SBC-GXm and SBC-GX1 series boards.
- 
+
    Copyright (C) 2001 Arcom Control System Ltd
- 
+
    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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
 
-   $Id: sbc_gxx.c,v 1.33 2004/11/28 09:40:40 dwmw2 Exp $
+   $Id: sbc_gxx.c,v 1.35 2005/11/07 11:14:28 gleixner Exp $
 
-The SBC-MediaGX / SBC-GXx has up to 16 MiB of 
-Intel StrataFlash (28F320/28F640) in x8 mode.  
+The SBC-MediaGX / SBC-GXx has up to 16 MiB of
+Intel StrataFlash (28F320/28F640) in x8 mode.
 
 This driver uses the CFI probe and Intel Extended Command Set drivers.
 
 The flash is accessed as follows:
 
    16 KiB memory window at 0xdc000-0xdffff
-   
+
    Two IO address locations for paging
-   
+
    0x258
        bit 0-7: address bit 14-21
    0x259
@@ -37,7 +37,7 @@ The flash is accessed as follows:
        bit 7:   0 - reset/powered down
                 1 - device enabled
 
-The single flash device is divided into 3 partition which appear as 
+The single flash device is divided into 3 partition which appear as
 separate MTD devices.
 
 25/04/2001 AJL (Arcom)  Modified signon strings and partition sizes
@@ -87,17 +87,17 @@ static volatile int page_in_window = -1; // Current page in window.
 static void __iomem *iomapadr;
 static DEFINE_SPINLOCK(sbc_gxx_spin);
 
-/* partition_info gives details on the logical partitions that the split the 
+/* partition_info gives details on the logical partitions that the split the
  * single flash device into. If the size if zero we use up to the end of the
  * device. */
 static struct mtd_partition partition_info[]={
-    { .name = "SBC-GXx flash boot partition", 
-      .offset = 0, 
+    { .name = "SBC-GXx flash boot partition",
+      .offset = 0,
       .size =   BOOT_PARTITION_SIZE_KiB*1024 },
-    { .name = "SBC-GXx flash data partition", 
-      .offset = BOOT_PARTITION_SIZE_KiB*1024, 
+    { .name = "SBC-GXx flash data partition",
+      .offset = BOOT_PARTITION_SIZE_KiB*1024,
       .size = (DATA_PARTITION_SIZE_KiB)*1024 },
-    { .name = "SBC-GXx flash application partition", 
+    { .name = "SBC-GXx flash application partition",
       .offset = (BOOT_PARTITION_SIZE_KiB+DATA_PARTITION_SIZE_KiB)*1024 }
 };
 
@@ -130,7 +130,7 @@ static void sbc_gxx_copy_from(struct map_info *map, void *to, unsigned long from
                 unsigned long thislen = len;
                 if (len > (WINDOW_LENGTH - (from & WINDOW_MASK)))
                         thislen = WINDOW_LENGTH-(from & WINDOW_MASK);
-                
+
                 spin_lock(&sbc_gxx_spin);
                 sbc_gxx_page(map, from);
                 memcpy_fromio(to, iomapadr + (from & WINDOW_MASK), thislen);
@@ -150,12 +150,12 @@ static void sbc_gxx_write8(struct map_info *map, map_word d, unsigned long adr)
 }
 
 static void sbc_gxx_copy_to(struct map_info *map, unsigned long to, const void *from, ssize_t len)
-{       
+{
         while(len) {
                 unsigned long thislen = len;
                 if (len > (WINDOW_LENGTH - (to & WINDOW_MASK)))
                         thislen = WINDOW_LENGTH-(to & WINDOW_MASK);
-                
+
                 spin_lock(&sbc_gxx_spin);
                 sbc_gxx_page(map, to);
                 memcpy_toio(iomapadr + (to & WINDOW_MASK), from, thislen);
@@ -201,7 +201,7 @@ static int __init init_sbc_gxx(void)
                         sbc_gxx_map.name );
                 return -EIO;
         }
-        
+
         if (!request_region( PAGE_IO, PAGE_IO_SIZE, "SBC-GXx flash")) {
                 printk( KERN_ERR"%s: IO ports 0x%x-0x%x in use\n",
                         sbc_gxx_map.name,
@@ -209,8 +209,8 @@ static int __init init_sbc_gxx(void)
                 iounmap(iomapadr);
                 return -EAGAIN;
         }
-                
-        
+
+
         printk( KERN_INFO"%s: IO:0x%x-0x%x MEM:0x%x-0x%x\n",
                 sbc_gxx_map.name,
                 PAGE_IO, PAGE_IO+PAGE_IO_SIZE-1,
@@ -222,7 +222,7 @@ static int __init init_sbc_gxx(void)
                 cleanup_sbc_gxx();
                 return -ENXIO;
         }
-        
+
         all_mtd->owner = THIS_MODULE;
 
         /* Create MTD devices for each partition. */
diff --git a/drivers/mtd/maps/sc520cdp.c b/drivers/mtd/maps/sc520cdp.c
index a06ed21e7ed1..6fb9f3c57aab 100644
--- a/drivers/mtd/maps/sc520cdp.c
+++ b/drivers/mtd/maps/sc520cdp.c
@@ -16,7 +16,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
  *
- * $Id: sc520cdp.c,v 1.21 2004/12/13 10:27:08 dedekind Exp $
+ * $Id: sc520cdp.c,v 1.22 2005/11/07 11:14:28 gleixner Exp $
  *
  *
  * The SC520CDP is an evaluation board for the Elan SC520 processor available
@@ -231,7 +231,7 @@ static void sc520cdp_setup_par(void)
 static int __init init_sc520cdp(void)
 {
         int i, devices_found = 0;
-        
+
 #ifdef REPROGRAM_PAR
         /* reprogram PAR registers so flash appears at the desired addresses */
         sc520cdp_setup_par();
@@ -278,7 +278,7 @@ static int __init init_sc520cdp(void)
 static void __exit cleanup_sc520cdp(void)
 {
         int i;
-        
+
         if (merged_mtd) {
                 del_mtd_device(merged_mtd);
                 mtd_concat_destroy(merged_mtd);
diff --git a/drivers/mtd/maps/scx200_docflash.c b/drivers/mtd/maps/scx200_docflash.c
index 0ece3786d6ea..2c91dff8bb60 100644
--- a/drivers/mtd/maps/scx200_docflash.c
+++ b/drivers/mtd/maps/scx200_docflash.c
@@ -1,8 +1,8 @@
-/* linux/drivers/mtd/maps/scx200_docflash.c 
+/* linux/drivers/mtd/maps/scx200_docflash.c
 
    Copyright (c) 2001,2002 Christer Weinigel <wingel@nano-system.com>
 
-   $Id: scx200_docflash.c,v 1.10 2004/11/28 09:40:40 dwmw2 Exp $ 
+   $Id: scx200_docflash.c,v 1.12 2005/11/07 11:14:28 gleixner Exp $
 
    National Semiconductor SCx200 flash mapped with DOCCS
 */
@@ -49,23 +49,23 @@ static struct mtd_info *mymtd;
 
 #ifdef CONFIG_MTD_PARTITIONS
 static struct mtd_partition partition_info[] = {
-        { 
-                .name   = "DOCCS Boot kernel", 
-                .offset = 0, 
+        {
+                .name   = "DOCCS Boot kernel",
+                .offset = 0,
                 .size   = 0xc0000
         },
-        { 
-                .name   = "DOCCS Low BIOS", 
-                .offset = 0xc0000, 
+        {
+                .name   = "DOCCS Low BIOS",
+                .offset = 0xc0000,
                 .size   = 0x40000
         },
-        { 
-                .name   = "DOCCS File system", 
-                .offset = 0x100000, 
+        {
+                .name   = "DOCCS File system",
+                .offset = 0x100000,
                 .size   = ~0    /* calculate from flash size */
         },
-        { 
-                .name   = "DOCCS High BIOS", 
+        {
+                .name   = "DOCCS High BIOS",
                 .offset = ~0,   /* calculate from flash size */
                 .size   = 0x80000
         },
@@ -88,7 +88,7 @@ static int __init init_scx200_docflash(void)
 
         printk(KERN_DEBUG NAME ": NatSemi SCx200 DOCCS Flash Driver\n");
 
-        if ((bridge = pci_find_device(PCI_VENDOR_ID_NS, 
+        if ((bridge = pci_find_device(PCI_VENDOR_ID_NS,
                                       PCI_DEVICE_ID_NS_SCx200_BRIDGE,
                                       NULL)) == NULL)
                 return -ENODEV;
@@ -134,28 +134,28 @@ static int __init init_scx200_docflash(void)
                         printk(KERN_ERR NAME ": invalid size for flash mapping\n");
                         return -EINVAL;
                 }
-                
+
                 if (width != 8 && width != 16) {
                         printk(KERN_ERR NAME ": invalid bus width for flash mapping\n");
                         return -EINVAL;
                 }
-                
-                if (allocate_resource(&iomem_resource, &docmem, 
+
+                if (allocate_resource(&iomem_resource, &docmem,
                                       size,
-                                      0xc0000000, 0xffffffff, 
+                                      0xc0000000, 0xffffffff,
                                       size, NULL, NULL)) {
                         printk(KERN_ERR NAME ": unable to allocate memory for flash mapping\n");
                         return -ENOMEM;
                 }
-                
+
                 ctrl = 0x07000000 | ((size-1) >> 13);
 
                 printk(KERN_INFO "DOCCS BASE=0x%08lx, CTRL=0x%08lx\n", (long)docmem.start, (long)ctrl);
-                
+
                 pci_write_config_dword(bridge, SCx200_DOCCS_BASE, docmem.start);
                 pci_write_config_dword(bridge, SCx200_DOCCS_CTRL, ctrl);
                 pmr = inl(scx200_cb_base + SCx200_PMR);
-                
+
                 if (width == 8) {
                         pmr &= ~(1<<6);
                 } else {
@@ -163,8 +163,8 @@ static int __init init_scx200_docflash(void)
                 }
                 outl(pmr, scx200_cb_base + SCx200_PMR);
         }
-        
-        printk(KERN_INFO NAME ": DOCCS mapped at 0x%lx-0x%lx, width %d\n", 
+
+        printk(KERN_INFO NAME ": DOCCS mapped at 0x%lx-0x%lx, width %d\n",
                docmem.start, docmem.end, width);
 
         scx200_docflash_map.size = size;
diff --git a/drivers/mtd/maps/sharpsl-flash.c b/drivers/mtd/maps/sharpsl-flash.c
index b7f093fbf9b0..999f4bb3d845 100644
--- a/drivers/mtd/maps/sharpsl-flash.c
+++ b/drivers/mtd/maps/sharpsl-flash.c
@@ -1,10 +1,10 @@
 /*
  * sharpsl-flash.c
- * 
+ *
  * Copyright (C) 2001 Lineo Japan, Inc.
  * Copyright (C) 2002  SHARP
  *
- * $Id: sharpsl-flash.c,v 1.5 2005/03/21 08:42:11 rpurdie Exp $
+ * $Id: sharpsl-flash.c,v 1.7 2005/11/07 11:14:28 gleixner Exp $
  *
  * based on rpxlite.c,v 1.15 2001/10/02 15:05:14 dwmw2 Exp
  *          Handle mapping of the flash on the RPX Lite and CLLF boards
@@ -57,7 +57,7 @@ int __init init_sharpsl(void)
         int nb_parts = 0;
         char *part_type = "static";
 
-        printk(KERN_NOTICE "Sharp SL series flash device: %x at %x\n", 
+        printk(KERN_NOTICE "Sharp SL series flash device: %x at %x\n",
                 WINDOW_SIZE, WINDOW_ADDR);
         sharpsl_map.virt = ioremap(WINDOW_ADDR, WINDOW_SIZE);
         if (!sharpsl_map.virt) {
@@ -75,7 +75,7 @@ int __init init_sharpsl(void)
 
         mymtd->owner = THIS_MODULE;
 
-        if (machine_is_corgi() || machine_is_shepherd() || machine_is_husky() 
+        if (machine_is_corgi() || machine_is_shepherd() || machine_is_husky()
                 || machine_is_poodle()) {
                 sharpsl_partitions[0].size=0x006d0000;
                 sharpsl_partitions[0].offset=0x00120000;
@@ -87,10 +87,10 @@ int __init init_sharpsl(void)
                 sharpsl_partitions[0].offset=0x00140000;
         } else {
                 map_destroy(mymtd);
-                iounmap(sharpsl_map.virt);      
+                iounmap(sharpsl_map.virt);
                 return -ENODEV;
         }
-        
+
         parts = sharpsl_partitions;
         nb_parts = NB_OF(sharpsl_partitions);
 
diff --git a/drivers/mtd/maps/solutionengine.c b/drivers/mtd/maps/solutionengine.c
index 8ce5d897645c..c53c2c369c9d 100644
--- a/drivers/mtd/maps/solutionengine.c
+++ b/drivers/mtd/maps/solutionengine.c
@@ -1,5 +1,5 @@
 /*
- * $Id: solutionengine.c,v 1.14 2004/09/16 23:27:14 gleixner Exp $
+ * $Id: solutionengine.c,v 1.15 2005/11/07 11:14:28 gleixner Exp $
  *
  * Flash and EPROM on Hitachi Solution Engine and similar boards.
  *
@@ -67,7 +67,7 @@ static int __init init_soleng_maps(void)
         soleng_eprom_map.virt = (void __iomem *)P1SEGADDR(0x01000000);
         simple_map_init(&soleng_eprom_map);
         simple_map_init(&soleng_flash_map);
-        
+
         printk(KERN_NOTICE "Probing for flash chips at 0x00000000:\n");
         flash_mtd = do_map_probe("cfi_probe", &soleng_flash_map);
         if (!flash_mtd) {
diff --git a/drivers/mtd/maps/sun_uflash.c b/drivers/mtd/maps/sun_uflash.c
index 29091d10030a..0758cb1d0105 100644
--- a/drivers/mtd/maps/sun_uflash.c
+++ b/drivers/mtd/maps/sun_uflash.c
@@ -1,4 +1,4 @@
-/* $Id: sun_uflash.c,v 1.11 2004/11/04 13:24:15 gleixner Exp $
+/* $Id: sun_uflash.c,v 1.13 2005/11/07 11:14:28 gleixner Exp $
  *
  * sun_uflash - Driver implementation for user-programmable flash
  * present on many Sun Microsystems SME boardsets.
@@ -63,7 +63,7 @@ int uflash_devinit(struct linux_ebus_device* edev)
         iTmp = prom_getproperty(
                 edev->prom_node, "reg", (void *)regs, sizeof(regs));
         if ((iTmp % sizeof(regs[0])) != 0) {
-                printk("%s: Strange reg property size %d\n", 
+                printk("%s: Strange reg property size %d\n",
                         UFLASH_DEVNAME, iTmp);
                 return -ENODEV;
         }
@@ -75,7 +75,7 @@ int uflash_devinit(struct linux_ebus_device* edev)
                  * can work on supporting it.
                  */
                 printk("%s: unsupported device at 0x%lx (%d regs): " \
-                        "email ebrower@usa.net\n", 
+                        "email ebrower@usa.net\n",
                         UFLASH_DEVNAME, edev->resource[0].start, nregs);
                 return -ENODEV;
         }
@@ -84,7 +84,7 @@ int uflash_devinit(struct linux_ebus_device* edev)
                 printk("%s: unable to kmalloc new device\n", UFLASH_DEVNAME);
                 return(-ENOMEM);
         }
-        
+
         /* copy defaults and tweak parameters */
         memcpy(&pdev->map, &uflash_map_templ, sizeof(uflash_map_templ));
         pdev->map.size = regs[0].reg_size;
@@ -155,7 +155,7 @@ static void __exit uflash_cleanup(void)
 
         list_for_each(udevlist, &device_list) {
                 udev = list_entry(udevlist, struct uflash_dev, list);
-                DEBUG(2, "%s: removing device %s\n", 
+                DEBUG(2, "%s: removing device %s\n",
                         UFLASH_DEVNAME, udev->name);
 
                 if(0 != udev->mtd) {
@@ -166,11 +166,9 @@ static void __exit uflash_cleanup(void)
                         iounmap(udev->map.virt);
                         udev->map.virt = NULL;
                 }
-                if(0 != udev->name) {
-                        kfree(udev->name);
-                }
+                kfree(udev->name);
                 kfree(udev);
-        }       
+        }
 }
 
 module_init(uflash_init);
diff --git a/drivers/mtd/maps/tqm834x.c b/drivers/mtd/maps/tqm834x.c
new file mode 100644
index 000000000000..c7ae9a515c1a
--- /dev/null
+++ b/drivers/mtd/maps/tqm834x.c
@@ -0,0 +1,291 @@
+/*
+ * drivers/mtd/maps/tqm834x.c
+ *
+ * MTD mapping driver for TQM834x boards
+ *
+ * Copyright 2005 Wolfgang Denk, DENX Software Engineering, <wd@denx.de>.
+ *
+ * This file is licensed under the terms of the GNU General Public License
+ * version 2.  This program is licensed "as is" without any warranty of any
+ * kind, whether express or implied.
+ *
+ */
+
+#include <linux/config.h>
+#include <linux/init.h>
+#include <linux/module.h>
+#include <linux/types.h>
+#include <linux/kernel.h>
+#include <linux/slab.h>
+#include <asm/io.h>
+#include <asm/ppcboot.h>
+
+#include <linux/mtd/mtd.h>
+#include <linux/mtd/map.h>
+#include <linux/mtd/partitions.h>
+
+#define FLASH_BANK_MAX  2
+
+extern unsigned char __res[];
+
+/* trivial struct to describe partition information */
+struct mtd_part_def
+{
+        int nums;
+        unsigned char *type;
+        struct mtd_partition* mtd_part;
+};
+
+static struct mtd_info* mtd_banks[FLASH_BANK_MAX];
+static struct map_info* map_banks[FLASH_BANK_MAX];
+static struct mtd_part_def part_banks[FLASH_BANK_MAX];
+
+static unsigned long num_banks;
+static unsigned long start_scan_addr;
+
+#ifdef CONFIG_MTD_PARTITIONS
+/*
+ * The following defines the partition layout of TQM834x boards.
+ *
+ * See include/linux/mtd/partitions.h for definition of the
+ * mtd_partition structure.
+ *
+ * Assume minimal initial size of 4 MiB per bank, will be updated
+ * later in init_tqm834x_mtd() routine.
+ */
+
+/* Partition definition for the first flash bank which is always present. */
+static struct mtd_partition tqm834x_partitions_bank1[] = {
+        {
+                .name   = "u-boot",             /* u-boot firmware      */
+                .offset = 0x00000000,
+                .size   = 0x00040000,           /* 256 KiB              */
+                /*mask_flags: MTD_WRITEABLE,     * force read-only      */
+        },
+        {
+                .name   = "env",                /* u-boot environment   */
+                .offset = 0x00040000,
+                .size   = 0x00020000,           /* 128 KiB              */
+                /*mask_flags: MTD_WRITEABLE,     * force read-only      */
+        },
+        {
+                .name   = "kernel",             /* linux kernel image   */
+                .offset = 0x00060000,
+                .size   = 0x00100000,           /* 1 MiB                */
+                /*mask_flags: MTD_WRITEABLE,     * force read-only      */
+        },
+        {
+                .name   = "initrd",             /* ramdisk image        */
+                .offset = 0x00160000,
+                .size   = 0x00200000,           /* 2 MiB                */
+        },
+        {
+                .name   = "user",               /* user data            */
+                .offset = 0x00360000,
+                .size   = 0x000a0000,           /* remaining space      */
+                /* NOTE: this parttion size is re-calcated in           */
+                /* init_tqm834x_mtd() to cover actual remaining space.  */
+        },
+};
+
+/* Partition definition for the second flash bank which may be present on some
+ * TQM834x boards.
+ */
+static struct mtd_partition tqm834x_partitions_bank2[] = {
+        {
+                .name   = "jffs2",              /* jffs2 filesystem     */
+                .offset = 0x00000000,
+                .size   = 0x00400000,           /* whole device         */
+                /* NOTE: this parttion size is re-calcated in           */
+                /* init_tqm834x_mtd() to cover actual device size.      */
+        },
+};
+
+#endif  /* CONFIG_MTD_PARTITIONS */
+
+static int __init init_tqm834x_mtd(void)
+{
+        int idx = 0, ret = 0;
+        unsigned long flash_addr, flash_size, mtd_size = 0;
+
+        /* pointer to TQM834x board info data */
+        bd_t *bd = (bd_t *)__res;
+#ifdef CONFIG_MTD_CMDLINE_PARTS
+        int n;
+        char mtdid[4];
+        const char *part_probes[] = { "cmdlinepart", NULL };
+#endif
+
+        flash_addr = bd->bi_flashstart;
+        flash_size = bd->bi_flashsize;
+
+        /* request maximum flash size address space */
+        start_scan_addr = (unsigned long)ioremap(flash_addr, flash_size);
+        if (!start_scan_addr) {
+                printk("%s: Failed to ioremap address: 0x%lx\n",
+                       __FUNCTION__, flash_addr);
+                return -EIO;
+        }
+
+        for(idx = 0 ; idx < FLASH_BANK_MAX ; idx++) {
+                if (mtd_size >= flash_size)
+                        break;
+
+                pr_debug("%s: chip probing count %d\n", __FUNCTION__, idx);
+
+                map_banks[idx] =
+                        (struct map_info *)kmalloc(sizeof(struct map_info),
+                                                   GFP_KERNEL);
+                if (map_banks[idx] == NULL) {
+                        ret = -ENOMEM;
+                        goto error_mem;
+                }
+                memset((void *)map_banks[idx], 0, sizeof(struct map_info));
+                map_banks[idx]->name = (char *)kmalloc(16, GFP_KERNEL);
+                if (map_banks[idx]->name == NULL) {
+                        ret = -ENOMEM;
+                        goto error_mem;
+                }
+                memset((void *)map_banks[idx]->name, 0, 16);
+
+                sprintf(map_banks[idx]->name, "TQM834x-%d", idx);
+                map_banks[idx]->size = flash_size;
+                map_banks[idx]->bankwidth = 4;
+
+                simple_map_init(map_banks[idx]);
+
+                map_banks[idx]->virt = (void __iomem *)
+                        (start_scan_addr + ((idx > 0) ?
+                        (mtd_banks[idx-1] ? mtd_banks[idx-1]->size : 0) : 0));
+                map_banks[idx]->phys =
+                        flash_addr + ((idx > 0) ?
+                        (mtd_banks[idx-1] ? mtd_banks[idx-1]->size : 0) : 0);
+
+                /* start to probe flash chips */
+                mtd_banks[idx] = do_map_probe("cfi_probe", map_banks[idx]);
+                if (mtd_banks[idx]) {
+                        mtd_banks[idx]->owner = THIS_MODULE;
+                        mtd_size += mtd_banks[idx]->size;
+                        num_banks++;
+                        pr_debug("%s: bank %ld, name: %s, size: %d bytes \n",
+                                 __FUNCTION__, num_banks,
+                                 mtd_banks[idx]->name, mtd_banks[idx]->size);
+                }
+        }
+
+        /* no supported flash chips found */
+        if (!num_banks) {
+                printk("TQM834x: No supported flash chips found!\n");
+                ret = -ENXIO;
+                goto error_mem;
+        }
+
+#ifdef CONFIG_MTD_PARTITIONS
+        /*
+         * Select static partition definitions
+         */
+        n = ARRAY_SIZE(tqm834x_partitions_bank1);
+        part_banks[0].mtd_part  = tqm834x_partitions_bank1;
+        part_banks[0].type      = "static image bank1";
+        part_banks[0].nums      = n;
+
+        /* update last partition size to cover actual remaining space */
+        tqm834x_partitions_bank1[n - 1].size =
+                mtd_banks[0]->size -
+                tqm834x_partitions_bank1[n - 1].offset;
+
+        /* check if we have second bank? */
+        if (num_banks == 2) {
+                n = ARRAY_SIZE(tqm834x_partitions_bank2);
+                part_banks[1].mtd_part  = tqm834x_partitions_bank2;
+                part_banks[1].type      = "static image bank2";
+                part_banks[1].nums      = n;
+
+                /* update last partition size to cover actual remaining space */
+                tqm834x_partitions_bank2[n - 1].size =
+                        mtd_banks[1]->size -
+                        tqm834x_partitions_bank2[n - 1].offset;
+        }
+
+        for(idx = 0; idx < num_banks ; idx++) {
+#ifdef CONFIG_MTD_CMDLINE_PARTS
+                sprintf(mtdid, "%d", idx);
+                n = parse_mtd_partitions(mtd_banks[idx],
+                                         part_probes,
+                                         &part_banks[idx].mtd_part,
+                                         0);
+                pr_debug("%s: %d command line partitions on bank %s\n",
+                         __FUNCTION__, n, mtdid);
+                if (n > 0) {
+                        part_banks[idx].type = "command line";
+                        part_banks[idx].nums = n;
+                }
+#endif  /* CONFIG_MTD_CMDLINE_PARTS */
+                if (part_banks[idx].nums == 0) {
+                        printk(KERN_NOTICE
+                               "TQM834x flash bank %d: no partition info "
+                               "available, registering whole device\n", idx);
+                        add_mtd_device(mtd_banks[idx]);
+                } else {
+                        printk(KERN_NOTICE
+                               "TQM834x flash bank %d: Using %s partition "
+                               "definition\n", idx, part_banks[idx].type);
+                        add_mtd_partitions(mtd_banks[idx],
+                                           part_banks[idx].mtd_part,
+                                           part_banks[idx].nums);
+                }
+        }
+#else   /* ! CONFIG_MTD_PARTITIONS */
+        printk(KERN_NOTICE "TQM834x flash: registering %d flash banks "
+                        "at once\n", num_banks);
+
+        for(idx = 0 ; idx < num_banks ; idx++)
+                add_mtd_device(mtd_banks[idx]);
+
+#endif  /* CONFIG_MTD_PARTITIONS */
+
+        return 0;
+error_mem:
+        for (idx = 0 ; idx < FLASH_BANK_MAX ; idx++) {
+                if (map_banks[idx] != NULL) {
+                        if (map_banks[idx]->name != NULL) {
+                                kfree(map_banks[idx]->name);
+                                map_banks[idx]->name = NULL;
+                        }
+                        kfree(map_banks[idx]);
+                        map_banks[idx] = NULL;
+                }
+        }
+
+        iounmap((void *)start_scan_addr);
+
+        return ret;
+}
+
+static void __exit cleanup_tqm834x_mtd(void)
+{
+        unsigned int idx = 0;
+        for(idx = 0 ; idx < num_banks ; idx++) {
+                /* destroy mtd_info previously allocated */
+                if (mtd_banks[idx]) {
+                        del_mtd_partitions(mtd_banks[idx]);
+                        map_destroy(mtd_banks[idx]);
+                }
+
+                /* release map_info not used anymore */
+                kfree(map_banks[idx]->name);
+                kfree(map_banks[idx]);
+        }
+
+        if (start_scan_addr) {
+                iounmap((void *)start_scan_addr);
+                start_scan_addr = 0;
+        }
+}
+
+module_init(init_tqm834x_mtd);
+module_exit(cleanup_tqm834x_mtd);
+
+MODULE_LICENSE("GPL");
+MODULE_AUTHOR("Wolfgang Denk <wd@denx.de>");
+MODULE_DESCRIPTION("MTD map driver for TQM834x boards");
diff --git a/drivers/mtd/maps/tqm8xxl.c b/drivers/mtd/maps/tqm8xxl.c
index 4e28b977f224..a43517053e7c 100644
--- a/drivers/mtd/maps/tqm8xxl.c
+++ b/drivers/mtd/maps/tqm8xxl.c
@@ -1,15 +1,15 @@
 /*
- * Handle mapping of the flash memory access routines 
+ * Handle mapping of the flash memory access routines
  * on TQM8xxL based devices.
  *
- * $Id: tqm8xxl.c,v 1.13 2004/10/20 22:21:53 dwmw2 Exp $
+ * $Id: tqm8xxl.c,v 1.15 2005/11/07 11:14:28 gleixner Exp $
  *
  * based on rpxlite.c
  *
  * Copyright(C) 2001 Kirk Lee <kirk@hpc.ee.ntu.edu.tw>
  *
  * This code is GPLed
- * 
+ *
  */
 
 /*
@@ -19,7 +19,7 @@
  *          2MiB           512Kx16        2MiB             0
  *          4MiB           1Mx16          4MiB             0
  *          8MiB           1Mx16          4MiB             4MiB
- * Thus, we choose CONFIG_MTD_CFI_I2 & CONFIG_MTD_CFI_B4 at 
+ * Thus, we choose CONFIG_MTD_CFI_I2 & CONFIG_MTD_CFI_B4 at
  * kernel configuration.
  */
 #include <linux/config.h>
@@ -58,9 +58,9 @@ static void __iomem *start_scan_addr;
  * Here are partition information for all known TQM8xxL series devices.
  * See include/linux/mtd/partitions.h for definition of the mtd_partition
  * structure.
- * 
+ *
  * The *_max_flash_size is the maximum possible mapped flash size which
- * is not necessarily the actual flash size.  It must correspond to the 
+ * is not necessarily the actual flash size.  It must correspond to the
  * value specified in the mapping definition defined by the
  * "struct map_desc *_io_desc" for the corresponding machine.
  */
@@ -132,9 +132,9 @@ int __init init_tqm_mtd(void)
         for (idx = 0 ; idx < FLASH_BANK_MAX ; idx++) {
                 if(mtd_size >= flash_size)
                         break;
-                
+
                 printk(KERN_INFO "%s: chip probing count %d\n", __FUNCTION__, idx);
-                
+
                 map_banks[idx] = (struct map_info *)kmalloc(sizeof(struct map_info), GFP_KERNEL);
                 if(map_banks[idx] == NULL) {
                         ret = -ENOMEM;
@@ -180,7 +180,7 @@ int __init init_tqm_mtd(void)
                         mtd_size += mtd_banks[idx]->size;
                         num_banks++;
 
-                        printk(KERN_INFO "%s: bank%d, name:%s, size:%dbytes \n", __FUNCTION__, num_banks, 
+                        printk(KERN_INFO "%s: bank%d, name:%s, size:%dbytes \n", __FUNCTION__, num_banks,
                         mtd_banks[idx]->name, mtd_banks[idx]->size);
                 }
         }
@@ -211,7 +211,7 @@ int __init init_tqm_mtd(void)
                 } else {
                         printk(KERN_NOTICE "TQM flash%d: Using %s partition definition\n",
                                         idx, part_banks[idx].type);
-                        add_mtd_partitions(mtd_banks[idx], part_banks[idx].mtd_part, 
+                        add_mtd_partitions(mtd_banks[idx], part_banks[idx].mtd_part,
                                                                 part_banks[idx].nums);
                 }
         }
@@ -224,10 +224,8 @@ int __init init_tqm_mtd(void)
 error_mem:
         for(idx = 0 ; idx < FLASH_BANK_MAX ; idx++) {
                 if(map_banks[idx] != NULL) {
-                        if(map_banks[idx]->name != NULL) {
-                                kfree(map_banks[idx]->name);
-                                map_banks[idx]->name = NULL;
-                        }
+                        kfree(map_banks[idx]->name);
+                        map_banks[idx]->name = NULL;
                         kfree(map_banks[idx]);
                         map_banks[idx] = NULL;
                 }
diff --git a/drivers/mtd/maps/ts5500_flash.c b/drivers/mtd/maps/ts5500_flash.c
index 3ebd90f56503..4b372bcb17f1 100644
--- a/drivers/mtd/maps/ts5500_flash.c
+++ b/drivers/mtd/maps/ts5500_flash.c
@@ -19,26 +19,22 @@
  *
  * Note:
  * - In order for detection to work, jumper 3 must be set.
- * - Drive A and B use a proprietary FTL from General Software which isn't 
- *   supported as of yet so standard drives can't be mounted; you can create 
- *   your own (e.g. jffs) file system.
- * - If you have created your own jffs file system and the bios overwrites 
+ * - Drive A and B use the resident flash disk (RFD) flash translation layer.
+ * - If you have created your own jffs file system and the bios overwrites
  *   it during boot, try disabling Drive A: and B: in the boot order.
  *
- * $Id: ts5500_flash.c,v 1.2 2004/11/28 09:40:40 dwmw2 Exp $
+ * $Id: ts5500_flash.c,v 1.5 2005/11/07 11:14:28 gleixner Exp $
  */
 
 #include <linux/config.h>
+#include <linux/init.h>
 #include <linux/module.h>
-#include <linux/types.h>
 #include <linux/kernel.h>
-#include <linux/init.h>
-#include <linux/mtd/mtd.h>
 #include <linux/mtd/map.h>
-
-#ifdef CONFIG_MTD_PARTITIONS
+#include <linux/mtd/mtd.h>
 #include <linux/mtd/partitions.h>
-#endif
+#include <linux/types.h>
+
 
 #define WINDOW_ADDR     0x09400000
 #define WINDOW_SIZE     0x00200000
@@ -50,7 +46,6 @@ static struct map_info ts5500_map = {
         .phys = WINDOW_ADDR
 };
 
-#ifdef CONFIG_MTD_PARTITIONS
 static struct mtd_partition ts5500_partitions[] = {
         {
                 .name = "Drive A",
@@ -71,8 +66,6 @@ static struct mtd_partition ts5500_partitions[] = {
 
 #define NUM_PARTITIONS (sizeof(ts5500_partitions)/sizeof(struct mtd_partition))
 
-#endif
-
 static struct mtd_info *mymtd;
 
 static int __init init_ts5500_map(void)
@@ -81,48 +74,39 @@ static int __init init_ts5500_map(void)
 
         ts5500_map.virt = ioremap_nocache(ts5500_map.phys, ts5500_map.size);
 
-        if(!ts5500_map.virt) {
+        if (!ts5500_map.virt) {
                 printk(KERN_ERR "Failed to ioremap_nocache\n");
                 rc = -EIO;
-                goto err_out_ioremap;
+                goto err2;
         }
 
         simple_map_init(&ts5500_map);
 
         mymtd = do_map_probe("jedec_probe", &ts5500_map);
-        if(!mymtd)
+        if (!mymtd)
                 mymtd = do_map_probe("map_rom", &ts5500_map);
 
-        if(!mymtd) {
+        if (!mymtd) {
                 rc = -ENXIO;
-                goto err_out_map;
+                goto err1;
         }
 
         mymtd->owner = THIS_MODULE;
-#ifdef CONFIG_MTD_PARTITIONS
         add_mtd_partitions(mymtd, ts5500_partitions, NUM_PARTITIONS);
-#else   
-        add_mtd_device(mymtd);
-#endif
 
         return 0;
 
-err_out_map:
+err1:
         map_destroy(mymtd);
-err_out_ioremap:
         iounmap(ts5500_map.virt);
-
+err2:
         return rc;
 }
 
 static void __exit cleanup_ts5500_map(void)
 {
         if (mymtd) {
-#ifdef CONFIG_MTD_PARTITIONS
                 del_mtd_partitions(mymtd);
-#else
-                del_mtd_device(mymtd);
-#endif
                 map_destroy(mymtd);
         }
 
diff --git a/drivers/mtd/maps/tsunami_flash.c b/drivers/mtd/maps/tsunami_flash.c
index 170d71239e5e..9e21e6c02f80 100644
--- a/drivers/mtd/maps/tsunami_flash.c
+++ b/drivers/mtd/maps/tsunami_flash.c
@@ -2,7 +2,7 @@
  * tsunami_flash.c
  *
  * flash chip on alpha ds10...
- * $Id: tsunami_flash.c,v 1.9 2004/07/14 09:52:55 dwmw2 Exp $
+ * $Id: tsunami_flash.c,v 1.10 2005/11/07 11:14:29 gleixner Exp $
  */
 #include <asm/io.h>
 #include <asm/core_tsunami.h>
@@ -41,7 +41,7 @@ static void tsunami_flash_copy_from(
 }
 
 static void tsunami_flash_copy_to(
-        struct map_info *map, unsigned long offset, 
+        struct map_info *map, unsigned long offset,
         const void *addr, ssize_t len)
 {
         const unsigned char *src;
@@ -90,7 +90,7 @@ static int __init init_tsunami_flash(void)
         char **type;
 
         tsunami_tig_writeb(FLASH_ENABLE_BYTE, FLASH_ENABLE_PORT);
-        
+
         tsunami_flash_mtd = 0;
         type = rom_probe_types;
         for(; !tsunami_flash_mtd && *type; type++) {
diff --git a/drivers/mtd/maps/uclinux.c b/drivers/mtd/maps/uclinux.c
index cc372136e852..79d92808b766 100644
--- a/drivers/mtd/maps/uclinux.c
+++ b/drivers/mtd/maps/uclinux.c
@@ -5,7 +5,7 @@
  *
  *      (C) Copyright 2002, Greg Ungerer (gerg@snapgear.com)
  *
- *      $Id: uclinux.c,v 1.10 2005/01/05 18:05:13 dwmw2 Exp $
+ *      $Id: uclinux.c,v 1.12 2005/11/07 11:14:29 gleixner Exp $
  */
 
 /****************************************************************************/
@@ -82,7 +82,7 @@ int __init uclinux_mtd_init(void)
                 iounmap(mapp->virt);
                 return(-ENXIO);
         }
-                
+
         mtd->owner = THIS_MODULE;
         mtd->point = uclinux_point;
         mtd->priv = mapp;
diff --git a/drivers/mtd/maps/vmax301.c b/drivers/mtd/maps/vmax301.c
index c8c74110ed1b..e0063941c0df 100644
--- a/drivers/mtd/maps/vmax301.c
+++ b/drivers/mtd/maps/vmax301.c
@@ -1,19 +1,19 @@
-// $Id: vmax301.c,v 1.30 2004/07/12 22:38:29 dwmw2 Exp $
+// $Id: vmax301.c,v 1.32 2005/11/07 11:14:29 gleixner Exp $
 /* ######################################################################
 
    Tempustech VMAX SBC301 MTD Driver.
-  
+
    The VMAx 301 is a SBC based on . It
    comes with three builtin AMD 29F016B flash chips and a socket for SRAM or
-   more flash. Each unit has it's own 8k mapping into a settable region 
+   more flash. Each unit has it's own 8k mapping into a settable region
    (0xD8000). There are two 8k mappings for each MTD, the first is always set
    to the lower 8k of the device the second is paged. Writing a 16 bit page
    value to anywhere in the first 8k will cause the second 8k to page around.
 
-   To boot the device a bios extension must be installed into the first 8k 
-   of flash that is smart enough to copy itself down, page in the rest of 
+   To boot the device a bios extension must be installed into the first 8k
+   of flash that is smart enough to copy itself down, page in the rest of
    itself and begin executing.
-   
+
    ##################################################################### */
 
 #include <linux/module.h>
@@ -35,7 +35,7 @@
 /* Actually we could use two spinlocks, but we'd have to have
    more private space in the struct map_info. We lose a little
    performance like this, but we'd probably lose more by having
-   the extra indirection from having one of the map->map_priv 
+   the extra indirection from having one of the map->map_priv
    fields pointing to yet another private struct.
 */
 static DEFINE_SPINLOCK(vmax301_spin);
@@ -98,7 +98,7 @@ static void vmax301_copy_to(struct map_info *map, unsigned long to, const void *
                 spin_lock(&vmax301_spin);
                 vmax301_page(map, to);
                 memcpy_toio(map->map_priv_2 + to, from, thislen);
-                spin_unlock(&vmax301_spin);             
+                spin_unlock(&vmax301_spin);
                 to += thislen;
                 from += thislen;
                 len -= thislen;
@@ -137,7 +137,7 @@ static struct mtd_info *vmax_mtd[2] = {NULL, NULL};
 static void __exit cleanup_vmax301(void)
 {
         int i;
-        
+
         for (i=0; i<2; i++) {
                 if (vmax_mtd[i]) {
                         del_mtd_device(vmax_mtd[i]);
@@ -161,13 +161,13 @@ int __init init_vmax301(void)
                 return -EIO;
         }
         /* Put the address in the map's private data area.
-           We store the actual MTD IO address rather than the 
+           We store the actual MTD IO address rather than the
            address of the first half, because it's used more
-           often. 
+           often.
         */
         vmax_map[0].map_priv_2 = iomapadr + WINDOW_START;
         vmax_map[1].map_priv_2 = iomapadr + (3*WINDOW_START);
-        
+
         for (i=0; i<2; i++) {
                 vmax_mtd[i] = do_map_probe("cfi_probe", &vmax_map[i]);
                 if (!vmax_mtd[i])
diff --git a/drivers/mtd/maps/walnut.c b/drivers/mtd/maps/walnut.c
index d6137b1b5670..5c17bca3a37e 100644
--- a/drivers/mtd/maps/walnut.c
+++ b/drivers/mtd/maps/walnut.c
@@ -1,12 +1,12 @@
 /*
- * $Id: walnut.c,v 1.2 2004/12/10 12:07:42 holindho Exp $
- * 
+ * $Id: walnut.c,v 1.3 2005/11/07 11:14:29 gleixner Exp $
+ *
  * Mapping for Walnut flash
  * (used ebony.c as a "framework")
- * 
+ *
  * Heikki Lindholm <holindho@infradead.org>
- * 
- * 
+ *
+ *
  * 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
@@ -48,7 +48,7 @@ static struct mtd_partition walnut_partitions[] = {
                 .name =   "OpenBIOS",
                 .offset = 0x0,
                 .size =   WALNUT_FLASH_SIZE,
-                /*.mask_flags = MTD_WRITEABLE, */ /* force read-only */         
+                /*.mask_flags = MTD_WRITEABLE, */ /* force read-only */
         }
 };
 
@@ -72,11 +72,11 @@ int __init init_walnut(void)
                 printk("The on-board flash is disabled (U79 sw 5)!");
                 return -EIO;
         }
-        if (WALNUT_FLASH_SRAM_SEL(fpga_brds1)) 
+        if (WALNUT_FLASH_SRAM_SEL(fpga_brds1))
                 flash_base = WALNUT_FLASH_LOW;
         else
                 flash_base = WALNUT_FLASH_HIGH;
-        
+
         walnut_map.phys = flash_base;
         walnut_map.virt =
                 (void __iomem *)ioremap(flash_base, walnut_map.size);
diff --git a/drivers/mtd/maps/wr_sbc82xx_flash.c b/drivers/mtd/maps/wr_sbc82xx_flash.c
index 82b887b05707..60c197ec455b 100644
--- a/drivers/mtd/maps/wr_sbc82xx_flash.c
+++ b/drivers/mtd/maps/wr_sbc82xx_flash.c
@@ -1,5 +1,5 @@
 /*
- * $Id: wr_sbc82xx_flash.c,v 1.7 2004/11/04 13:24:15 gleixner Exp $
+ * $Id: wr_sbc82xx_flash.c,v 1.8 2005/11/07 11:14:29 gleixner Exp $
  *
  * Map for flash chips on Wind River PowerQUICC II SBC82xx board.
  *
@@ -163,10 +163,10 @@ static void __exit cleanup_sbc82xx_flash(void)
                         del_mtd_partitions(sbcmtd[i]);
                 else
                         del_mtd_device(sbcmtd[i]);
-                        
+
                 kfree(sbcmtd_parts[i]);
                 map_destroy(sbcmtd[i]);
-                
+
                 iounmap((void *)sbc82xx_flash_map[i].virt);
                 sbc82xx_flash_map[i].virt = 0;
         }
diff --git a/drivers/mtd/mtd_blkdevs.c b/drivers/mtd/mtd_blkdevs.c
index f8d2185819e7..339cb1218eaa 100644
--- a/drivers/mtd/mtd_blkdevs.c
+++ b/drivers/mtd/mtd_blkdevs.c
@@ -1,5 +1,5 @@
 /*
- * $Id: mtd_blkdevs.c,v 1.24 2004/11/16 18:28:59 dwmw2 Exp $
+ * $Id: mtd_blkdevs.c,v 1.27 2005/11/07 11:14:20 gleixner Exp $
  *
  * (C) 2003 David Woodhouse <dwmw2@infradead.org>
  *
@@ -21,7 +21,6 @@
 #include <linux/init.h>
 #include <asm/semaphore.h>
 #include <asm/uaccess.h>
-#include <linux/devfs_fs_kernel.h>
 
 static LIST_HEAD(blktrans_majors);
 
@@ -86,7 +85,7 @@ static int mtd_blktrans_thread(void *arg)
         daemonize("%sd", tr->name);
 
         /* daemonize() doesn't do this for us since some kernel threads
-           actually want to deal with signals. We can't just call 
+           actually want to deal with signals. We can't just call
            exit_sighand() since that'll cause an oops when we finally
            do exit. */
         spin_lock_irq(&current->sighand->siglock);
@@ -95,7 +94,7 @@ static int mtd_blktrans_thread(void *arg)
         spin_unlock_irq(&current->sighand->siglock);
 
         spin_lock_irq(rq->queue_lock);
-                
+
         while (!tr->blkcore_priv->exiting) {
                 struct request *req;
                 struct mtd_blktrans_dev *dev;
@@ -158,7 +157,7 @@ static int blktrans_open(struct inode *i, struct file *f)
         if (!try_module_get(tr->owner))
                 goto out_tr;
 
-        /* FIXME: Locking. A hot pluggable device can go away 
+        /* FIXME: Locking. A hot pluggable device can go away
            (del_mtd_device can be called for it) without its module
            being unloaded. */
         dev->mtd->usecount++;
@@ -196,7 +195,7 @@ static int blktrans_release(struct inode *i, struct file *f)
 }
 
 
-static int blktrans_ioctl(struct inode *inode, struct file *file, 
+static int blktrans_ioctl(struct inode *inode, struct file *file,
                               unsigned int cmd, unsigned long arg)
 {
         struct mtd_blktrans_dev *dev = inode->i_bdev->bd_disk->private_data;
@@ -265,7 +264,7 @@ int add_mtd_blktrans_dev(struct mtd_blktrans_dev *new)
                         /* Required number was free */
                         list_add_tail(&new->list, &d->list);
                         goto added;
-                } 
+                }
                 last_devnum = d->devnum;
         }
         if (new->devnum == -1)
@@ -289,11 +288,19 @@ int add_mtd_blktrans_dev(struct mtd_blktrans_dev *new)
         gd->major = tr->major;
         gd->first_minor = (new->devnum) << tr->part_bits;
         gd->fops = &mtd_blktrans_ops;
-        
-        snprintf(gd->disk_name, sizeof(gd->disk_name),
-                 "%s%c", tr->name, (tr->part_bits?'a':'0') + new->devnum);
-        snprintf(gd->devfs_name, sizeof(gd->devfs_name),
-                 "%s/%c", tr->name, (tr->part_bits?'a':'0') + new->devnum);
+
+        if (tr->part_bits)
+                if (new->devnum < 26)
+                        snprintf(gd->disk_name, sizeof(gd->disk_name),
+                                 "%s%c", tr->name, 'a' + new->devnum);
+                else
+                        snprintf(gd->disk_name, sizeof(gd->disk_name),
+                                 "%s%c%c", tr->name,
+                                 'a' - 1 + new->devnum / 26,
+                                 'a' + new->devnum % 26);
+        else
+                snprintf(gd->disk_name, sizeof(gd->disk_name),
+                         "%s%d", tr->name, new->devnum);
 
         /* 2.5 has capacity in units of 512 bytes while still
            having BLOCK_SIZE_BITS set to 10. Just to keep us amused. */
@@ -307,7 +314,7 @@ int add_mtd_blktrans_dev(struct mtd_blktrans_dev *new)
                 set_disk_ro(gd, 1);
 
         add_disk(gd);
-        
+
         return 0;
 }
 
@@ -322,7 +329,7 @@ int del_mtd_blktrans_dev(struct mtd_blktrans_dev *old)
 
         del_gendisk(old->blkcore_priv);
         put_disk(old->blkcore_priv);
-                
+
         return 0;
 }
 
@@ -361,12 +368,12 @@ static struct mtd_notifier blktrans_notifier = {
         .add = blktrans_notify_add,
         .remove = blktrans_notify_remove,
 };
-      
+
 int register_mtd_blktrans(struct mtd_blktrans_ops *tr)
 {
         int ret, i;
 
-        /* Register the notifier if/when the first device type is 
+        /* Register the notifier if/when the first device type is
            registered, to prevent the link/init ordering from fucking
            us over. */
         if (!blktrans_notifier.list.next)
@@ -409,9 +416,7 @@ int register_mtd_blktrans(struct mtd_blktrans_ops *tr)
                 kfree(tr->blkcore_priv);
                 up(&mtd_table_mutex);
                 return ret;
-        } 
-
-        devfs_mk_dir(tr->name);
+        }
 
         INIT_LIST_HEAD(&tr->devs);
         list_add(&tr->list, &blktrans_majors);
@@ -445,7 +450,6 @@ int deregister_mtd_blktrans(struct mtd_blktrans_ops *tr)
                 tr->remove_dev(dev);
         }
 
-        devfs_remove(tr->name);
         blk_cleanup_queue(tr->blkcore_priv->rq);
         unregister_blkdev(tr->major, tr->name);
 
diff --git a/drivers/mtd/mtdblock.c b/drivers/mtd/mtdblock.c
index 400dd9c89883..e84756644fd1 100644
--- a/drivers/mtd/mtdblock.c
+++ b/drivers/mtd/mtdblock.c
@@ -1,21 +1,22 @@
-/* 
+/*
  * Direct MTD block device access
  *
- * $Id: mtdblock.c,v 1.66 2004/11/25 13:52:52 joern Exp $
+ * $Id: mtdblock.c,v 1.68 2005/11/07 11:14:20 gleixner Exp $
  *
  * (C) 2000-2003 Nicolas Pitre <nico@cam.org>
  * (C) 1999-2003 David Woodhouse <dwmw2@infradead.org>
  */
 
 #include <linux/config.h>
-#include <linux/types.h>
-#include <linux/module.h>
-#include <linux/kernel.h>
 #include <linux/fs.h>
 #include <linux/init.h>
+#include <linux/kernel.h>
+#include <linux/module.h>
+#include <linux/sched.h>
 #include <linux/slab.h>
+#include <linux/types.h>
 #include <linux/vmalloc.h>
-#include <linux/sched.h>        /* TASK_* */
+
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/blktrans.h>
 
@@ -31,7 +32,7 @@ static struct mtdblk_dev {
 
 /*
  * Cache stuff...
- * 
+ *
  * Since typical flash erasable sectors are much larger than what Linux's
  * buffer cache can handle, we must implement read-modify-write on flash
  * sectors for each block write requests.  To avoid over-erasing flash sectors
@@ -45,7 +46,7 @@ static void erase_callback(struct erase_info *done)
         wake_up(wait_q);
 }
 
-static int erase_write (struct mtd_info *mtd, unsigned long pos, 
+static int erase_write (struct mtd_info *mtd, unsigned long pos,
                         int len, const char *buf)
 {
         struct erase_info erase;
@@ -103,18 +104,18 @@ static int write_cached_data (struct mtdblk_dev *mtdblk)
                 return 0;
 
         DEBUG(MTD_DEBUG_LEVEL2, "mtdblock: writing cached data for \"%s\" "
-                        "at 0x%lx, size 0x%x\n", mtd->name, 
+                        "at 0x%lx, size 0x%x\n", mtd->name,
                         mtdblk->cache_offset, mtdblk->cache_size);
-        
-        ret = erase_write (mtd, mtdblk->cache_offset, 
+
+        ret = erase_write (mtd, mtdblk->cache_offset,
                            mtdblk->cache_size, mtdblk->cache_data);
         if (ret)
                 return ret;
 
         /*
          * Here we could argubly set the cache state to STATE_CLEAN.
-         * However this could lead to inconsistency since we will not 
-         * be notified if this content is altered on the flash by other 
+         * However this could lead to inconsistency since we will not
+         * be notified if this content is altered on the flash by other
          * means.  Let's declare it empty and leave buffering tasks to
          * the buffer cache instead.
          */
@@ -123,7 +124,7 @@ static int write_cached_data (struct mtdblk_dev *mtdblk)
 }
 
 
-static int do_cached_write (struct mtdblk_dev *mtdblk, unsigned long pos, 
+static int do_cached_write (struct mtdblk_dev *mtdblk, unsigned long pos,
                             int len, const char *buf)
 {
         struct mtd_info *mtd = mtdblk->mtd;
@@ -133,7 +134,7 @@ static int do_cached_write (struct mtdblk_dev *mtdblk, unsigned long pos,
 
         DEBUG(MTD_DEBUG_LEVEL2, "mtdblock: write on \"%s\" at 0x%lx, size 0x%x\n",
                 mtd->name, pos, len);
-        
+
         if (!sect_size)
                 return MTD_WRITE (mtd, pos, len, &retlen, buf);
 
@@ -141,11 +142,11 @@ static int do_cached_write (struct mtdblk_dev *mtdblk, unsigned long pos,
                 unsigned long sect_start = (pos/sect_size)*sect_size;
                 unsigned int offset = pos - sect_start;
                 unsigned int size = sect_size - offset;
-                if( size > len ) 
+                if( size > len )
                         size = len;
 
                 if (size == sect_size) {
-                        /* 
+                        /*
                          * We are covering a whole sector.  Thus there is no
                          * need to bother with the cache while it may still be
                          * useful for other partial writes.
@@ -159,7 +160,7 @@ static int do_cached_write (struct mtdblk_dev *mtdblk, unsigned long pos,
                         if (mtdblk->cache_state == STATE_DIRTY &&
                             mtdblk->cache_offset != sect_start) {
                                 ret = write_cached_data(mtdblk);
-                                if (ret) 
+                                if (ret)
                                         return ret;
                         }
 
@@ -192,7 +193,7 @@ static int do_cached_write (struct mtdblk_dev *mtdblk, unsigned long pos,
 }
 
 
-static int do_cached_read (struct mtdblk_dev *mtdblk, unsigned long pos, 
+static int do_cached_read (struct mtdblk_dev *mtdblk, unsigned long pos,
                            int len, char *buf)
 {
         struct mtd_info *mtd = mtdblk->mtd;
@@ -200,9 +201,9 @@ static int do_cached_read (struct mtdblk_dev *mtdblk, unsigned long pos,
         size_t retlen;
         int ret;
 
-        DEBUG(MTD_DEBUG_LEVEL2, "mtdblock: read on \"%s\" at 0x%lx, size 0x%x\n", 
+        DEBUG(MTD_DEBUG_LEVEL2, "mtdblock: read on \"%s\" at 0x%lx, size 0x%x\n",
                         mtd->name, pos, len);
-        
+
         if (!sect_size)
                 return MTD_READ (mtd, pos, len, &retlen, buf);
 
@@ -210,7 +211,7 @@ static int do_cached_read (struct mtdblk_dev *mtdblk, unsigned long pos,
                 unsigned long sect_start = (pos/sect_size)*sect_size;
                 unsigned int offset = pos - sect_start;
                 unsigned int size = sect_size - offset;
-                if (size > len) 
+                if (size > len)
                         size = len;
 
                 /*
@@ -268,12 +269,12 @@ static int mtdblock_open(struct mtd_blktrans_dev *mbd)
         int dev = mbd->devnum;
 
         DEBUG(MTD_DEBUG_LEVEL1,"mtdblock_open\n");
-        
+
         if (mtdblks[dev]) {
                 mtdblks[dev]->count++;
                 return 0;
         }
-        
+
         /* OK, it's not open. Create cache info for it */
         mtdblk = kmalloc(sizeof(struct mtdblk_dev), GFP_KERNEL);
         if (!mtdblk)
@@ -292,7 +293,7 @@ static int mtdblock_open(struct mtd_blktrans_dev *mbd)
         }
 
         mtdblks[dev] = mtdblk;
-        
+
         DEBUG(MTD_DEBUG_LEVEL1, "ok\n");
 
         return 0;
@@ -320,7 +321,7 @@ static int mtdblock_release(struct mtd_blktrans_dev *mbd)
         DEBUG(MTD_DEBUG_LEVEL1, "ok\n");
 
         return 0;
-}  
+}
 
 static int mtdblock_flush(struct mtd_blktrans_dev *dev)
 {
diff --git a/drivers/mtd/mtdchar.c b/drivers/mtd/mtdchar.c
index 16df1e4fb0e9..6f044584bdc6 100644
--- a/drivers/mtd/mtdchar.c
+++ b/drivers/mtd/mtdchar.c
@@ -1,22 +1,23 @@
 /*
- * $Id: mtdchar.c,v 1.73 2005/07/04 17:36:41 gleixner Exp $
+ * $Id: mtdchar.c,v 1.76 2005/11/07 11:14:20 gleixner Exp $
  *
  * Character-device access to raw MTD devices.
  *
  */
 
 #include <linux/config.h>
+#include <linux/device.h>
+#include <linux/fs.h>
+#include <linux/init.h>
 #include <linux/kernel.h>
 #include <linux/module.h>
+#include <linux/slab.h>
+#include <linux/sched.h>
+
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/compatmac.h>
-#include <linux/slab.h>
-#include <linux/init.h>
-#include <linux/fs.h>
-#include <linux/sched.h>        /* TASK_* */
-#include <asm/uaccess.h>
 
-#include <linux/device.h>
+#include <asm/uaccess.h>
 
 static struct class *mtd_class;
 
@@ -27,7 +28,7 @@ static void mtd_notify_add(struct mtd_info* mtd)
 
         class_device_create(mtd_class, NULL, MKDEV(MTD_CHAR_MAJOR, mtd->index*2),
                             NULL, "mtd%d", mtd->index);
-        
+
         class_device_create(mtd_class, NULL,
                             MKDEV(MTD_CHAR_MAJOR, mtd->index*2+1),
                             NULL, "mtd%dro", mtd->index);
@@ -70,26 +71,23 @@ static loff_t mtd_lseek (struct file *file, loff_t offset, int orig)
         switch (orig) {
         case 0:
                 /* SEEK_SET */
-                file->f_pos = offset;
                 break;
         case 1:
                 /* SEEK_CUR */
-                file->f_pos += offset;
+                offset += file->f_pos;
                 break;
         case 2:
                 /* SEEK_END */
-                file->f_pos =mtd->size + offset;
+                offset += mtd->size;
                 break;
         default:
                 return -EINVAL;
         }
 
-        if (file->f_pos < 0)
-                file->f_pos = 0;
-        else if (file->f_pos >= mtd->size)
-                file->f_pos = mtd->size - 1;
+        if (offset >= 0 && offset < mtd->size)
+                return file->f_pos = offset;
 
-        return file->f_pos;
+        return -EINVAL;
 }
 
 
@@ -110,23 +108,23 @@ static int mtd_open(struct inode *inode, struct file *file)
                 return -EACCES;
 
         mtd = get_mtd_device(NULL, devnum);
-        
+
         if (!mtd)
                 return -ENODEV;
-        
+
         if (MTD_ABSENT == mtd->type) {
                 put_mtd_device(mtd);
                 return -ENODEV;
         }
 
         file->private_data = mtd;
-                
+
         /* You can't open it RW if it's not a writeable device */
         if ((file->f_mode & 2) && !(mtd->flags & MTD_WRITEABLE)) {
                 put_mtd_device(mtd);
                 return -EACCES;
         }
-                
+
         return 0;
 } /* mtd_open */
 
@@ -139,10 +137,10 @@ static int mtd_close(struct inode *inode, struct file *file)
         DEBUG(MTD_DEBUG_LEVEL0, "MTD_close\n");
 
         mtd = TO_MTD(file);
-        
+
         if (mtd->sync)
                 mtd->sync(mtd);
-        
+
         put_mtd_device(mtd);
 
         return 0;
@@ -161,7 +159,7 @@ static ssize_t mtd_read(struct file *file, char __user *buf, size_t count,loff_t
         int ret=0;
         int len;
         char *kbuf;
-        
+
         DEBUG(MTD_DEBUG_LEVEL0,"MTD_read\n");
 
         if (*ppos + count > mtd->size)
@@ -169,11 +167,11 @@ static ssize_t mtd_read(struct file *file, char __user *buf, size_t count,loff_t
 
         if (!count)
                 return 0;
-        
+
         /* FIXME: Use kiovec in 2.5 to lock down the user's buffers
            and pass them directly to the MTD functions */
         while (count) {
-                if (count > MAX_KMALLOC_SIZE) 
+                if (count > MAX_KMALLOC_SIZE)
                         len = MAX_KMALLOC_SIZE;
                 else
                         len = count;
@@ -181,7 +179,7 @@ static ssize_t mtd_read(struct file *file, char __user *buf, size_t count,loff_t
                 kbuf=kmalloc(len,GFP_KERNEL);
                 if (!kbuf)
                         return -ENOMEM;
-                
+
                 switch (MTD_MODE(file)) {
                 case MTD_MODE_OTP_FACT:
                         ret = mtd->read_fact_prot_reg(mtd, *ppos, len, &retlen, kbuf);
@@ -194,7 +192,7 @@ static ssize_t mtd_read(struct file *file, char __user *buf, size_t count,loff_t
                 }
                 /* Nand returns -EBADMSG on ecc errors, but it returns
                  * the data. For our userspace tools it is important
-                 * to dump areas with ecc errors ! 
+                 * to dump areas with ecc errors !
                  * Userspace software which accesses NAND this way
                  * must be aware of the fact that it deals with NAND
                  */
@@ -216,7 +214,7 @@ static ssize_t mtd_read(struct file *file, char __user *buf, size_t count,loff_t
                         kfree(kbuf);
                         return ret;
                 }
-                
+
                 kfree(kbuf);
         }
 
@@ -233,10 +231,10 @@ static ssize_t mtd_write(struct file *file, const char __user *buf, size_t count
         int len;
 
         DEBUG(MTD_DEBUG_LEVEL0,"MTD_write\n");
-        
+
         if (*ppos == mtd->size)
                 return -ENOSPC;
-        
+
         if (*ppos + count > mtd->size)
                 count = mtd->size - *ppos;
 
@@ -244,7 +242,7 @@ static ssize_t mtd_write(struct file *file, const char __user *buf, size_t count
                 return 0;
 
         while (count) {
-                if (count > MAX_KMALLOC_SIZE) 
+                if (count > MAX_KMALLOC_SIZE)
                         len = MAX_KMALLOC_SIZE;
                 else
                         len = count;
@@ -259,7 +257,7 @@ static ssize_t mtd_write(struct file *file, const char __user *buf, size_t count
                         kfree(kbuf);
                         return -EFAULT;
                 }
-                
+
                 switch (MTD_MODE(file)) {
                 case MTD_MODE_OTP_FACT:
                         ret = -EROFS;
@@ -284,7 +282,7 @@ static ssize_t mtd_write(struct file *file, const char __user *buf, size_t count
                         kfree(kbuf);
                         return ret;
                 }
-                
+
                 kfree(kbuf);
         }
 
@@ -308,7 +306,7 @@ static int mtd_ioctl(struct inode *inode, struct file *file,
         void __user *argp = (void __user *)arg;
         int ret = 0;
         u_long size;
-        
+
         DEBUG(MTD_DEBUG_LEVEL0, "MTD_ioctl\n");
 
         size = (cmd & IOCSIZE_MASK) >> IOCSIZE_SHIFT;
@@ -320,7 +318,7 @@ static int mtd_ioctl(struct inode *inode, struct file *file,
                 if (!access_ok(VERIFY_WRITE, argp, size))
                         return -EFAULT;
         }
-        
+
         switch (cmd) {
         case MEMGETREGIONCOUNT:
                 if (copy_to_user(argp, &(mtd->numeraseregions), sizeof(int)))
@@ -372,11 +370,11 @@ static int mtd_ioctl(struct inode *inode, struct file *file,
                         erase->mtd = mtd;
                         erase->callback = mtdchar_erase_callback;
                         erase->priv = (unsigned long)&waitq;
-                        
+
                         /*
                           FIXME: Allow INTERRUPTIBLE. Which means
                           not having the wait_queue head on the stack.
-                          
+
                           If the wq_head is on the stack, and we
                           leave because we got interrupted, then the
                           wq_head is no longer there when the
@@ -404,13 +402,13 @@ static int mtd_ioctl(struct inode *inode, struct file *file,
                 struct mtd_oob_buf buf;
                 void *databuf;
                 ssize_t retlen;
-                
+
                 if(!(file->f_mode & 2))
                         return -EPERM;
 
                 if (copy_from_user(&buf, argp, sizeof(struct mtd_oob_buf)))
                         return -EFAULT;
-                
+
                 if (buf.length > 0x4096)
                         return -EINVAL;
 
@@ -426,7 +424,7 @@ static int mtd_ioctl(struct inode *inode, struct file *file,
                 databuf = kmalloc(buf.length, GFP_KERNEL);
                 if (!databuf)
                         return -ENOMEM;
-                
+
                 if (copy_from_user(databuf, buf.ptr, buf.length)) {
                         kfree(databuf);
                         return -EFAULT;
@@ -450,7 +448,7 @@ static int mtd_ioctl(struct inode *inode, struct file *file,
 
                 if (copy_from_user(&buf, argp, sizeof(struct mtd_oob_buf)))
                         return -EFAULT;
-                
+
                 if (buf.length > 0x4096)
                         return -EINVAL;
 
@@ -466,14 +464,14 @@ static int mtd_ioctl(struct inode *inode, struct file *file,
                 databuf = kmalloc(buf.length, GFP_KERNEL);
                 if (!databuf)
                         return -ENOMEM;
-                
+
                 ret = (mtd->read_oob)(mtd, buf.start, buf.length, &retlen, databuf);
 
                 if (put_user(retlen, (uint32_t __user *)argp))
                         ret = -EFAULT;
                 else if (retlen && copy_to_user(buf.ptr, databuf, retlen))
                         ret = -EFAULT;
-                
+
                 kfree(databuf);
                 break;
         }
@@ -523,7 +521,7 @@ static int mtd_ioctl(struct inode *inode, struct file *file,
         case MEMGETBADBLOCK:
         {
                 loff_t offs;
-                
+
                 if (copy_from_user(&offs, argp, sizeof(loff_t)))
                         return -EFAULT;
                 if (!mtd->block_isbad)
diff --git a/drivers/mtd/mtdconcat.c b/drivers/mtd/mtdconcat.c
index f3e65af33a9c..b1bf8c411de7 100644
--- a/drivers/mtd/mtdconcat.c
+++ b/drivers/mtd/mtdconcat.c
@@ -7,14 +7,15 @@
  *
  * This code is GPL
  *
- * $Id: mtdconcat.c,v 1.9 2004/06/30 15:17:41 dbrown Exp $
+ * $Id: mtdconcat.c,v 1.11 2005/11/07 11:14:20 gleixner Exp $
  */
 
-#include <linux/module.h>
-#include <linux/types.h>
 #include <linux/kernel.h>
+#include <linux/module.h>
 #include <linux/slab.h>
-#include <linux/sched.h>        /* TASK_* */
+#include <linux/sched.h>
+#include <linux/types.h>
+
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/concat.h>
 
@@ -43,7 +44,7 @@ struct mtd_concat {
  */
 #define CONCAT(x)  ((struct mtd_concat *)(x))
 
-/* 
+/*
  * MTD methods which look up the relevant subdevice, translate the
  * effective address and pass through to the subdevice.
  */
@@ -877,7 +878,7 @@ struct mtd_info *mtd_concat_create(struct mtd_info *subdev[],	/* subdevices to c
         return &concat->mtd;
 }
 
-/* 
+/*
  * This function destroys an MTD object obtained from concat_mtd_devs()
  */
 
diff --git a/drivers/mtd/mtdcore.c b/drivers/mtd/mtdcore.c
index dc86df18e94b..dade02ab0687 100644
--- a/drivers/mtd/mtdcore.c
+++ b/drivers/mtd/mtdcore.c
@@ -1,5 +1,5 @@
 /*
- * $Id: mtdcore.c,v 1.45 2005/02/18 14:34:50 dedekind Exp $
+ * $Id: mtdcore.c,v 1.47 2005/11/07 11:14:20 gleixner Exp $
  *
  * Core registration and callback routines for MTD
  * drivers and users.
@@ -25,7 +25,7 @@
 
 #include <linux/mtd/mtd.h>
 
-/* These are exported solely for the purpose of mtd_blkdevs.c. You 
+/* These are exported solely for the purpose of mtd_blkdevs.c. You
    should not use them for _anything_ else */
 DECLARE_MUTEX(mtd_table_mutex);
 struct mtd_info *mtd_table[MAX_MTD_DEVICES];
@@ -66,7 +66,7 @@ int add_mtd_device(struct mtd_info *mtd)
                                 struct mtd_notifier *not = list_entry(this, struct mtd_notifier, list);
                                 not->add(mtd);
                         }
-                        
+
                         up(&mtd_table_mutex);
                         /* We _know_ we aren't being removed, because
                            our caller is still holding us here. So none
@@ -75,7 +75,7 @@ int add_mtd_device(struct mtd_info *mtd)
                         __module_get(THIS_MODULE);
                         return 0;
                 }
-        
+
         up(&mtd_table_mutex);
         return 1;
 }
@@ -93,13 +93,13 @@ int add_mtd_device(struct mtd_info *mtd)
 int del_mtd_device (struct mtd_info *mtd)
 {
         int ret;
-        
+
         down(&mtd_table_mutex);
 
         if (mtd_table[mtd->index] != mtd) {
                 ret = -ENODEV;
         } else if (mtd->usecount) {
-                printk(KERN_NOTICE "Removing MTD device #%d (%s) with use count %d\n", 
+                printk(KERN_NOTICE "Removing MTD device #%d (%s) with use count %d\n",
                        mtd->index, mtd->name, mtd->usecount);
                 ret = -EBUSY;
         } else {
@@ -140,7 +140,7 @@ void register_mtd_user (struct mtd_notifier *new)
         list_add(&new->list, &mtd_notifiers);
 
         __module_get(THIS_MODULE);
-        
+
         for (i=0; i< MAX_MTD_DEVICES; i++)
                 if (mtd_table[i])
                         new->add(mtd_table[i]);
@@ -169,7 +169,7 @@ int unregister_mtd_user (struct mtd_notifier *old)
         for (i=0; i< MAX_MTD_DEVICES; i++)
                 if (mtd_table[i])
                         old->remove(mtd_table[i]);
-                        
+
         list_del(&old->list);
         up(&mtd_table_mutex);
         return 0;
@@ -187,7 +187,7 @@ int unregister_mtd_user (struct mtd_notifier *old)
  *      both, return the num'th driver only if its address matches. Return NULL
  *      if not.
  */
-        
+
 struct mtd_info *get_mtd_device(struct mtd_info *mtd, int num)
 {
         struct mtd_info *ret = NULL;
@@ -297,39 +297,6 @@ EXPORT_SYMBOL(default_mtd_writev);
 EXPORT_SYMBOL(default_mtd_readv);
 
 /*====================================================================*/
-/* Power management code */
-
-#ifdef CONFIG_PM
-
-#include <linux/pm.h>
-
-static struct pm_dev *mtd_pm_dev = NULL;
-
-static int mtd_pm_callback(struct pm_dev *dev, pm_request_t rqst, void *data)
-{
-        int ret = 0, i;
-
-        if (down_trylock(&mtd_table_mutex))
-                return -EAGAIN;
-        if (rqst == PM_SUSPEND) {
-                for (i = 0; ret == 0 && i < MAX_MTD_DEVICES; i++) {
-                        if (mtd_table[i] && mtd_table[i]->suspend)
-                                ret = mtd_table[i]->suspend(mtd_table[i]);
-                }
-        } else i = MAX_MTD_DEVICES-1;
-
-        if (rqst == PM_RESUME || ret) {
-                for ( ; i >= 0; i--) {
-                        if (mtd_table[i] && mtd_table[i]->resume)
-                                mtd_table[i]->resume(mtd_table[i]);
-                }
-        }
-        up(&mtd_table_mutex);
-        return ret;
-}
-#endif
-
-/*====================================================================*/
 /* Support for /proc/mtd */
 
 #ifdef CONFIG_PROC_FS
@@ -388,22 +355,11 @@ static int __init init_mtd(void)
         if ((proc_mtd = create_proc_entry( "mtd", 0, NULL )))
                 proc_mtd->read_proc = mtd_read_proc;
 #endif
-
-#ifdef CONFIG_PM
-        mtd_pm_dev = pm_register(PM_UNKNOWN_DEV, 0, mtd_pm_callback);
-#endif
         return 0;
 }
 
 static void __exit cleanup_mtd(void)
 {
-#ifdef CONFIG_PM
-        if (mtd_pm_dev) {
-                pm_unregister(mtd_pm_dev);
-                mtd_pm_dev = NULL;
-        }
-#endif
-
 #ifdef CONFIG_PROC_FS
         if (proc_mtd)
                 remove_proc_entry( "mtd", NULL);
diff --git a/drivers/mtd/mtdpart.c b/drivers/mtd/mtdpart.c
index b92e6bfffaf2..99395911d26f 100644
--- a/drivers/mtd/mtdpart.c
+++ b/drivers/mtd/mtdpart.c
@@ -5,11 +5,11 @@
  *
  * This code is GPL
  *
- * $Id: mtdpart.c,v 1.53 2005/02/08 17:11:13 nico Exp $
+ * $Id: mtdpart.c,v 1.55 2005/11/07 11:14:20 gleixner Exp $
  *
  *      02-21-2002      Thomas Gleixner <gleixner@autronix.de>
  *                      added support for read_oob, write_oob
- */     
+ */
 
 #include <linux/module.h>
 #include <linux/types.h>
@@ -41,13 +41,13 @@ struct mtd_part {
  */
 #define PART(x)  ((struct mtd_part *)(x))
 
-        
-/* 
+
+/*
  * MTD methods which simply translate the effective address and pass through
  * to the _real_ device.
  */
 
-static int part_read (struct mtd_info *mtd, loff_t from, size_t len, 
+static int part_read (struct mtd_info *mtd, loff_t from, size_t len,
                         size_t *retlen, u_char *buf)
 {
         struct mtd_part *part = PART(mtd);
@@ -55,15 +55,15 @@ static int part_read (struct mtd_info *mtd, loff_t from, size_t len,
                 len = 0;
         else if (from + len > mtd->size)
                 len = mtd->size - from;
-        if (part->master->read_ecc == NULL)     
-                return part->master->read (part->master, from + part->offset, 
+        if (part->master->read_ecc == NULL)
+                return part->master->read (part->master, from + part->offset,
                                         len, retlen, buf);
         else
-                return part->master->read_ecc (part->master, from + part->offset, 
+                return part->master->read_ecc (part->master, from + part->offset,
                                         len, retlen, buf, NULL, &mtd->oobinfo);
 }
 
-static int part_point (struct mtd_info *mtd, loff_t from, size_t len, 
+static int part_point (struct mtd_info *mtd, loff_t from, size_t len,
                         size_t *retlen, u_char **buf)
 {
         struct mtd_part *part = PART(mtd);
@@ -71,7 +71,7 @@ static int part_point (struct mtd_info *mtd, loff_t from, size_t len,
                 len = 0;
         else if (from + len > mtd->size)
                 len = mtd->size - from;
-        return part->master->point (part->master, from + part->offset, 
+        return part->master->point (part->master, from + part->offset,
                                     len, retlen, buf);
 }
 static void part_unpoint (struct mtd_info *mtd, u_char *addr, loff_t from, size_t len)
@@ -82,7 +82,7 @@ static void part_unpoint (struct mtd_info *mtd, u_char *addr, loff_t from, size_
 }
 
 
-static int part_read_ecc (struct mtd_info *mtd, loff_t from, size_t len, 
+static int part_read_ecc (struct mtd_info *mtd, loff_t from, size_t len,
                         size_t *retlen, u_char *buf, u_char *eccbuf, struct nand_oobinfo *oobsel)
 {
         struct mtd_part *part = PART(mtd);
@@ -92,11 +92,11 @@ static int part_read_ecc (struct mtd_info *mtd, loff_t from, size_t len,
                 len = 0;
         else if (from + len > mtd->size)
                 len = mtd->size - from;
-        return part->master->read_ecc (part->master, from + part->offset, 
+        return part->master->read_ecc (part->master, from + part->offset,
                                         len, retlen, buf, eccbuf, oobsel);
 }
 
-static int part_read_oob (struct mtd_info *mtd, loff_t from, size_t len, 
+static int part_read_oob (struct mtd_info *mtd, loff_t from, size_t len,
                         size_t *retlen, u_char *buf)
 {
         struct mtd_part *part = PART(mtd);
@@ -104,15 +104,15 @@ static int part_read_oob (struct mtd_info *mtd, loff_t from, size_t len,
                 len = 0;
         else if (from + len > mtd->size)
                 len = mtd->size - from;
-        return part->master->read_oob (part->master, from + part->offset, 
+        return part->master->read_oob (part->master, from + part->offset,
                                         len, retlen, buf);
 }
 
-static int part_read_user_prot_reg (struct mtd_info *mtd, loff_t from, size_t len, 
+static int part_read_user_prot_reg (struct mtd_info *mtd, loff_t from, size_t len,
                         size_t *retlen, u_char *buf)
 {
         struct mtd_part *part = PART(mtd);
-        return part->master->read_user_prot_reg (part->master, from, 
+        return part->master->read_user_prot_reg (part->master, from,
                                         len, retlen, buf);
 }
 
@@ -123,11 +123,11 @@ static int part_get_user_prot_info (struct mtd_info *mtd,
         return part->master->get_user_prot_info (part->master, buf, len);
 }
 
-static int part_read_fact_prot_reg (struct mtd_info *mtd, loff_t from, size_t len, 
+static int part_read_fact_prot_reg (struct mtd_info *mtd, loff_t from, size_t len,
                         size_t *retlen, u_char *buf)
 {
         struct mtd_part *part = PART(mtd);
-        return part->master->read_fact_prot_reg (part->master, from, 
+        return part->master->read_fact_prot_reg (part->master, from,
                                         len, retlen, buf);
 }
 
@@ -148,13 +148,13 @@ static int part_write (struct mtd_info *mtd, loff_t to, size_t len,
                 len = 0;
         else if (to + len > mtd->size)
                 len = mtd->size - to;
-        if (part->master->write_ecc == NULL)    
-                return part->master->write (part->master, to + part->offset, 
+        if (part->master->write_ecc == NULL)
+                return part->master->write (part->master, to + part->offset,
                                         len, retlen, buf);
         else
-                return part->master->write_ecc (part->master, to + part->offset, 
+                return part->master->write_ecc (part->master, to + part->offset,
                                         len, retlen, buf, NULL, &mtd->oobinfo);
-                                                        
+
 }
 
 static int part_write_ecc (struct mtd_info *mtd, loff_t to, size_t len,
@@ -170,7 +170,7 @@ static int part_write_ecc (struct mtd_info *mtd, loff_t to, size_t len,
                 len = 0;
         else if (to + len > mtd->size)
                 len = mtd->size - to;
-        return part->master->write_ecc (part->master, to + part->offset, 
+        return part->master->write_ecc (part->master, to + part->offset,
                                         len, retlen, buf, eccbuf, oobsel);
 }
 
@@ -184,19 +184,19 @@ static int part_write_oob (struct mtd_info *mtd, loff_t to, size_t len,
                 len = 0;
         else if (to + len > mtd->size)
                 len = mtd->size - to;
-        return part->master->write_oob (part->master, to + part->offset, 
+        return part->master->write_oob (part->master, to + part->offset,
                                         len, retlen, buf);
 }
 
-static int part_write_user_prot_reg (struct mtd_info *mtd, loff_t from, size_t len, 
+static int part_write_user_prot_reg (struct mtd_info *mtd, loff_t from, size_t len,
                         size_t *retlen, u_char *buf)
 {
         struct mtd_part *part = PART(mtd);
-        return part->master->write_user_prot_reg (part->master, from, 
+        return part->master->write_user_prot_reg (part->master, from,
                                         len, retlen, buf);
 }
 
-static int part_lock_user_prot_reg (struct mtd_info *mtd, loff_t from, size_t len) 
+static int part_lock_user_prot_reg (struct mtd_info *mtd, loff_t from, size_t len)
 {
         struct mtd_part *part = PART(mtd);
         return part->master->lock_user_prot_reg (part->master, from, len);
@@ -208,7 +208,7 @@ static int part_writev (struct mtd_info *mtd,  const struct kvec *vecs,
         struct mtd_part *part = PART(mtd);
         if (!(mtd->flags & MTD_WRITEABLE))
                 return -EROFS;
-        if (part->master->writev_ecc == NULL)   
+        if (part->master->writev_ecc == NULL)
                 return part->master->writev (part->master, vecs, count,
                                         to + part->offset, retlen);
         else
@@ -221,12 +221,12 @@ static int part_readv (struct mtd_info *mtd,  struct kvec *vecs,
                          unsigned long count, loff_t from, size_t *retlen)
 {
         struct mtd_part *part = PART(mtd);
-        if (part->master->readv_ecc == NULL)    
+        if (part->master->readv_ecc == NULL)
                 return part->master->readv (part->master, vecs, count,
                                         from + part->offset, retlen);
         else
                 return part->master->readv_ecc (part->master, vecs, count,
-                                        from + part->offset, retlen, 
+                                        from + part->offset, retlen,
                                         NULL, &mtd->oobinfo);
 }
 
@@ -252,7 +252,7 @@ static int part_readv_ecc (struct mtd_info *mtd,  struct kvec *vecs,
         if (oobsel == NULL)
                 oobsel = &mtd->oobinfo;
         return part->master->readv_ecc (part->master, vecs, count,
-                                        from + part->offset, retlen, 
+                                        from + part->offset, retlen,
                                         eccbuf, oobsel);
 }
 
@@ -286,7 +286,7 @@ EXPORT_SYMBOL_GPL(mtd_erase_callback);
 static int part_lock (struct mtd_info *mtd, loff_t ofs, size_t len)
 {
         struct mtd_part *part = PART(mtd);
-        if ((len + ofs) > mtd->size) 
+        if ((len + ofs) > mtd->size)
                 return -EINVAL;
         return part->master->lock(part->master, ofs + part->offset, len);
 }
@@ -294,7 +294,7 @@ static int part_lock (struct mtd_info *mtd, loff_t ofs, size_t len)
 static int part_unlock (struct mtd_info *mtd, loff_t ofs, size_t len)
 {
         struct mtd_part *part = PART(mtd);
-        if ((len + ofs) > mtd->size) 
+        if ((len + ofs) > mtd->size)
                 return -EINVAL;
         return part->master->unlock(part->master, ofs + part->offset, len);
 }
@@ -337,8 +337,8 @@ static int part_block_markbad (struct mtd_info *mtd, loff_t ofs)
         return part->master->block_markbad(part->master, ofs);
 }
 
-/* 
- * This function unregisters and destroy all slave MTD objects which are 
+/*
+ * This function unregisters and destroy all slave MTD objects which are
  * attached to the given master MTD object.
  */
 
@@ -371,7 +371,7 @@ int del_mtd_partitions(struct mtd_info *master)
  * (Q: should we register the master MTD object as well?)
  */
 
-int add_mtd_partitions(struct mtd_info *master, 
+int add_mtd_partitions(struct mtd_info *master,
                        const struct mtd_partition *parts,
                        int nbparts)
 {
@@ -414,7 +414,7 @@ int add_mtd_partitions(struct mtd_info *master,
                         slave->mtd.point = part_point;
                         slave->mtd.unpoint = part_unpoint;
                 }
-                
+
                 if (master->read_ecc)
                         slave->mtd.read_ecc = part_read_ecc;
                 if (master->write_ecc)
@@ -465,9 +465,10 @@ int add_mtd_partitions(struct mtd_info *master,
                 if (slave->offset == MTDPART_OFS_APPEND)
                         slave->offset = cur_offset;
                 if (slave->offset == MTDPART_OFS_NXTBLK) {
-                        u_int32_t emask = master->erasesize-1;
-                        slave->offset = (cur_offset + emask) & ~emask;
-                        if (slave->offset != cur_offset) {
+                        slave->offset = cur_offset;
+                        if ((cur_offset % master->erasesize) != 0) {
+                                /* Round up to next erasesize */
+                                slave->offset = ((cur_offset / master->erasesize) + 1) * master->erasesize;
                                 printk(KERN_NOTICE "Moving partition %d: "
                                        "0x%08x -> 0x%08x\n", i,
                                        cur_offset, slave->offset);
@@ -476,8 +477,8 @@ int add_mtd_partitions(struct mtd_info *master,
                 if (slave->mtd.size == MTDPART_SIZ_FULL)
                         slave->mtd.size = master->size - slave->offset;
                 cur_offset = slave->offset + slave->mtd.size;
-        
-                printk (KERN_NOTICE "0x%08x-0x%08x : \"%s\"\n", slave->offset, 
+
+                printk (KERN_NOTICE "0x%08x-0x%08x : \"%s\"\n", slave->offset,
                         slave->offset + slave->mtd.size, slave->mtd.name);
 
                 /* let's do some sanity checks */
@@ -497,7 +498,7 @@ int add_mtd_partitions(struct mtd_info *master,
                         /* Deal with variable erase size stuff */
                         int i;
                         struct mtd_erase_region_info *regions = master->eraseregions;
-                        
+
                         /* Find the first erase regions which is part of this partition. */
                         for (i=0; i < master->numeraseregions && slave->offset >= regions[i].offset; i++)
                                 ;
@@ -512,7 +513,7 @@ int add_mtd_partitions(struct mtd_info *master,
                         slave->mtd.erasesize = master->erasesize;
                 }
 
-                if ((slave->mtd.flags & MTD_WRITEABLE) && 
+                if ((slave->mtd.flags & MTD_WRITEABLE) &&
                     (slave->offset % slave->mtd.erasesize)) {
                         /* Doesn't start on a boundary of major erase size */
                         /* FIXME: Let it be writable if it is on a boundary of _minor_ erase size though */
@@ -520,14 +521,14 @@ int add_mtd_partitions(struct mtd_info *master,
                         printk ("mtd: partition \"%s\" doesn't start on an erase block boundary -- force read-only\n",
                                 parts[i].name);
                 }
-                if ((slave->mtd.flags & MTD_WRITEABLE) && 
+                if ((slave->mtd.flags & MTD_WRITEABLE) &&
                     (slave->mtd.size % slave->mtd.erasesize)) {
                         slave->mtd.flags &= ~MTD_WRITEABLE;
                         printk ("mtd: partition \"%s\" doesn't end on an erase block -- force read-only\n",
                                 parts[i].name);
                 }
 
-                /* copy oobinfo from master */ 
+                /* copy oobinfo from master */
                 memcpy(&slave->mtd.oobinfo, &master->oobinfo, sizeof(slave->mtd.oobinfo));
 
                 if(parts[i].mtdp)
@@ -588,12 +589,12 @@ int deregister_mtd_parser(struct mtd_part_parser *p)
         return 0;
 }
 
-int parse_mtd_partitions(struct mtd_info *master, const char **types, 
+int parse_mtd_partitions(struct mtd_info *master, const char **types,
                          struct mtd_partition **pparts, unsigned long origin)
 {
         struct mtd_part_parser *parser;
         int ret = 0;
-                
+
         for ( ; ret <= 0 && *types; types++) {
                 parser = get_partition_parser(*types);
 #ifdef CONFIG_KMOD
@@ -607,7 +608,7 @@ int parse_mtd_partitions(struct mtd_info *master, const char **types,
                 }
                 ret = (*parser->parse_fn)(master, pparts, origin);
                 if (ret > 0) {
-                        printk(KERN_NOTICE "%d %s partitions found on MTD device %s\n", 
+                        printk(KERN_NOTICE "%d %s partitions found on MTD device %s\n",
                                ret, parser->name, master->name);
                 }
                 put_partition_parser(parser);
diff --git a/drivers/mtd/nand/Kconfig b/drivers/mtd/nand/Kconfig
index 36d34e5e5a5a..1fc4c134d939 100644
--- a/drivers/mtd/nand/Kconfig
+++ b/drivers/mtd/nand/Kconfig
@@ -1,5 +1,5 @@
 # drivers/mtd/nand/Kconfig
-# $Id: Kconfig,v 1.31 2005/06/20 12:03:21 bjd Exp $
+# $Id: Kconfig,v 1.35 2005/11/07 11:14:30 gleixner Exp $
 
 menu "NAND Flash Device Drivers"
         depends on MTD!=n
@@ -25,33 +25,33 @@ config MTD_NAND_VERIFY_WRITE
 
 config MTD_NAND_AUTCPU12
         tristate "SmartMediaCard on autronix autcpu12 board"
-        depends on ARM && MTD_NAND && ARCH_AUTCPU12
+        depends on MTD_NAND && ARCH_AUTCPU12
         help
-          This enables the driver for the autronix autcpu12 board to 
+          This enables the driver for the autronix autcpu12 board to
           access the SmartMediaCard.
 
 config MTD_NAND_EDB7312
         tristate "Support for Cirrus Logic EBD7312 evaluation board"
-        depends on ARM && MTD_NAND && ARCH_EDB7312
+        depends on MTD_NAND && ARCH_EDB7312
         help
-          This enables the driver for the Cirrus Logic EBD7312 evaluation 
+          This enables the driver for the Cirrus Logic EBD7312 evaluation
           board to access the onboard NAND Flash.
 
 config MTD_NAND_H1900
         tristate "iPAQ H1900 flash"
-        depends on ARM && MTD_NAND && ARCH_PXA && MTD_PARTITIONS
+        depends on MTD_NAND && ARCH_PXA && MTD_PARTITIONS
         help
           This enables the driver for the iPAQ h1900 flash.
 
 config MTD_NAND_SPIA
         tristate "NAND Flash device on SPIA board"
-        depends on ARM && ARCH_P720T && MTD_NAND
+        depends on ARCH_P720T && MTD_NAND
         help
           If you had to ask, you don't have one. Say 'N'.
 
 config MTD_NAND_TOTO
         tristate "NAND Flash device on TOTO board"
-        depends on ARM && ARCH_OMAP && MTD_NAND
+        depends on ARCH_OMAP && MTD_NAND
         help
           Support for NAND flash on Texas Instruments Toto platform.
 
@@ -59,8 +59,8 @@ config MTD_NAND_IDS
         tristate
 
 config MTD_NAND_AU1550
-        tristate "Au1550 NAND support"
-        depends on SOC_AU1550 && MTD_NAND
+        tristate "Au1550/1200 NAND support"
+        depends on (SOC_AU1200 || SOC_AU1550) && MTD_NAND
         help
           This enables the driver for the NAND flash controller on the
           AMD/Alchemy 1550 SOC.
@@ -71,7 +71,7 @@ config MTD_NAND_RTC_FROM4
         select REED_SOLOMON
         select REED_SOLOMON_DEC8
         help
-          This enables the driver for the Renesas Technology AG-AND 
+          This enables the driver for the Renesas Technology AG-AND
           flash interface board (FROM_BOARD4)
 
 config MTD_NAND_PPCHAMELEONEVB
@@ -88,7 +88,7 @@ config MTD_NAND_S3C2410
           SoCs
 
           No board specfic support is done by this driver, each board
-          must advertise a platform_device for the driver to attach. 
+          must advertise a platform_device for the driver to attach.
 
 config MTD_NAND_S3C2410_DEBUG
         bool "S3C2410 NAND driver debug"
@@ -181,7 +181,7 @@ config MTD_NAND_DISKONCHIP_BBTWRITE
           
  config MTD_NAND_SHARPSL
         bool "Support for NAND Flash on Sharp SL Series (C7xx + others)"
-        depends on MTD_NAND     && ARCH_PXA
+        depends on MTD_NAND && ARCH_PXA
  
  config MTD_NAND_NANDSIM
         bool "Support for NAND Flash Simulator"
diff --git a/drivers/mtd/nand/au1550nd.c b/drivers/mtd/nand/au1550nd.c
index 4c7719ce3f48..3cafcdf28aed 100644
--- a/drivers/mtd/nand/au1550nd.c
+++ b/drivers/mtd/nand/au1550nd.c
@@ -3,7 +3,7 @@
  *
  *  Copyright (C) 2004 Embedded Edge, LLC
  *
- * $Id: au1550nd.c,v 1.11 2004/11/04 12:53:10 gleixner Exp $
+ * $Id: au1550nd.c,v 1.13 2005/11/07 11:14:30 gleixner Exp $
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 as
@@ -21,20 +21,14 @@
 
 /* fixme: this is ugly */
 #if LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 0)
-#include <asm/mach-au1x00/au1000.h>
-#ifdef CONFIG_MIPS_PB1550
-#include <asm/mach-pb1x00/pb1550.h> 
-#endif
-#ifdef CONFIG_MIPS_DB1550
-#include <asm/mach-db1x00/db1x00.h> 
-#endif
+#include <asm/mach-au1x00/au1xxx.h>
 #else
 #include <asm/au1000.h>
 #ifdef CONFIG_MIPS_PB1550
-#include <asm/pb1550.h> 
+#include <asm/pb1550.h>
 #endif
 #ifdef CONFIG_MIPS_DB1550
-#include <asm/db1x00.h> 
+#include <asm/db1x00.h>
 #endif
 #endif
 
@@ -45,39 +39,22 @@ static struct mtd_info *au1550_mtd = NULL;
 static void __iomem *p_nand;
 static int nand_width = 1; /* default x8*/
 
-#define NAND_CS 1
-
 /*
  * Define partitions for flash device
  */
 const static struct mtd_partition partition_info[] = {
-#ifdef CONFIG_MIPS_PB1550
-#define NUM_PARTITIONS            2
-        { 
-                .name = "Pb1550 NAND FS 0",
+        {
+                .name   = "NAND FS 0",
                 .offset = 0,
-                .size = 8*1024*1024 
+                .size   = 8*1024*1024
         },
-        { 
-                .name = "Pb1550 NAND FS 1",
+        {
+                .name   = "NAND FS 1",
                 .offset =  MTDPART_OFS_APPEND,
-                .size =    MTDPART_SIZ_FULL
+                .size   =    MTDPART_SIZ_FULL
         }
-#endif
-#ifdef CONFIG_MIPS_DB1550
-#define NUM_PARTITIONS            2
-        { 
-                .name = "Db1550 NAND FS 0",
-                .offset = 0,
-                .size = 8*1024*1024 
-        },
-        { 
-                .name = "Db1550 NAND FS 1",
-                .offset =  MTDPART_OFS_APPEND,
-                .size =    MTDPART_SIZ_FULL
-        }
-#endif
 };
+#define NB_OF(x)  (sizeof(x)/sizeof(x[0]))
 
 
 /**
@@ -112,7 +89,7 @@ static void au_write_byte(struct mtd_info *mtd, u_char byte)
  * au_read_byte16 -  read one byte endianess aware from the chip
  * @mtd:        MTD device structure
  *
- *  read function for 16bit buswith with 
+ *  read function for 16bit buswith with
  * endianess conversion
  */
 static u_char au_read_byte16(struct mtd_info *mtd)
@@ -142,7 +119,7 @@ static void au_write_byte16(struct mtd_info *mtd, u_char byte)
  * au_read_word -  read one word from the chip
  * @mtd:        MTD device structure
  *
- *  read function for 16bit buswith without 
+ *  read function for 16bit buswith without
  * endianess conversion
  */
 static u16 au_read_word(struct mtd_info *mtd)
@@ -158,7 +135,7 @@ static u16 au_read_word(struct mtd_info *mtd)
  * @mtd:        MTD device structure
  * @word:       data word to write
  *
- *  write function for 16bit buswith without 
+ *  write function for 16bit buswith without
  * endianess conversion
  */
 static void au_write_word(struct mtd_info *mtd, u16 word)
@@ -188,7 +165,7 @@ static void au_write_buf(struct mtd_info *mtd, const u_char *buf, int len)
 }
 
 /**
- * au_read_buf -  read chip data into buffer 
+ * au_read_buf -  read chip data into buffer
  * @mtd:        MTD device structure
  * @buf:        buffer to store date
  * @len:        number of bytes to read
@@ -202,12 +179,12 @@ static void au_read_buf(struct mtd_info *mtd, u_char *buf, int len)
 
         for (i=0; i<len; i++) {
                 buf[i] = readb(this->IO_ADDR_R);
-                au_sync();      
+                au_sync();
         }
 }
 
 /**
- * au_verify_buf -  Verify chip data against buffer 
+ * au_verify_buf -  Verify chip data against buffer
  * @mtd:        MTD device structure
  * @buf:        buffer containing the data to compare
  * @len:        number of bytes to compare
@@ -242,16 +219,16 @@ static void au_write_buf16(struct mtd_info *mtd, const u_char *buf, int len)
         struct nand_chip *this = mtd->priv;
         u16 *p = (u16 *) buf;
         len >>= 1;
-        
+
         for (i=0; i<len; i++) {
                 writew(p[i], this->IO_ADDR_W);
                 au_sync();
         }
-                
+
 }
 
 /**
- * au_read_buf16 -  read chip data into buffer 
+ * au_read_buf16 -  read chip data into buffer
  * @mtd:        MTD device structure
  * @buf:        buffer to store date
  * @len:        number of bytes to read
@@ -272,7 +249,7 @@ static void au_read_buf16(struct mtd_info *mtd, u_char *buf, int len)
 }
 
 /**
- * au_verify_buf16 -  Verify chip data against buffer 
+ * au_verify_buf16 -  Verify chip data against buffer
  * @mtd:        MTD device structure
  * @buf:        buffer containing the data to compare
  * @len:        number of bytes to compare
@@ -305,26 +282,26 @@ static void au1550_hwcontrol(struct mtd_info *mtd, int cmd)
         case NAND_CTL_CLRCLE: this->IO_ADDR_W = p_nand + MEM_STNAND_DATA; break;
 
         case NAND_CTL_SETALE: this->IO_ADDR_W = p_nand + MEM_STNAND_ADDR; break;
-        case NAND_CTL_CLRALE: 
-                this->IO_ADDR_W = p_nand + MEM_STNAND_DATA; 
-                /* FIXME: Nobody knows why this is neccecary, 
+        case NAND_CTL_CLRALE:
+                this->IO_ADDR_W = p_nand + MEM_STNAND_DATA;
+                /* FIXME: Nobody knows why this is neccecary,
                  * but it works only that way */
-                udelay(1); 
+                udelay(1);
                 break;
 
-        case NAND_CTL_SETNCE: 
+        case NAND_CTL_SETNCE:
                 /* assert (force assert) chip enable */
                 au_writel((1<<(4+NAND_CS)) , MEM_STNDCTL); break;
                 break;
 
-        case NAND_CTL_CLRNCE: 
+        case NAND_CTL_CLRNCE:
                 /* deassert chip enable */
                 au_writel(0, MEM_STNDCTL); break;
                 break;
         }
 
         this->IO_ADDR_R = this->IO_ADDR_W;
-        
+
         /* Drain the writebuffer */
         au_sync();
 }
@@ -339,14 +316,16 @@ int au1550_device_ready(struct mtd_info *mtd)
 /*
  * Main initialization routine
  */
-int __init au1550_init (void)
+int __init au1xxx_nand_init (void)
 {
         struct nand_chip *this;
         u16 boot_swapboot = 0; /* default value */
         int retval;
+        u32 mem_staddr;
+        u32 nand_phys;
 
         /* Allocate memory for MTD device structure and private data */
-        au1550_mtd = kmalloc (sizeof(struct mtd_info) + 
+        au1550_mtd = kmalloc (sizeof(struct mtd_info) +
                         sizeof (struct nand_chip), GFP_KERNEL);
         if (!au1550_mtd) {
                 printk ("Unable to allocate NAND MTD dev structure.\n");
@@ -364,14 +343,17 @@ int __init au1550_init (void)
         au1550_mtd->priv = this;
 
 
-        /* MEM_STNDCTL: disable ints, disable nand boot */
-        au_writel(0, MEM_STNDCTL);
+        /* disable interrupts */
+        au_writel(au_readl(MEM_STNDCTL) & ~(1<<8), MEM_STNDCTL);
+
+        /* disable NAND boot */
+        au_writel(au_readl(MEM_STNDCTL) & ~(1<<0), MEM_STNDCTL);
 
 #ifdef CONFIG_MIPS_PB1550
         /* set gpio206 high */
         au_writel(au_readl(GPIO2_DIR) & ~(1<<6), GPIO2_DIR);
 
-        boot_swapboot = (au_readl(MEM_STSTAT) & (0x7<<1)) | 
+        boot_swapboot = (au_readl(MEM_STSTAT) & (0x7<<1)) |
                 ((bcsr->status >> 6)  & 0x1);
         switch (boot_swapboot) {
                 case 0:
@@ -397,25 +379,66 @@ int __init au1550_init (void)
         }
 #endif
 
-        /* Configure RCE1 - should be done by YAMON */
-        au_writel(0x5 | (nand_width << 22), 0xB4001010); /* MEM_STCFG1 */
-        au_writel(NAND_TIMING, 0xB4001014); /* MEM_STTIME1 */
-        au_sync();
+        /* Configure chip-select; normally done by boot code, e.g. YAMON */
+#ifdef NAND_STCFG
+        if (NAND_CS == 0) {
+                au_writel(NAND_STCFG,  MEM_STCFG0);
+                au_writel(NAND_STTIME, MEM_STTIME0);
+                au_writel(NAND_STADDR, MEM_STADDR0);
+        }
+        if (NAND_CS == 1) {
+                au_writel(NAND_STCFG,  MEM_STCFG1);
+                au_writel(NAND_STTIME, MEM_STTIME1);
+                au_writel(NAND_STADDR, MEM_STADDR1);
+        }
+        if (NAND_CS == 2) {
+                au_writel(NAND_STCFG,  MEM_STCFG2);
+                au_writel(NAND_STTIME, MEM_STTIME2);
+                au_writel(NAND_STADDR, MEM_STADDR2);
+        }
+        if (NAND_CS == 3) {
+                au_writel(NAND_STCFG,  MEM_STCFG3);
+                au_writel(NAND_STTIME, MEM_STTIME3);
+                au_writel(NAND_STADDR, MEM_STADDR3);
+        }
+#endif
 
-        /* setup and enable chip select, MEM_STADDR1 */
-        /* we really need to decode offsets only up till 0x20 */
-        au_writel((1<<28) | (NAND_PHYS_ADDR>>4) | 
-                        (((NAND_PHYS_ADDR + 0x1000)-1) & (0x3fff<<18)>>18), 
-                        MEM_STADDR1);
-        au_sync();
+        /* Locate NAND chip-select in order to determine NAND phys address */
+        mem_staddr = 0x00000000;
+        if (((au_readl(MEM_STCFG0) & 0x7) == 0x5) && (NAND_CS == 0))
+                mem_staddr = au_readl(MEM_STADDR0);
+        else if (((au_readl(MEM_STCFG1) & 0x7) == 0x5) && (NAND_CS == 1))
+                mem_staddr = au_readl(MEM_STADDR1);
+        else if (((au_readl(MEM_STCFG2) & 0x7) == 0x5) && (NAND_CS == 2))
+                mem_staddr = au_readl(MEM_STADDR2);
+        else if (((au_readl(MEM_STCFG3) & 0x7) == 0x5) && (NAND_CS == 3))
+                mem_staddr = au_readl(MEM_STADDR3);
+
+        if (mem_staddr == 0x00000000) {
+                printk("Au1xxx NAND: ERROR WITH NAND CHIP-SELECT\n");
+                kfree(au1550_mtd);
+                return 1;
+        }
+        nand_phys = (mem_staddr << 4) & 0xFFFC0000;
+
+        p_nand = (void __iomem *)ioremap(nand_phys, 0x1000);
+
+        /* make controller and MTD agree */
+        if (NAND_CS == 0)
+                nand_width = au_readl(MEM_STCFG0) & (1<<22);
+        if (NAND_CS == 1)
+                nand_width = au_readl(MEM_STCFG1) & (1<<22);
+        if (NAND_CS == 2)
+                nand_width = au_readl(MEM_STCFG2) & (1<<22);
+        if (NAND_CS == 3)
+                nand_width = au_readl(MEM_STCFG3) & (1<<22);
 
-        p_nand = ioremap(NAND_PHYS_ADDR, 0x1000);
 
         /* Set address of hardware control function */
         this->hwcontrol = au1550_hwcontrol;
         this->dev_ready = au1550_device_ready;
         /* 30 us command delay time */
-        this->chip_delay = 30;          
+        this->chip_delay = 30;
         this->eccmode = NAND_ECC_SOFT;
 
         this->options = NAND_NO_AUTOINCR;
@@ -438,19 +461,19 @@ int __init au1550_init (void)
         }
 
         /* Register the partitions */
-        add_mtd_partitions(au1550_mtd, partition_info, NUM_PARTITIONS);
+        add_mtd_partitions(au1550_mtd, partition_info, NB_OF(partition_info));
 
         return 0;
 
  outio:
         iounmap ((void *)p_nand);
-        
+
  outmem:
         kfree (au1550_mtd);
         return retval;
 }
 
-module_init(au1550_init);
+module_init(au1xxx_nand_init);
 
 /*
  * Clean up routine
diff --git a/drivers/mtd/nand/autcpu12.c b/drivers/mtd/nand/autcpu12.c
index 4afa8ced05ad..056dfc17a075 100644
--- a/drivers/mtd/nand/autcpu12.c
+++ b/drivers/mtd/nand/autcpu12.c
@@ -5,8 +5,8 @@
  *
  *  Derived from drivers/mtd/spia.c
  *       Copyright (C) 2000 Steven J. Hill (sjhill@realitydiluted.com)
- * 
- * $Id: autcpu12.c,v 1.22 2004/11/04 12:53:10 gleixner Exp $
+ *
+ * $Id: autcpu12.c,v 1.23 2005/11/07 11:14:30 gleixner Exp $
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 as
@@ -14,7 +14,7 @@
  *
  *  Overview:
  *   This is a device driver for the NAND flash device found on the
- *   autronix autcpu12 board, which is a SmartMediaCard. It supports 
+ *   autronix autcpu12 board, which is a SmartMediaCard. It supports
  *   16MiB, 32MiB and 64MiB cards.
  *
  *
@@ -93,7 +93,7 @@ static struct mtd_partition partition_info128k[] = {
 #define NUM_PARTITIONS32K 2
 #define NUM_PARTITIONS64K 2
 #define NUM_PARTITIONS128K 2
-/* 
+/*
  *      hardware specific access to control-lines
 */
 static void autcpu12_hwcontrol(struct mtd_info *mtd, int cmd)
@@ -163,7 +163,7 @@ int __init autcpu12_init (void)
         this->hwcontrol = autcpu12_hwcontrol;
         this->dev_ready = autcpu12_device_ready;
         /* 20 us command delay time */
-        this->chip_delay = 20;          
+        this->chip_delay = 20;
         this->eccmode = NAND_ECC_SOFT;
 
         /* Enable the following for a flash based bad block table */
@@ -171,21 +171,21 @@ int __init autcpu12_init (void)
         this->options = NAND_USE_FLASH_BBT;
         */
         this->options = NAND_USE_FLASH_BBT;
-        
+
         /* Scan to find existance of the device */
         if (nand_scan (autcpu12_mtd, 1)) {
                 err = -ENXIO;
                 goto out_ior;
         }
-        
+
         /* Register the partitions */
         switch(autcpu12_mtd->size){
                 case SZ_16M: add_mtd_partitions(autcpu12_mtd, partition_info16k, NUM_PARTITIONS16K); break;
                 case SZ_32M: add_mtd_partitions(autcpu12_mtd, partition_info32k, NUM_PARTITIONS32K); break;
-                case SZ_64M: add_mtd_partitions(autcpu12_mtd, partition_info64k, NUM_PARTITIONS64K); break; 
-                case SZ_128M: add_mtd_partitions(autcpu12_mtd, partition_info128k, NUM_PARTITIONS128K); break; 
+                case SZ_64M: add_mtd_partitions(autcpu12_mtd, partition_info64k, NUM_PARTITIONS64K); break;
+                case SZ_128M: add_mtd_partitions(autcpu12_mtd, partition_info128k, NUM_PARTITIONS128K); break;
                 default: {
-                        printk ("Unsupported SmartMedia device\n"); 
+                        printk ("Unsupported SmartMedia device\n");
                         err = -ENXIO;
                         goto out_ior;
                 }
@@ -213,7 +213,7 @@ static void __exit autcpu12_cleanup (void)
 
         /* unmap physical adress */
         iounmap((void *)autcpu12_fio_base);
-        
+
         /* Free the MTD device structure */
         kfree (autcpu12_mtd);
 }
diff --git a/drivers/mtd/nand/diskonchip.c b/drivers/mtd/nand/diskonchip.c
index fdb5d4ad3d52..21d4e8f4b7af 100644
--- a/drivers/mtd/nand/diskonchip.c
+++ b/drivers/mtd/nand/diskonchip.c
@@ -1,4 +1,4 @@
-/* 
+/*
  * drivers/mtd/nand/diskonchip.c
  *
  * (C) 2003 Red Hat, Inc.
@@ -8,15 +8,15 @@
  * Author: David Woodhouse <dwmw2@infradead.org>
  * Additional Diskonchip 2000 and Millennium support by Dan Brown <dan_brown@ieee.org>
  * Diskonchip Millennium Plus support by Kalev Lember <kalev@smartlink.ee>
- * 
+ *
  * Error correction code lifted from the old docecc code
- * Author: Fabrice Bellard (fabrice.bellard@netgem.com) 
+ * Author: Fabrice Bellard (fabrice.bellard@netgem.com)
  * Copyright (C) 2000 Netgem S.A.
  * converted to the generic Reed-Solomon library by Thomas Gleixner <tglx@linutronix.de>
- *  
+ *
  * Interface to generic NAND code for M-Systems DiskOnChip devices
  *
- * $Id: diskonchip.c,v 1.54 2005/04/07 14:22:55 dbrown Exp $
+ * $Id: diskonchip.c,v 1.55 2005/11/07 11:14:30 gleixner Exp $
  */
 
 #include <linux/kernel.h>
@@ -42,16 +42,16 @@
 static unsigned long __initdata doc_locations[] = {
 #if defined (__alpha__) || defined(__i386__) || defined(__x86_64__)
 #ifdef CONFIG_MTD_NAND_DISKONCHIP_PROBE_HIGH
-        0xfffc8000, 0xfffca000, 0xfffcc000, 0xfffce000, 
+        0xfffc8000, 0xfffca000, 0xfffcc000, 0xfffce000,
         0xfffd0000, 0xfffd2000, 0xfffd4000, 0xfffd6000,
-        0xfffd8000, 0xfffda000, 0xfffdc000, 0xfffde000, 
-        0xfffe0000, 0xfffe2000, 0xfffe4000, 0xfffe6000, 
+        0xfffd8000, 0xfffda000, 0xfffdc000, 0xfffde000,
+        0xfffe0000, 0xfffe2000, 0xfffe4000, 0xfffe6000,
         0xfffe8000, 0xfffea000, 0xfffec000, 0xfffee000,
 #else /*  CONFIG_MTD_DOCPROBE_HIGH */
-        0xc8000, 0xca000, 0xcc000, 0xce000, 
+        0xc8000, 0xca000, 0xcc000, 0xce000,
         0xd0000, 0xd2000, 0xd4000, 0xd6000,
-        0xd8000, 0xda000, 0xdc000, 0xde000, 
-        0xe0000, 0xe2000, 0xe4000, 0xe6000, 
+        0xd8000, 0xda000, 0xdc000, 0xde000,
+        0xe0000, 0xe2000, 0xe4000, 0xe6000,
         0xe8000, 0xea000, 0xec000, 0xee000,
 #endif /*  CONFIG_MTD_DOCPROBE_HIGH */
 #elif defined(__PPC__)
@@ -138,7 +138,7 @@ MODULE_PARM_DESC(doc_config_location, "Physical memory address at which to probe
 /* the Reed Solomon control structure */
 static struct rs_control *rs_decoder;
 
-/* 
+/*
  * The HW decoder in the DoC ASIC's provides us a error syndrome,
  * which we must convert to a standard syndrom usable by the generic
  * Reed-Solomon library code.
@@ -163,8 +163,8 @@ static int doc_ecc_decode (struct rs_control *rs, uint8_t *data, uint8_t *ecc)
         /* Initialize the syndrom buffer */
         for (i = 0; i < NROOTS; i++)
                 s[i] = ds[0];
-        /* 
-         *  Evaluate 
+        /*
+         *  Evaluate
          *  s[i] = ds[3]x^3 + ds[2]x^2 + ds[1]x^1 + ds[0]
          *  where x = alpha^(FCR + i)
          */
@@ -188,7 +188,7 @@ static int doc_ecc_decode (struct rs_control *rs, uint8_t *data, uint8_t *ecc)
         if (nerr < 0)
                 return nerr;
 
-        /* 
+        /*
          * Correct the errors. The bitpositions are a bit of magic,
          * but they are given by the design of the de/encoder circuit
          * in the DoC ASIC's.
@@ -205,7 +205,7 @@ static int doc_ecc_decode (struct rs_control *rs, uint8_t *data, uint8_t *ecc)
                            can be modified since pos is even */
                         index = (pos >> 3) ^ 1;
                         bitpos = pos & 7;
-                        if ((index >= 0 && index < SECTOR_SIZE) || 
+                        if ((index >= 0 && index < SECTOR_SIZE) ||
                             index == (SECTOR_SIZE + 1)) {
                                 val = (uint8_t) (errval[i] >> (2 + bitpos));
                                 parity ^= val;
@@ -216,7 +216,7 @@ static int doc_ecc_decode (struct rs_control *rs, uint8_t *data, uint8_t *ecc)
                         bitpos = (bitpos + 10) & 7;
                         if (bitpos == 0)
                                 bitpos = 8;
-                        if ((index >= 0 && index < SECTOR_SIZE) || 
+                        if ((index >= 0 && index < SECTOR_SIZE) ||
                             index == (SECTOR_SIZE + 1)) {
                                 val = (uint8_t)(errval[i] << (8 - bitpos));
                                 parity ^= val;
@@ -233,7 +233,7 @@ static void DoC_Delay(struct doc_priv *doc, unsigned short cycles)
 {
         volatile char dummy;
         int i;
-        
+
         for (i = 0; i < cycles; i++) {
                 if (DoC_is_Millennium(doc))
                         dummy = ReadDOC(doc->virtadr, NOP);
@@ -242,7 +242,7 @@ static void DoC_Delay(struct doc_priv *doc, unsigned short cycles)
                 else
                         dummy = ReadDOC(doc->virtadr, DOCStatus);
         }
-        
+
 }
 
 #define CDSN_CTRL_FR_B_MASK     (CDSN_CTRL_FR_B0 | CDSN_CTRL_FR_B1)
@@ -327,7 +327,7 @@ static u_char doc2000_read_byte(struct mtd_info *mtd)
         return ret;
 }
 
-static void doc2000_writebuf(struct mtd_info *mtd, 
+static void doc2000_writebuf(struct mtd_info *mtd,
                              const u_char *buf, int len)
 {
         struct nand_chip *this = mtd->priv;
@@ -343,7 +343,7 @@ static void doc2000_writebuf(struct mtd_info *mtd,
         if (debug) printk("\n");
 }
 
-static void doc2000_readbuf(struct mtd_info *mtd, 
+static void doc2000_readbuf(struct mtd_info *mtd,
                             u_char *buf, int len)
 {
         struct nand_chip *this = mtd->priv;
@@ -358,7 +358,7 @@ static void doc2000_readbuf(struct mtd_info *mtd,
         }
 }
 
-static void doc2000_readbuf_dword(struct mtd_info *mtd, 
+static void doc2000_readbuf_dword(struct mtd_info *mtd,
                             u_char *buf, int len)
 {
         struct nand_chip *this = mtd->priv;
@@ -379,7 +379,7 @@ static void doc2000_readbuf_dword(struct mtd_info *mtd,
         }
 }
 
-static int doc2000_verifybuf(struct mtd_info *mtd, 
+static int doc2000_verifybuf(struct mtd_info *mtd,
                               const u_char *buf, int len)
 {
         struct nand_chip *this = mtd->priv;
@@ -406,12 +406,12 @@ static uint16_t __init doc200x_ident_chip(struct mtd_info *mtd, int nr)
         doc200x_hwcontrol(mtd, NAND_CTL_SETALE);
         this->write_byte(mtd, 0);
         doc200x_hwcontrol(mtd, NAND_CTL_CLRALE);
-        
+
         /* We cant' use dev_ready here, but at least we wait for the
-         * command to complete 
+         * command to complete
          */
         udelay(50);
-        
+
         ret = this->read_byte(mtd) << 8;
         ret |= this->read_byte(mtd);
 
@@ -438,7 +438,7 @@ static uint16_t __init doc200x_ident_chip(struct mtd_info *mtd, int nr)
                         this->read_buf = &doc2000_readbuf_dword;
                 }
         }
-                
+
         return ret;
 }
 
@@ -469,7 +469,7 @@ static int doc200x_wait(struct mtd_info *mtd, struct nand_chip *this, int state)
         struct doc_priv *doc = this->priv;
 
         int status;
-        
+
         DoC_WaitReady(doc);
         this->cmdfunc(mtd, NAND_CMD_STATUS, -1, -1);
         DoC_WaitReady(doc);
@@ -503,7 +503,7 @@ static u_char doc2001_read_byte(struct mtd_info *mtd)
         return ReadDOC(docptr, LastDataRead);
 }
 
-static void doc2001_writebuf(struct mtd_info *mtd, 
+static void doc2001_writebuf(struct mtd_info *mtd,
                              const u_char *buf, int len)
 {
         struct nand_chip *this = mtd->priv;
@@ -517,7 +517,7 @@ static void doc2001_writebuf(struct mtd_info *mtd,
         WriteDOC(0x00, docptr, WritePipeTerm);
 }
 
-static void doc2001_readbuf(struct mtd_info *mtd, 
+static void doc2001_readbuf(struct mtd_info *mtd,
                             u_char *buf, int len)
 {
         struct nand_chip *this = mtd->priv;
@@ -535,7 +535,7 @@ static void doc2001_readbuf(struct mtd_info *mtd,
         buf[i] = ReadDOC(docptr, LastDataRead);
 }
 
-static int doc2001_verifybuf(struct mtd_info *mtd, 
+static int doc2001_verifybuf(struct mtd_info *mtd,
                              const u_char *buf, int len)
 {
         struct nand_chip *this = mtd->priv;
@@ -570,7 +570,7 @@ static u_char doc2001plus_read_byte(struct mtd_info *mtd)
         return ret;
 }
 
-static void doc2001plus_writebuf(struct mtd_info *mtd, 
+static void doc2001plus_writebuf(struct mtd_info *mtd,
                              const u_char *buf, int len)
 {
         struct nand_chip *this = mtd->priv;
@@ -587,7 +587,7 @@ static void doc2001plus_writebuf(struct mtd_info *mtd,
         if (debug) printk("\n");
 }
 
-static void doc2001plus_readbuf(struct mtd_info *mtd, 
+static void doc2001plus_readbuf(struct mtd_info *mtd,
                             u_char *buf, int len)
 {
         struct nand_chip *this = mtd->priv;
@@ -617,7 +617,7 @@ static void doc2001plus_readbuf(struct mtd_info *mtd,
         if (debug) printk("\n");
 }
 
-static int doc2001plus_verifybuf(struct mtd_info *mtd, 
+static int doc2001plus_verifybuf(struct mtd_info *mtd,
                              const u_char *buf, int len)
 {
         struct nand_chip *this = mtd->priv;
@@ -797,7 +797,7 @@ static void doc2001plus_command (struct mtd_info *mtd, unsigned command, int col
                         WriteDOC(0, docptr, Mplus_FlashControl);
         }
 
-        /* 
+        /*
          * program and erase have their own busy handlers
          * status and sequential in needs no delay
         */
@@ -822,7 +822,7 @@ static void doc2001plus_command (struct mtd_info *mtd, unsigned command, int col
 
         /* This applies to read commands */
         default:
-                /* 
+                /*
                  * If we don't have access to the busy pin, we apply the given
                  * command delay
                 */
@@ -945,7 +945,7 @@ static int doc200x_calculate_ecc(struct mtd_info *mtd, const u_char *dat,
         for (i = 0; i < 6; i++) {
                 if (DoC_is_MillenniumPlus(doc))
                         ecc_code[i] = ReadDOC_(docptr, DoC_Mplus_ECCSyndrome0 + i);
-                else 
+                else
                         ecc_code[i] = ReadDOC_(docptr, DoC_ECCSyndrome0 + i);
                 if (ecc_code[i] != empty_write_ecc[i])
                         emptymatch = 0;
@@ -982,7 +982,7 @@ static int doc200x_correct_data(struct mtd_info *mtd, u_char *dat, u_char *read_
         void __iomem *docptr = doc->virtadr;
         volatile u_char dummy;
         int emptymatch = 1;
-        
+
         /* flush the pipeline */
         if (DoC_is_2000(doc)) {
                 dummy = ReadDOC(docptr, 2k_ECCStatus);
@@ -997,7 +997,7 @@ static int doc200x_correct_data(struct mtd_info *mtd, u_char *dat, u_char *read_
                 dummy = ReadDOC(docptr, ECCConf);
                 dummy = ReadDOC(docptr, ECCConf);
         }
-        
+
         /* Error occured ? */
         if (dummy & 0x80) {
                 for (i = 0; i < 6; i++) {
@@ -1035,7 +1035,7 @@ static int doc200x_correct_data(struct mtd_info *mtd, u_char *dat, u_char *read_
                 if (!emptymatch) ret = doc_ecc_decode (rs_decoder, dat, calc_ecc);
                 if (ret > 0)
                         printk(KERN_ERR "doc200x_correct_data corrected %d errors\n", ret);
-        }       
+        }
         if (DoC_is_MillenniumPlus(doc))
                 WriteDOC(DOC_ECC_DIS, docptr, Mplus_ECCConf);
         else
@@ -1046,7 +1046,7 @@ static int doc200x_correct_data(struct mtd_info *mtd, u_char *dat, u_char *read_
         }
         return ret;
 }
-                
+
 //u_char mydatabuf[528];
 
 /* The strange out-of-order .oobfree list below is a (possibly unneeded)
@@ -1065,7 +1065,7 @@ static struct nand_oobinfo doc200x_oobinfo = {
         .eccpos = {0, 1, 2, 3, 4, 5},
         .oobfree = { {8, 8}, {6, 2} }
 };
- 
+
 /* Find the (I)NFTL Media Header, and optionally also the mirror media header.
    On sucessful return, buf will contain a copy of the media header for
    further processing.  id is the string to scan for, and will presumably be
@@ -1251,7 +1251,7 @@ static inline int __init inftl_partscan(struct mtd_info *mtd,
         mh->BlockMultiplierBits = le32_to_cpu(mh->BlockMultiplierBits);
         mh->FormatFlags = le32_to_cpu(mh->FormatFlags);
         mh->PercentUsed = le32_to_cpu(mh->PercentUsed);
- 
+
         printk(KERN_INFO "    bootRecordID          = %s\n"
                          "    NoOfBootImageBlocks   = %d\n"
                          "    NoOfBinaryPartitions  = %d\n"
@@ -1468,7 +1468,7 @@ static inline int __init doc2001_init(struct mtd_info *mtd)
         ReadDOC(doc->virtadr, ChipID);
         if (ReadDOC(doc->virtadr, ChipID) != DOC_ChipID_DocMil) {
                 /* It's not a Millennium; it's one of the newer
-                   DiskOnChip 2000 units with a similar ASIC. 
+                   DiskOnChip 2000 units with a similar ASIC.
                    Treat it like a Millennium, except that it
                    can have multiple chips. */
                 doc2000_count_chips(mtd);
@@ -1530,20 +1530,20 @@ static inline int __init doc_probe(unsigned long physadr)
          * to the DOCControl register. So we store the current contents
          * of the DOCControl register's location, in case we later decide
          * that it's not a DiskOnChip, and want to put it back how we
-         * found it. 
+         * found it.
          */
         save_control = ReadDOC(virtadr, DOCControl);
 
         /* Reset the DiskOnChip ASIC */
-        WriteDOC(DOC_MODE_CLR_ERR | DOC_MODE_MDWREN | DOC_MODE_RESET, 
+        WriteDOC(DOC_MODE_CLR_ERR | DOC_MODE_MDWREN | DOC_MODE_RESET,
                  virtadr, DOCControl);
-        WriteDOC(DOC_MODE_CLR_ERR | DOC_MODE_MDWREN | DOC_MODE_RESET, 
+        WriteDOC(DOC_MODE_CLR_ERR | DOC_MODE_MDWREN | DOC_MODE_RESET,
                  virtadr, DOCControl);
 
         /* Enable the DiskOnChip ASIC */
-        WriteDOC(DOC_MODE_CLR_ERR | DOC_MODE_MDWREN | DOC_MODE_NORMAL, 
+        WriteDOC(DOC_MODE_CLR_ERR | DOC_MODE_MDWREN | DOC_MODE_NORMAL,
                  virtadr, DOCControl);
-        WriteDOC(DOC_MODE_CLR_ERR | DOC_MODE_MDWREN | DOC_MODE_NORMAL, 
+        WriteDOC(DOC_MODE_CLR_ERR | DOC_MODE_MDWREN | DOC_MODE_NORMAL,
                  virtadr, DOCControl);
 
         ChipID = ReadDOC(virtadr, ChipID);
@@ -1738,7 +1738,7 @@ static int __init init_nanddoc(void)
         int i, ret = 0;
 
         /* We could create the decoder on demand, if memory is a concern.
-         * This way we have it handy, if an error happens 
+         * This way we have it handy, if an error happens
          *
          * Symbolsize is 10 (bits)
          * Primitve polynomial is x^10+x^3+1
diff --git a/drivers/mtd/nand/edb7312.c b/drivers/mtd/nand/edb7312.c
index 5549681ccdce..9b1fd2f387fa 100644
--- a/drivers/mtd/nand/edb7312.c
+++ b/drivers/mtd/nand/edb7312.c
@@ -6,7 +6,7 @@
  *  Derived from drivers/mtd/nand/autcpu12.c
  *       Copyright (c) 2001 Thomas Gleixner (gleixner@autronix.de)
  *
- * $Id: edb7312.c,v 1.11 2004/11/04 12:53:10 gleixner Exp $
+ * $Id: edb7312.c,v 1.12 2005/11/07 11:14:30 gleixner Exp $
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 as
@@ -71,27 +71,27 @@ static struct mtd_partition partition_info[] = {
 #endif
 
 
-/* 
+/*
  *      hardware specific access to control-lines
  */
-static void ep7312_hwcontrol(struct mtd_info *mtd, int cmd) 
+static void ep7312_hwcontrol(struct mtd_info *mtd, int cmd)
 {
         switch(cmd) {
-                
-        case NAND_CTL_SETCLE: 
-                clps_writeb(clps_readb(ep7312_pxdr) | 0x10, ep7312_pxdr); 
+
+        case NAND_CTL_SETCLE:
+                clps_writeb(clps_readb(ep7312_pxdr) | 0x10, ep7312_pxdr);
                 break;
-        case NAND_CTL_CLRCLE: 
+        case NAND_CTL_CLRCLE:
                 clps_writeb(clps_readb(ep7312_pxdr) & ~0x10, ep7312_pxdr);
                 break;
-                
+
         case NAND_CTL_SETALE:
                 clps_writeb(clps_readb(ep7312_pxdr) | 0x20, ep7312_pxdr);
                 break;
         case NAND_CTL_CLRALE:
                 clps_writeb(clps_readb(ep7312_pxdr) & ~0x20, ep7312_pxdr);
                 break;
-                
+
         case NAND_CTL_SETNCE:
                 clps_writeb((clps_readb(ep7312_pxdr) | 0x80) & ~0x40, ep7312_pxdr);
                 break;
@@ -122,16 +122,16 @@ static int __init ep7312_init (void)
         int mtd_parts_nb = 0;
         struct mtd_partition *mtd_parts = 0;
         void __iomem * ep7312_fio_base;
-        
+
         /* Allocate memory for MTD device structure and private data */
-        ep7312_mtd = kmalloc(sizeof(struct mtd_info) + 
+        ep7312_mtd = kmalloc(sizeof(struct mtd_info) +
                              sizeof(struct nand_chip),
                              GFP_KERNEL);
         if (!ep7312_mtd) {
                 printk("Unable to allocate EDB7312 NAND MTD device structure.\n");
                 return -ENOMEM;
         }
-        
+
         /* map physical adress */
         ep7312_fio_base = ioremap(ep7312_fio_pbase, SZ_1K);
         if(!ep7312_fio_base) {
@@ -139,23 +139,23 @@ static int __init ep7312_init (void)
                 kfree(ep7312_mtd);
                 return -EIO;
         }
-        
+
         /* Get pointer to private data */
         this = (struct nand_chip *) (&ep7312_mtd[1]);
-        
+
         /* Initialize structures */
         memset((char *) ep7312_mtd, 0, sizeof(struct mtd_info));
         memset((char *) this, 0, sizeof(struct nand_chip));
-        
+
         /* Link the private data with the MTD structure */
         ep7312_mtd->priv = this;
-        
+
         /*
          * Set GPIO Port B control register so that the pins are configured
          * to be outputs for controlling the NAND flash.
          */
         clps_writeb(0xf0, ep7312_pxddr);
-        
+
         /* insert callbacks */
         this->IO_ADDR_R = ep7312_fio_base;
         this->IO_ADDR_W = ep7312_fio_base;
@@ -163,14 +163,14 @@ static int __init ep7312_init (void)
         this->dev_ready = ep7312_device_ready;
         /* 15 us command delay time */
         this->chip_delay = 15;
-        
+
         /* Scan to find existence of the device */
         if (nand_scan (ep7312_mtd, 1)) {
                 iounmap((void *)ep7312_fio_base);
                 kfree (ep7312_mtd);
                 return -ENXIO;
         }
-        
+
 #ifdef CONFIG_MTD_PARTITIONS
         ep7312_mtd->name = "edb7312-nand";
         mtd_parts_nb = parse_mtd_partitions(ep7312_mtd, part_probes,
@@ -185,11 +185,11 @@ static int __init ep7312_init (void)
                 mtd_parts_nb = NUM_PARTITIONS;
                 part_type = "static";
         }
-        
+
         /* Register the partitions */
         printk(KERN_NOTICE "Using %s partition definition\n", part_type);
         add_mtd_partitions(ep7312_mtd, mtd_parts, mtd_parts_nb);
-        
+
         /* Return happy */
         return 0;
 }
@@ -201,13 +201,13 @@ module_init(ep7312_init);
 static void __exit ep7312_cleanup (void)
 {
         struct nand_chip *this = (struct nand_chip *) &ep7312_mtd[1];
-        
+
         /* Release resources, unregister device */
         nand_release (ap7312_mtd);
-        
+
         /* Free internal data buffer */
         kfree (this->data_buf);
-        
+
         /* Free the MTD device structure */
         kfree (ep7312_mtd);
 }
diff --git a/drivers/mtd/nand/h1910.c b/drivers/mtd/nand/h1910.c
index 3825a7a0900c..041e4b3358fb 100644
--- a/drivers/mtd/nand/h1910.c
+++ b/drivers/mtd/nand/h1910.c
@@ -7,7 +7,7 @@
  *       Copyright (C) 2002 Marius Gröger (mag@sysgo.de)
  *       Copyright (c) 2001 Thomas Gleixner (gleixner@autronix.de)
  *
- * $Id: h1910.c,v 1.5 2004/11/04 12:53:10 gleixner Exp $
+ * $Id: h1910.c,v 1.6 2005/11/07 11:14:30 gleixner Exp $
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 as
@@ -54,24 +54,24 @@ static struct mtd_partition partition_info[] = {
 #endif
 
 
-/* 
+/*
  *      hardware specific access to control-lines
  */
-static void h1910_hwcontrol(struct mtd_info *mtd, int cmd) 
+static void h1910_hwcontrol(struct mtd_info *mtd, int cmd)
 {
         struct nand_chip* this = (struct nand_chip *) (mtd->priv);
-        
+
         switch(cmd) {
-                
-        case NAND_CTL_SETCLE: 
+
+        case NAND_CTL_SETCLE:
                 this->IO_ADDR_R |= (1 << 2);
                 this->IO_ADDR_W |= (1 << 2);
                 break;
-        case NAND_CTL_CLRCLE: 
+        case NAND_CTL_CLRCLE:
                 this->IO_ADDR_R &= ~(1 << 2);
                 this->IO_ADDR_W &= ~(1 << 2);
                 break;
-                
+
         case NAND_CTL_SETALE:
                 this->IO_ADDR_R |= (1 << 3);
                 this->IO_ADDR_W |= (1 << 3);
@@ -80,7 +80,7 @@ static void h1910_hwcontrol(struct mtd_info *mtd, int cmd)
                 this->IO_ADDR_R &= ~(1 << 3);
                 this->IO_ADDR_W &= ~(1 << 3);
                 break;
-                
+
         case NAND_CTL_SETNCE:
                 break;
         case NAND_CTL_CLRNCE:
@@ -108,18 +108,18 @@ static int __init h1910_init (void)
         int mtd_parts_nb = 0;
         struct mtd_partition *mtd_parts = 0;
         void __iomem *nandaddr;
-        
+
         if (!machine_is_h1900())
                 return -ENODEV;
-                
+
         nandaddr = __ioremap(0x08000000, 0x1000, 0, 1);
         if (!nandaddr) {
                 printk("Failed to ioremap nand flash.\n");
                 return -ENOMEM;
         }
-        
+
         /* Allocate memory for MTD device structure and private data */
-        h1910_nand_mtd = kmalloc(sizeof(struct mtd_info) + 
+        h1910_nand_mtd = kmalloc(sizeof(struct mtd_info) +
                              sizeof(struct nand_chip),
                              GFP_KERNEL);
         if (!h1910_nand_mtd) {
@@ -127,22 +127,22 @@ static int __init h1910_init (void)
                 iounmap ((void *) nandaddr);
                 return -ENOMEM;
         }
-        
+
         /* Get pointer to private data */
         this = (struct nand_chip *) (&h1910_nand_mtd[1]);
-        
+
         /* Initialize structures */
         memset((char *) h1910_nand_mtd, 0, sizeof(struct mtd_info));
         memset((char *) this, 0, sizeof(struct nand_chip));
-        
+
         /* Link the private data with the MTD structure */
         h1910_nand_mtd->priv = this;
-        
+
         /*
          * Enable VPEN
          */
         GPSR(37) = GPIO_bit(37);
-        
+
         /* insert callbacks */
         this->IO_ADDR_R = nandaddr;
         this->IO_ADDR_W = nandaddr;
@@ -152,7 +152,7 @@ static int __init h1910_init (void)
         this->chip_delay = 50;
         this->eccmode = NAND_ECC_SOFT;
         this->options = NAND_NO_AUTOINCR;
-        
+
         /* Scan to find existence of the device */
         if (nand_scan (h1910_nand_mtd, 1)) {
                 printk(KERN_NOTICE "No NAND device - returning -ENXIO\n");
@@ -160,9 +160,9 @@ static int __init h1910_init (void)
                 iounmap ((void *) nandaddr);
                 return -ENXIO;
         }
-        
+
 #ifdef CONFIG_MTD_CMDLINE_PARTS
-        mtd_parts_nb = parse_cmdline_partitions(h1910_nand_mtd, &mtd_parts, 
+        mtd_parts_nb = parse_cmdline_partitions(h1910_nand_mtd, &mtd_parts,
                                                 "h1910-nand");
         if (mtd_parts_nb > 0)
           part_type = "command line";
@@ -175,11 +175,11 @@ static int __init h1910_init (void)
                 mtd_parts_nb = NUM_PARTITIONS;
                 part_type = "static";
         }
-        
+
         /* Register the partitions */
         printk(KERN_NOTICE "Using %s partition definition\n", part_type);
         add_mtd_partitions(h1910_nand_mtd, mtd_parts, mtd_parts_nb);
-        
+
         /* Return happy */
         return 0;
 }
@@ -191,7 +191,7 @@ module_init(h1910_init);
 static void __exit h1910_cleanup (void)
 {
         struct nand_chip *this = (struct nand_chip *) &h1910_nand_mtd[1];
-        
+
         /* Release resources, unregister device */
         nand_release (h1910_nand_mtd);
 
diff --git a/drivers/mtd/nand/nand_base.c b/drivers/mtd/nand/nand_base.c
index 04e54318bc6a..5d222460b42a 100644
--- a/drivers/mtd/nand/nand_base.c
+++ b/drivers/mtd/nand/nand_base.c
@@ -5,14 +5,14 @@
  *   This is the generic MTD driver for NAND flash devices. It should be
  *   capable of working with almost all NAND chips currently available.
  *   Basic support for AG-AND chips is provided.
- *   
+ *
  *      Additional technical information is available on
  *      http://www.linux-mtd.infradead.org/tech/nand.html
- *      
+ *
  *  Copyright (C) 2000 Steven J. Hill (sjhill@realitydiluted.com)
  *                2002 Thomas Gleixner (tglx@linutronix.de)
  *
- *  02-08-2004  tglx: support for strange chips, which cannot auto increment 
+ *  02-08-2004  tglx: support for strange chips, which cannot auto increment
  *              pages on read / read_oob
  *
  *  03-17-2004  tglx: Check ready before auto increment check. Simon Bayes
@@ -21,7 +21,7 @@
  *              Make reads over block boundaries work too
  *
  *  04-14-2004  tglx: first working version for 2k page size chips
- *  
+ *
  *  05-19-2004  tglx: Basic support for Renesas AG-AND chips
  *
  *  09-24-2004  tglx: add support for hardware controllers (e.g. ECC) shared
@@ -30,25 +30,27 @@
  *
  *  12-05-2004  dmarlin: add workaround for Renesas AG-AND chips "disturb" issue.
  *              Basically, any block not rewritten may lose data when surrounding blocks
- *              are rewritten many times.  JFFS2 ensures this doesn't happen for blocks 
+ *              are rewritten many times.  JFFS2 ensures this doesn't happen for blocks
  *              it uses, but the Bad Block Table(s) may not be rewritten.  To ensure they
  *              do not lose data, force them to be rewritten when some of the surrounding
- *              blocks are erased.  Rather than tracking a specific nearby block (which 
- *              could itself go bad), use a page address 'mask' to select several blocks 
+ *              blocks are erased.  Rather than tracking a specific nearby block (which
+ *              could itself go bad), use a page address 'mask' to select several blocks
  *              in the same area, and rewrite the BBT when any of them are erased.
  *
- *  01-03-2005  dmarlin: added support for the device recovery command sequence for Renesas 
+ *  01-03-2005  dmarlin: added support for the device recovery command sequence for Renesas
  *              AG-AND chips.  If there was a sudden loss of power during an erase operation,
  *              a "device recovery" operation must be performed when power is restored
  *              to ensure correct operation.
  *
- *  01-20-2005  dmarlin: added support for optional hardware specific callback routine to 
+ *  01-20-2005  dmarlin: added support for optional hardware specific callback routine to
  *              perform extra error status checks on erase and write failures.  This required
  *              adding a wrapper function for nand_read_ecc.
  *
+ * 08-20-2005   vwool: suspend/resume added
+ *
  * Credits:
- *      David Woodhouse for adding multichip support  
- *      
+ *      David Woodhouse for adding multichip support
+ *
  *      Aleph One Ltd. and Toby Churchill Ltd. for supporting the
  *      rework for 2K page size chips
  *
@@ -59,7 +61,7 @@
  *      The AG-AND chips have nice features for speed improvement,
  *      which are not supported yet. Read / program 4 pages in one go.
  *
- * $Id: nand_base.c,v 1.147 2005/07/15 07:18:06 gleixner Exp $
+ * $Id: nand_base.c,v 1.150 2005/09/15 13:58:48 vwool Exp $
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 as
@@ -103,8 +105,8 @@ static struct nand_oobinfo nand_oob_64 = {
         .useecc = MTD_NANDECC_AUTOPLACE,
         .eccbytes = 24,
         .eccpos = {
-                40, 41, 42, 43, 44, 45, 46, 47, 
-                48, 49, 50, 51, 52, 53, 54, 55, 
+                40, 41, 42, 43, 44, 45, 46, 47,
+                48, 49, 50, 51, 52, 53, 54, 55,
                 56, 57, 58, 59, 60, 61, 62, 63},
         .oobfree = { {2, 38} }
 };
@@ -147,19 +149,19 @@ static void nand_sync (struct mtd_info *mtd);
 static int nand_write_page (struct mtd_info *mtd, struct nand_chip *this, int page, u_char *oob_buf,
                 struct nand_oobinfo *oobsel, int mode);
 #ifdef CONFIG_MTD_NAND_VERIFY_WRITE
-static int nand_verify_pages (struct mtd_info *mtd, struct nand_chip *this, int page, int numpages, 
+static int nand_verify_pages (struct mtd_info *mtd, struct nand_chip *this, int page, int numpages,
         u_char *oob_buf, struct nand_oobinfo *oobsel, int chipnr, int oobmode);
 #else
 #define nand_verify_pages(...) (0)
 #endif
-                
-static void nand_get_device (struct nand_chip *this, struct mtd_info *mtd, int new_state);
+
+static int nand_get_device (struct nand_chip *this, struct mtd_info *mtd, int new_state);
 
 /**
  * nand_release_device - [GENERIC] release chip
  * @mtd:        MTD device structure
- * 
- * Deselect, release chip lock and wake up anyone waiting on the device 
+ *
+ * Deselect, release chip lock and wake up anyone waiting on the device
  */
 static void nand_release_device (struct mtd_info *mtd)
 {
@@ -213,7 +215,7 @@ static void nand_write_byte(struct mtd_info *mtd, u_char byte)
  * nand_read_byte16 - [DEFAULT] read one byte endianess aware from the chip
  * @mtd:        MTD device structure
  *
- * Default read function for 16bit buswith with 
+ * Default read function for 16bit buswith with
  * endianess conversion
  */
 static u_char nand_read_byte16(struct mtd_info *mtd)
@@ -240,7 +242,7 @@ static void nand_write_byte16(struct mtd_info *mtd, u_char byte)
  * nand_read_word - [DEFAULT] read one word from the chip
  * @mtd:        MTD device structure
  *
- * Default read function for 16bit buswith without 
+ * Default read function for 16bit buswith without
  * endianess conversion
  */
 static u16 nand_read_word(struct mtd_info *mtd)
@@ -254,7 +256,7 @@ static u16 nand_read_word(struct mtd_info *mtd)
  * @mtd:        MTD device structure
  * @word:       data word to write
  *
- * Default write function for 16bit buswith without 
+ * Default write function for 16bit buswith without
  * endianess conversion
  */
 static void nand_write_word(struct mtd_info *mtd, u16 word)
@@ -275,7 +277,7 @@ static void nand_select_chip(struct mtd_info *mtd, int chip)
         struct nand_chip *this = mtd->priv;
         switch(chip) {
         case -1:
-                this->hwcontrol(mtd, NAND_CTL_CLRNCE);  
+                this->hwcontrol(mtd, NAND_CTL_CLRNCE);
                 break;
         case 0:
                 this->hwcontrol(mtd, NAND_CTL_SETNCE);
@@ -304,7 +306,7 @@ static void nand_write_buf(struct mtd_info *mtd, const u_char *buf, int len)
 }
 
 /**
- * nand_read_buf - [DEFAULT] read chip data into buffer 
+ * nand_read_buf - [DEFAULT] read chip data into buffer
  * @mtd:        MTD device structure
  * @buf:        buffer to store date
  * @len:        number of bytes to read
@@ -321,7 +323,7 @@ static void nand_read_buf(struct mtd_info *mtd, u_char *buf, int len)
 }
 
 /**
- * nand_verify_buf - [DEFAULT] Verify chip data against buffer 
+ * nand_verify_buf - [DEFAULT] Verify chip data against buffer
  * @mtd:        MTD device structure
  * @buf:        buffer containing the data to compare
  * @len:        number of bytes to compare
@@ -354,14 +356,14 @@ static void nand_write_buf16(struct mtd_info *mtd, const u_char *buf, int len)
         struct nand_chip *this = mtd->priv;
         u16 *p = (u16 *) buf;
         len >>= 1;
-        
+
         for (i=0; i<len; i++)
                 writew(p[i], this->IO_ADDR_W);
-                
+
 }
 
 /**
- * nand_read_buf16 - [DEFAULT] read chip data into buffer 
+ * nand_read_buf16 - [DEFAULT] read chip data into buffer
  * @mtd:        MTD device structure
  * @buf:        buffer to store date
  * @len:        number of bytes to read
@@ -380,7 +382,7 @@ static void nand_read_buf16(struct mtd_info *mtd, u_char *buf, int len)
 }
 
 /**
- * nand_verify_buf16 - [DEFAULT] Verify chip data against buffer 
+ * nand_verify_buf16 - [DEFAULT] Verify chip data against buffer
  * @mtd:        MTD device structure
  * @buf:        buffer containing the data to compare
  * @len:        number of bytes to compare
@@ -407,7 +409,7 @@ static int nand_verify_buf16(struct mtd_info *mtd, const u_char *buf, int len)
  * @ofs:        offset from device start
  * @getchip:    0, if the chip is already selected
  *
- * Check, if the block is bad. 
+ * Check, if the block is bad.
  */
 static int nand_block_bad(struct mtd_info *mtd, loff_t ofs, int getchip)
 {
@@ -424,14 +426,14 @@ static int nand_block_bad(struct mtd_info *mtd, loff_t ofs, int getchip)
 
                 /* Select the NAND device */
                 this->select_chip(mtd, chipnr);
-        } else 
-                page = (int) ofs;       
+        } else
+                page = (int) ofs;
 
         if (this->options & NAND_BUSWIDTH_16) {
                 this->cmdfunc (mtd, NAND_CMD_READOOB, this->badblockpos & 0xFE, page & this->pagemask);
                 bad = cpu_to_le16(this->read_word(mtd));
                 if (this->badblockpos & 0x1)
-                        bad >>= 1;
+                        bad >>= 8;
                 if ((bad & 0xFF) != 0xff)
                         res = 1;
         } else {
@@ -439,12 +441,12 @@ static int nand_block_bad(struct mtd_info *mtd, loff_t ofs, int getchip)
                 if (this->read_byte(mtd) != 0xff)
                         res = 1;
         }
-                
+
         if (getchip) {
                 /* Deselect and wake up anyone waiting on the device */
                 nand_release_device(mtd);
-        }       
-        
+        }
+
         return res;
 }
 
@@ -462,7 +464,7 @@ static int nand_default_block_markbad(struct mtd_info *mtd, loff_t ofs)
         u_char buf[2] = {0, 0};
         size_t  retlen;
         int block;
-        
+
         /* Get block number */
         block = ((int) ofs) >> this->bbt_erase_shift;
         if (this->bbt)
@@ -471,25 +473,25 @@ static int nand_default_block_markbad(struct mtd_info *mtd, loff_t ofs)
         /* Do we have a flash based bad block table ? */
         if (this->options & NAND_USE_FLASH_BBT)
                 return nand_update_bbt (mtd, ofs);
-                
+
         /* We write two bytes, so we dont have to mess with 16 bit access */
         ofs += mtd->oobsize + (this->badblockpos & ~0x01);
         return nand_write_oob (mtd, ofs , 2, &retlen, buf);
 }
 
-/** 
+/**
  * nand_check_wp - [GENERIC] check if the chip is write protected
  * @mtd:        MTD device structure
- * Check, if the device is write protected 
+ * Check, if the device is write protected
  *
- * The function expects, that the device is already selected 
+ * The function expects, that the device is already selected
  */
 static int nand_check_wp (struct mtd_info *mtd)
 {
         struct nand_chip *this = mtd->priv;
         /* Check the WP bit */
         this->cmdfunc (mtd, NAND_CMD_STATUS, -1, -1);
-        return (this->read_byte(mtd) & NAND_STATUS_WP) ? 0 : 1; 
+        return (this->read_byte(mtd) & NAND_STATUS_WP) ? 0 : 1;
 }
 
 /**
@@ -505,15 +507,15 @@ static int nand_check_wp (struct mtd_info *mtd)
 static int nand_block_checkbad (struct mtd_info *mtd, loff_t ofs, int getchip, int allowbbt)
 {
         struct nand_chip *this = mtd->priv;
-        
+
         if (!this->bbt)
                 return this->block_bad(mtd, ofs, getchip);
-        
+
         /* Return info from the table */
         return nand_isbad_bbt (mtd, ofs, allowbbt);
 }
 
-/* 
+/*
  * Wait for the ready pin, after a command
  * The timeout is catched later.
  */
@@ -527,7 +529,7 @@ static void nand_wait_ready(struct mtd_info *mtd)
                 if (this->dev_ready(mtd))
                         return;
                 touch_softlockup_watchdog();
-        } while (time_before(jiffies, timeo));  
+        } while (time_before(jiffies, timeo));
 }
 
 /**
@@ -590,13 +592,13 @@ static void nand_command (struct mtd_info *mtd, unsigned command, int column, in
                 /* Latch in address */
                 this->hwcontrol(mtd, NAND_CTL_CLRALE);
         }
-        
-        /* 
-         * program and erase have their own busy handlers 
+
+        /*
+         * program and erase have their own busy handlers
          * status and sequential in needs no delay
         */
         switch (command) {
-                        
+
         case NAND_CMD_PAGEPROG:
         case NAND_CMD_ERASE1:
         case NAND_CMD_ERASE2:
@@ -605,7 +607,7 @@ static void nand_command (struct mtd_info *mtd, unsigned command, int column, in
                 return;
 
         case NAND_CMD_RESET:
-                if (this->dev_ready)    
+                if (this->dev_ready)
                         break;
                 udelay(this->chip_delay);
                 this->hwcontrol(mtd, NAND_CTL_SETCLE);
@@ -614,16 +616,16 @@ static void nand_command (struct mtd_info *mtd, unsigned command, int column, in
                 while ( !(this->read_byte(mtd) & NAND_STATUS_READY));
                 return;
 
-        /* This applies to read commands */     
+        /* This applies to read commands */
         default:
-                /* 
+                /*
                  * If we don't have access to the busy pin, we apply the given
                  * command delay
                 */
                 if (!this->dev_ready) {
                         udelay (this->chip_delay);
                         return;
-                }       
+                }
         }
         /* Apply this short delay always to ensure that we do wait tWB in
          * any case on any machine. */
@@ -653,8 +655,8 @@ static void nand_command_lp (struct mtd_info *mtd, unsigned command, int column,
                 column += mtd->oobblock;
                 command = NAND_CMD_READ0;
         }
-        
-                
+
+
         /* Begin command latch cycle */
         this->hwcontrol(mtd, NAND_CTL_SETCLE);
         /* Write out the command to the device. */
@@ -672,7 +674,7 @@ static void nand_command_lp (struct mtd_info *mtd, unsigned command, int column,
                                 column >>= 1;
                         this->write_byte(mtd, column & 0xff);
                         this->write_byte(mtd, column >> 8);
-                }       
+                }
                 if (page_addr != -1) {
                         this->write_byte(mtd, (unsigned char) (page_addr & 0xff));
                         this->write_byte(mtd, (unsigned char) ((page_addr >> 8) & 0xff));
@@ -683,13 +685,13 @@ static void nand_command_lp (struct mtd_info *mtd, unsigned command, int column,
                 /* Latch in address */
                 this->hwcontrol(mtd, NAND_CTL_CLRALE);
         }
-        
-        /* 
-         * program and erase have their own busy handlers 
+
+        /*
+         * program and erase have their own busy handlers
          * status, sequential in, and deplete1 need no delay
          */
         switch (command) {
-                        
+
         case NAND_CMD_CACHEDPROG:
         case NAND_CMD_PAGEPROG:
         case NAND_CMD_ERASE1:
@@ -699,7 +701,7 @@ static void nand_command_lp (struct mtd_info *mtd, unsigned command, int column,
         case NAND_CMD_DEPLETE1:
                 return;
 
-        /* 
+        /*
          * read error status commands require only a short delay
          */
         case NAND_CMD_STATUS_ERROR:
@@ -711,7 +713,7 @@ static void nand_command_lp (struct mtd_info *mtd, unsigned command, int column,
                 return;
 
         case NAND_CMD_RESET:
-                if (this->dev_ready)    
+                if (this->dev_ready)
                         break;
                 udelay(this->chip_delay);
                 this->hwcontrol(mtd, NAND_CTL_SETCLE);
@@ -728,17 +730,17 @@ static void nand_command_lp (struct mtd_info *mtd, unsigned command, int column,
                 /* End command latch cycle */
                 this->hwcontrol(mtd, NAND_CTL_CLRCLE);
                 /* Fall through into ready check */
-                
-        /* This applies to read commands */     
+
+        /* This applies to read commands */
         default:
-                /* 
+                /*
                  * If we don't have access to the busy pin, we apply the given
                  * command delay
                 */
                 if (!this->dev_ready) {
                         udelay (this->chip_delay);
                         return;
-                }       
+                }
         }
 
         /* Apply this short delay always to ensure that we do wait tWB in
@@ -752,11 +754,11 @@ static void nand_command_lp (struct mtd_info *mtd, unsigned command, int column,
  * nand_get_device - [GENERIC] Get chip for selected access
  * @this:       the nand chip descriptor
  * @mtd:        MTD device structure
- * @new_state:  the state which is requested 
+ * @new_state:  the state which is requested
  *
  * Get the device and lock it for exclusive access
  */
-static void nand_get_device (struct nand_chip *this, struct mtd_info *mtd, int new_state)
+static int nand_get_device (struct nand_chip *this, struct mtd_info *mtd, int new_state)
 {
         struct nand_chip *active;
         spinlock_t *lock;
@@ -779,7 +781,11 @@ retry:
         if (active == this && this->state == FL_READY) {
                 this->state = new_state;
                 spin_unlock(lock);
-                return;
+                return 0;
+        }
+        if (new_state == FL_PM_SUSPENDED) {
+                spin_unlock(lock);
+                return (this->state == FL_PM_SUSPENDED) ? 0 : -EAGAIN;
         }
         set_current_state(TASK_UNINTERRUPTIBLE);
         add_wait_queue(wq, &wait);
@@ -796,7 +802,7 @@ retry:
  * @state:      state to select the max. timeout value
  *
  * Wait for command done. This applies to erase and program only
- * Erase can take up to 400ms and program up to 20ms according to 
+ * Erase can take up to 400ms and program up to 20ms according to
  * general NAND and SmartMedia specs
  *
 */
@@ -805,7 +811,7 @@ static int nand_wait(struct mtd_info *mtd, struct nand_chip *this, int state)
 
         unsigned long   timeo = jiffies;
         int     status;
-        
+
         if (state == FL_ERASING)
                  timeo += (HZ * 400) / 1000;
         else
@@ -817,17 +823,17 @@ static int nand_wait(struct mtd_info *mtd, struct nand_chip *this, int state)
 
         if ((state == FL_ERASING) && (this->options & NAND_IS_AND))
                 this->cmdfunc (mtd, NAND_CMD_STATUS_MULTI, -1, -1);
-        else    
+        else
                 this->cmdfunc (mtd, NAND_CMD_STATUS, -1, -1);
 
-        while (time_before(jiffies, timeo)) {           
+        while (time_before(jiffies, timeo)) {
                 /* Check, if we were interrupted */
                 if (this->state != state)
                         return 0;
 
                 if (this->dev_ready) {
                         if (this->dev_ready(mtd))
-                                break;  
+                                break;
                 } else {
                         if (this->read_byte(mtd) & NAND_STATUS_READY)
                                 break;
@@ -853,7 +859,7 @@ static int nand_wait(struct mtd_info *mtd, struct nand_chip *this, int state)
  *
  * Cached programming is not supported yet.
  */
-static int nand_write_page (struct mtd_info *mtd, struct nand_chip *this, int page, 
+static int nand_write_page (struct mtd_info *mtd, struct nand_chip *this, int page,
         u_char *oob_buf,  struct nand_oobinfo *oobsel, int cached)
 {
         int     i, status;
@@ -862,10 +868,10 @@ static int nand_write_page (struct mtd_info *mtd, struct nand_chip *this, int pa
         int     *oob_config = oobsel->eccpos;
         int     datidx = 0, eccidx = 0, eccsteps = this->eccsteps;
         int     eccbytes = 0;
-        
+
         /* FIXME: Enable cached programming */
         cached = 0;
-        
+
         /* Send command to begin auto page programming */
         this->cmdfunc (mtd, NAND_CMD_SEQIN, 0x00, page);
 
@@ -876,7 +882,7 @@ static int nand_write_page (struct mtd_info *mtd, struct nand_chip *this, int pa
                 printk (KERN_WARNING "Writing data without ECC to NAND-FLASH is not recommended\n");
                 this->write_buf(mtd, this->data_poi, mtd->oobblock);
                 break;
-                
+
         /* Software ecc 3/256, write all */
         case NAND_ECC_SOFT:
                 for (; eccsteps; eccsteps--) {
@@ -905,11 +911,11 @@ static int nand_write_page (struct mtd_info *mtd, struct nand_chip *this, int pa
                 }
                 break;
         }
-                                                                                
+
         /* Write out OOB data */
         if (this->options & NAND_HWECC_SYNDROME)
                 this->write_buf(mtd, &oob_buf[oobsel->eccbytes], mtd->oobsize - oobsel->eccbytes);
-        else 
+        else
                 this->write_buf(mtd, oob_buf, mtd->oobsize);
 
         /* Send command to actually program the data */
@@ -934,7 +940,7 @@ static int nand_write_page (struct mtd_info *mtd, struct nand_chip *this, int pa
                 /* wait until cache is ready*/
                 // status = this->waitfunc (mtd, this, FL_CACHEDRPG);
         }
-        return 0;       
+        return 0;
 }
 
 #ifdef CONFIG_MTD_NAND_VERIFY_WRITE
@@ -950,19 +956,19 @@ static int nand_write_page (struct mtd_info *mtd, struct nand_chip *this, int pa
  * @oobmode:    1 = full buffer verify, 0 = ecc only
  *
  * The NAND device assumes that it is always writing to a cleanly erased page.
- * Hence, it performs its internal write verification only on bits that 
+ * Hence, it performs its internal write verification only on bits that
  * transitioned from 1 to 0. The device does NOT verify the whole page on a
- * byte by byte basis. It is possible that the page was not completely erased 
- * or the page is becoming unusable due to wear. The read with ECC would catch 
- * the error later when the ECC page check fails, but we would rather catch 
+ * byte by byte basis. It is possible that the page was not completely erased
+ * or the page is becoming unusable due to wear. The read with ECC would catch
+ * the error later when the ECC page check fails, but we would rather catch
  * it early in the page write stage. Better to write no data than invalid data.
  */
-static int nand_verify_pages (struct mtd_info *mtd, struct nand_chip *this, int page, int numpages, 
+static int nand_verify_pages (struct mtd_info *mtd, struct nand_chip *this, int page, int numpages,
         u_char *oob_buf, struct nand_oobinfo *oobsel, int chipnr, int oobmode)
 {
         int     i, j, datidx = 0, oobofs = 0, res = -EIO;
         int     eccsteps = this->eccsteps;
-        int     hweccbytes; 
+        int     hweccbytes;
         u_char  oobdata[64];
 
         hweccbytes = (this->options & NAND_HWECC_SYNDROME) ? (oobsel->eccbytes / eccsteps) : 0;
@@ -1002,7 +1008,7 @@ static int nand_verify_pages (struct mtd_info *mtd, struct nand_chip *this, int
 
                         if (oobsel->useecc != MTD_NANDECC_OFF && !hweccbytes) {
                                 int ecccnt = oobsel->eccbytes;
-                
+
                                 for (i = 0; i < ecccnt; i++) {
                                         int idx = oobsel->eccpos[i];
                                         if (oobdata[idx] != oob_buf[oobofs + idx] ) {
@@ -1012,20 +1018,20 @@ static int nand_verify_pages (struct mtd_info *mtd, struct nand_chip *this, int
                                                 goto out;
                                         }
                                 }
-                        }       
+                        }
                 }
                 oobofs += mtd->oobsize - hweccbytes * eccsteps;
                 page++;
                 numpages--;
 
-                /* Apply delay or wait for ready/busy pin 
+                /* Apply delay or wait for ready/busy pin
                  * Do this before the AUTOINCR check, so no problems
                  * arise if a chip which does auto increment
                  * is marked as NOAUTOINCR by the board driver.
                  * Do this also before returning, so the chip is
                  * ready for the next command.
                 */
-                if (!this->dev_ready) 
+                if (!this->dev_ready)
                         udelay (this->chip_delay);
                 else
                         nand_wait_ready(mtd);
@@ -1033,17 +1039,17 @@ static int nand_verify_pages (struct mtd_info *mtd, struct nand_chip *this, int
                 /* All done, return happy */
                 if (!numpages)
                         return 0;
-                
-                        
-                /* Check, if the chip supports auto page increment */ 
+
+
+                /* Check, if the chip supports auto page increment */
                 if (!NAND_CANAUTOINCR(this))
                         this->cmdfunc (mtd, NAND_CMD_READ0, 0x00, page);
         }
-        /* 
+        /*
          * Terminate the read command. We come here in case of an error
          * So we must issue a reset command.
          */
-out:     
+out:
         this->cmdfunc (mtd, NAND_CMD_RESET, -1, -1);
         return res;
 }
@@ -1105,7 +1111,7 @@ static int nand_read_ecc (struct mtd_info *mtd, loff_t from, size_t len,
  * NAND read with ECC
  */
 int nand_do_read_ecc (struct mtd_info *mtd, loff_t from, size_t len,
-                             size_t * retlen, u_char * buf, u_char * oob_buf, 
+                             size_t * retlen, u_char * buf, u_char * oob_buf,
                              struct nand_oobinfo *oobsel, int flags)
 {
 
@@ -1139,7 +1145,7 @@ int nand_do_read_ecc (struct mtd_info *mtd, loff_t from, size_t len,
         /* Autoplace of oob data ? Use the default placement scheme */
         if (oobsel->useecc == MTD_NANDECC_AUTOPLACE)
                 oobsel = this->autooob;
-                
+
         eccmode = oobsel->useecc ? this->eccmode : NAND_ECC_NONE;
         oob_config = oobsel->eccpos;
 
@@ -1157,28 +1163,28 @@ int nand_do_read_ecc (struct mtd_info *mtd, loff_t from, size_t len,
         end = mtd->oobblock;
         ecc = this->eccsize;
         eccbytes = this->eccbytes;
-        
+
         if ((eccmode == NAND_ECC_NONE) || (this->options & NAND_HWECC_SYNDROME))
                 compareecc = 0;
 
         oobreadlen = mtd->oobsize;
-        if (this->options & NAND_HWECC_SYNDROME) 
+        if (this->options & NAND_HWECC_SYNDROME)
                 oobreadlen -= oobsel->eccbytes;
 
         /* Loop until all data read */
         while (read < len) {
-                
+
                 int aligned = (!col && (len - read) >= end);
-                /* 
+                /*
                  * If the read is not page aligned, we have to read into data buffer
                  * due to ecc, else we read into return buffer direct
                  */
                 if (aligned)
                         data_poi = &buf[read];
-                else 
+                else
                         data_poi = this->data_buf;
-                
-                /* Check, if we have this page in the buffer 
+
+                /* Check, if we have this page in the buffer
                  *
                  * FIXME: Make it work when we must provide oob data too,
                  * check the usage of data_buf oob field
@@ -1194,7 +1200,7 @@ int nand_do_read_ecc (struct mtd_info *mtd, loff_t from, size_t len,
                 if (sndcmd) {
                         this->cmdfunc (mtd, NAND_CMD_READ0, 0x00, page);
                         sndcmd = 0;
-                }       
+                }
 
                 /* get oob area, if we have no oob buffer from fs-driver */
                 if (!oob_buf || oobsel->useecc == MTD_NANDECC_AUTOPLACE ||
@@ -1202,7 +1208,7 @@ int nand_do_read_ecc (struct mtd_info *mtd, loff_t from, size_t len,
                         oob_data = &this->data_buf[end];
 
                 eccsteps = this->eccsteps;
-                
+
                 switch (eccmode) {
                 case NAND_ECC_NONE: {   /* No ECC, Read in a page */
                         static unsigned long lastwhinge = 0;
@@ -1213,12 +1219,12 @@ int nand_do_read_ecc (struct mtd_info *mtd, loff_t from, size_t len,
                         this->read_buf(mtd, data_poi, end);
                         break;
                 }
-                        
+
                 case NAND_ECC_SOFT:     /* Software ECC 3/256: Read in a page + oob data */
                         this->read_buf(mtd, data_poi, end);
-                        for (i = 0, datidx = 0; eccsteps; eccsteps--, i+=3, datidx += ecc) 
+                        for (i = 0, datidx = 0; eccsteps; eccsteps--, i+=3, datidx += ecc)
                                 this->calculate_ecc(mtd, &data_poi[datidx], &ecc_calc[i]);
-                        break;  
+                        break;
 
                 default:
                         for (i = 0, datidx = 0; eccsteps; eccsteps--, i+=eccbytes, datidx += ecc) {
@@ -1237,15 +1243,15 @@ int nand_do_read_ecc (struct mtd_info *mtd, loff_t from, size_t len,
                                          * does the error correction on the fly */
                                         ecc_status = this->correct_data(mtd, &data_poi[datidx], &oob_data[i], &ecc_code[i]);
                                         if ((ecc_status == -1) || (ecc_status > (flags && 0xff))) {
-                                                DEBUG (MTD_DEBUG_LEVEL0, "nand_read_ecc: " 
+                                                DEBUG (MTD_DEBUG_LEVEL0, "nand_read_ecc: "
                                                         "Failed ECC read, page 0x%08x on chip %d\n", page, chipnr);
                                                 ecc_failed++;
                                         }
                                 } else {
                                         this->calculate_ecc(mtd, &data_poi[datidx], &ecc_calc[i]);
-                                }       
+                                }
                         }
-                        break;                                          
+                        break;
                 }
 
                 /* read oobdata */
@@ -1253,8 +1259,8 @@ int nand_do_read_ecc (struct mtd_info *mtd, loff_t from, size_t len,
 
                 /* Skip ECC check, if not requested (ECC_NONE or HW_ECC with syndromes) */
                 if (!compareecc)
-                        goto readoob;   
-                
+                        goto readoob;
+
                 /* Pick the ECC bytes out of the oob data */
                 for (j = 0; j < oobsel->eccbytes; j++)
                         ecc_code[j] = oob_data[oob_config[j]];
@@ -1262,24 +1268,24 @@ int nand_do_read_ecc (struct mtd_info *mtd, loff_t from, size_t len,
                 /* correct data, if neccecary */
                 for (i = 0, j = 0, datidx = 0; i < this->eccsteps; i++, datidx += ecc) {
                         ecc_status = this->correct_data(mtd, &data_poi[datidx], &ecc_code[j], &ecc_calc[j]);
-                        
+
                         /* Get next chunk of ecc bytes */
                         j += eccbytes;
-                        
-                        /* Check, if we have a fs supplied oob-buffer, 
+
+                        /* Check, if we have a fs supplied oob-buffer,
                          * This is the legacy mode. Used by YAFFS1
                          * Should go away some day
                          */
-                        if (oob_buf && oobsel->useecc == MTD_NANDECC_PLACE) { 
+                        if (oob_buf && oobsel->useecc == MTD_NANDECC_PLACE) {
                                 int *p = (int *)(&oob_data[mtd->oobsize]);
                                 p[i] = ecc_status;
                         }
-                        
-                        if ((ecc_status == -1) || (ecc_status > (flags && 0xff))) {     
+
+                        if ((ecc_status == -1) || (ecc_status > (flags && 0xff))) {
                                 DEBUG (MTD_DEBUG_LEVEL0, "nand_read_ecc: " "Failed ECC read, page 0x%08x\n", page);
                                 ecc_failed++;
                         }
-                }               
+                }
 
         readoob:
                 /* check, if we have a fs supplied oob-buffer */
@@ -1305,25 +1311,25 @@ int nand_do_read_ecc (struct mtd_info *mtd, loff_t from, size_t len,
                 }
         readdata:
                 /* Partial page read, transfer data into fs buffer */
-                if (!aligned) { 
+                if (!aligned) {
                         for (j = col; j < end && read < len; j++)
                                 buf[read++] = data_poi[j];
-                        this->pagebuf = realpage;       
-                } else          
+                        this->pagebuf = realpage;
+                } else
                         read += mtd->oobblock;
 
-                /* Apply delay or wait for ready/busy pin 
+                /* Apply delay or wait for ready/busy pin
                  * Do this before the AUTOINCR check, so no problems
                  * arise if a chip which does auto increment
                  * is marked as NOAUTOINCR by the board driver.
                 */
-                if (!this->dev_ready) 
+                if (!this->dev_ready)
                         udelay (this->chip_delay);
                 else
                         nand_wait_ready(mtd);
-                        
+
                 if (read == len)
-                        break;  
+                        break;
 
                 /* For subsequent reads align to page boundary. */
                 col = 0;
@@ -1337,11 +1343,11 @@ int nand_do_read_ecc (struct mtd_info *mtd, loff_t from, size_t len,
                         this->select_chip(mtd, -1);
                         this->select_chip(mtd, chipnr);
                 }
-                /* Check, if the chip supports auto page increment 
-                 * or if we have hit a block boundary. 
-                */ 
+                /* Check, if the chip supports auto page increment
+                 * or if we have hit a block boundary.
+                */
                 if (!NAND_CANAUTOINCR(this) || !(page & blockcheck))
-                        sndcmd = 1;                             
+                        sndcmd = 1;
         }
 
         /* Deselect and wake up anyone waiting on the device */
@@ -1378,7 +1384,7 @@ static int nand_read_oob (struct mtd_info *mtd, loff_t from, size_t len, size_t
         /* Shift to get page */
         page = (int)(from >> this->page_shift);
         chipnr = (int)(from >> this->chip_shift);
-        
+
         /* Mask to get column */
         col = from & (mtd->oobsize - 1);
 
@@ -1400,7 +1406,7 @@ static int nand_read_oob (struct mtd_info *mtd, loff_t from, size_t len, size_t
 
         /* Send the read command */
         this->cmdfunc (mtd, NAND_CMD_READOOB, col, page & this->pagemask);
-        /* 
+        /*
          * Read the data, if we read more than one page
          * oob data, let the device transfer the data !
          */
@@ -1422,20 +1428,20 @@ static int nand_read_oob (struct mtd_info *mtd, loff_t from, size_t len, size_t
                                 this->select_chip(mtd, -1);
                                 this->select_chip(mtd, chipnr);
                         }
-                                
-                        /* Apply delay or wait for ready/busy pin 
+
+                        /* Apply delay or wait for ready/busy pin
                          * Do this before the AUTOINCR check, so no problems
                          * arise if a chip which does auto increment
                          * is marked as NOAUTOINCR by the board driver.
                          */
-                        if (!this->dev_ready) 
+                        if (!this->dev_ready)
                                 udelay (this->chip_delay);
                         else
                                 nand_wait_ready(mtd);
 
-                        /* Check, if the chip supports auto page increment 
-                         * or if we have hit a block boundary. 
-                        */ 
+                        /* Check, if the chip supports auto page increment
+                         * or if we have hit a block boundary.
+                        */
                         if (!NAND_CANAUTOINCR(this) || !(page & blockcheck)) {
                                 /* For subsequent page reads set offset to 0 */
                                 this->cmdfunc (mtd, NAND_CMD_READOOB, 0x0, page & this->pagemask);
@@ -1481,27 +1487,27 @@ int nand_read_raw (struct mtd_info *mtd, uint8_t *buf, loff_t from, size_t len,
         nand_get_device (this, mtd , FL_READING);
 
         this->select_chip (mtd, chip);
-        
+
         /* Add requested oob length */
         len += ooblen;
-        
+
         while (len) {
                 if (sndcmd)
                         this->cmdfunc (mtd, NAND_CMD_READ0, 0, page & this->pagemask);
-                sndcmd = 0;     
+                sndcmd = 0;
 
                 this->read_buf (mtd, &buf[cnt], pagesize);
 
                 len -= pagesize;
                 cnt += pagesize;
                 page++;
-                
-                if (!this->dev_ready) 
+
+                if (!this->dev_ready)
                         udelay (this->chip_delay);
                 else
                         nand_wait_ready(mtd);
-                        
-                /* Check, if the chip supports auto page increment */ 
+
+                /* Check, if the chip supports auto page increment */
                 if (!NAND_CANAUTOINCR(this) || !(page & blockcheck))
                         sndcmd = 1;
         }
@@ -1512,8 +1518,8 @@ int nand_read_raw (struct mtd_info *mtd, uint8_t *buf, loff_t from, size_t len,
 }
 
 
-/** 
- * nand_prepare_oobbuf - [GENERIC] Prepare the out of band buffer 
+/**
+ * nand_prepare_oobbuf - [GENERIC] Prepare the out of band buffer
  * @mtd:        MTD device structure
  * @fsbuf:      buffer given by fs driver
  * @oobsel:     out of band selection structre
@@ -1542,20 +1548,20 @@ static u_char * nand_prepare_oobbuf (struct mtd_info *mtd, u_char *fsbuf, struct
         int i, len, ofs;
 
         /* Zero copy fs supplied buffer */
-        if (fsbuf && !autoplace) 
+        if (fsbuf && !autoplace)
                 return fsbuf;
 
         /* Check, if the buffer must be filled with ff again */
-        if (this->oobdirty) {   
-                memset (this->oob_buf, 0xff, 
+        if (this->oobdirty) {
+                memset (this->oob_buf, 0xff,
                         mtd->oobsize << (this->phys_erase_shift - this->page_shift));
                 this->oobdirty = 0;
-        }       
-        
+        }
+
         /* If we have no autoplacement or no fs buffer use the internal one */
         if (!autoplace || !fsbuf)
                 return this->oob_buf;
-        
+
         /* Walk through the pages and place the data */
         this->oobdirty = 1;
         ofs = 0;
@@ -1589,7 +1595,7 @@ static int nand_write (struct mtd_info *mtd, loff_t to, size_t len, size_t * ret
 {
         return (nand_write_ecc (mtd, to, len, retlen, buf, NULL, NULL));
 }
-                           
+
 /**
  * nand_write_ecc - [MTD Interface] NAND write with ECC
  * @mtd:        MTD device structure
@@ -1622,7 +1628,7 @@ static int nand_write_ecc (struct mtd_info *mtd, loff_t to, size_t len,
                 return -EINVAL;
         }
 
-        /* reject writes, which are not page aligned */ 
+        /* reject writes, which are not page aligned */
         if (NOTALIGNED (to) || NOTALIGNED(len)) {
                 printk (KERN_NOTICE "nand_write_ecc: Attempt to write not page aligned data\n");
                 return -EINVAL;
@@ -1641,14 +1647,14 @@ static int nand_write_ecc (struct mtd_info *mtd, loff_t to, size_t len,
                 goto out;
 
         /* if oobsel is NULL, use chip defaults */
-        if (oobsel == NULL) 
-                oobsel = &mtd->oobinfo;         
-                
+        if (oobsel == NULL)
+                oobsel = &mtd->oobinfo;
+
         /* Autoplace of oob data ? Use the default placement scheme */
         if (oobsel->useecc == MTD_NANDECC_AUTOPLACE) {
                 oobsel = this->autooob;
                 autoplace = 1;
-        }       
+        }
         if (oobsel->useecc == MTD_NANDECC_AUTOPL_USR)
                 autoplace = 1;
 
@@ -1656,9 +1662,9 @@ static int nand_write_ecc (struct mtd_info *mtd, loff_t to, size_t len,
         totalpages = len >> this->page_shift;
         page = (int) (to >> this->page_shift);
         /* Invalidate the page cache, if we write to the cached page */
-        if (page <= this->pagebuf && this->pagebuf < (page + totalpages))  
+        if (page <= this->pagebuf && this->pagebuf < (page + totalpages))
                 this->pagebuf = -1;
-        
+
         /* Set it relative to chip */
         page &= this->pagemask;
         startpage = page;
@@ -1680,14 +1686,14 @@ static int nand_write_ecc (struct mtd_info *mtd, loff_t to, size_t len,
                 if (ret) {
                         DEBUG (MTD_DEBUG_LEVEL0, "nand_write_ecc: write_page failed %d\n", ret);
                         goto out;
-                }       
+                }
                 /* Next oob page */
                 oob += mtd->oobsize;
                 /* Update written bytes count */
                 written += mtd->oobblock;
-                if (written == len) 
+                if (written == len)
                         goto cmp;
-                
+
                 /* Increment page address */
                 page++;
 
@@ -1698,13 +1704,13 @@ static int nand_write_ecc (struct mtd_info *mtd, loff_t to, size_t len,
                 if (!(page & (ppblock - 1))){
                         int ofs;
                         this->data_poi = bufstart;
-                        ret = nand_verify_pages (mtd, this, startpage, 
+                        ret = nand_verify_pages (mtd, this, startpage,
                                 page - startpage,
                                 oobbuf, oobsel, chipnr, (eccbuf != NULL));
                         if (ret) {
                                 DEBUG (MTD_DEBUG_LEVEL0, "nand_write_ecc: verify_pages failed %d\n", ret);
                                 goto out;
-                        }       
+                        }
                         *retlen = written;
 
                         ofs = autoplace ? mtd->oobavail : mtd->oobsize;
@@ -1714,8 +1720,9 @@ static int nand_write_ecc (struct mtd_info *mtd, loff_t to, size_t len,
                         numpages = min (totalpages, ppblock);
                         page &= this->pagemask;
                         startpage = page;
-                        oobbuf = nand_prepare_oobbuf (mtd, eccbuf, oobsel, 
+                        oobbuf = nand_prepare_oobbuf (mtd, eccbuf, oobsel,
                                         autoplace, numpages);
+                        oob = 0;
                         /* Check, if we cross a chip boundary */
                         if (!page) {
                                 chipnr++;
@@ -1731,7 +1738,7 @@ cmp:
                 oobbuf, oobsel, chipnr, (eccbuf != NULL));
         if (!ret)
                 *retlen = written;
-        else    
+        else
                 DEBUG (MTD_DEBUG_LEVEL0, "nand_write_ecc: verify_pages failed %d\n", ret);
 
 out:
@@ -1791,7 +1798,7 @@ static int nand_write_oob (struct mtd_info *mtd, loff_t to, size_t len, size_t *
         /* Check, if it is write protected */
         if (nand_check_wp(mtd))
                 goto out;
-        
+
         /* Invalidate the page cache, if we write to the cached page */
         if (page == this->pagebuf)
                 this->pagebuf = -1;
@@ -1854,10 +1861,10 @@ out:
  *
  * NAND write with kvec. This just calls the ecc function
  */
-static int nand_writev (struct mtd_info *mtd, const struct kvec *vecs, unsigned long count, 
+static int nand_writev (struct mtd_info *mtd, const struct kvec *vecs, unsigned long count,
                 loff_t to, size_t * retlen)
 {
-        return (nand_writev_ecc (mtd, vecs, count, to, retlen, NULL, NULL));    
+        return (nand_writev_ecc (mtd, vecs, count, to, retlen, NULL, NULL));
 }
 
 /**
@@ -1872,7 +1879,7 @@ static int nand_writev (struct mtd_info *mtd, const struct kvec *vecs, unsigned
  *
  * NAND write with iovec with ecc
  */
-static int nand_writev_ecc (struct mtd_info *mtd, const struct kvec *vecs, unsigned long count, 
+static int nand_writev_ecc (struct mtd_info *mtd, const struct kvec *vecs, unsigned long count,
                 loff_t to, size_t * retlen, u_char *eccbuf, struct nand_oobinfo *oobsel)
 {
         int i, page, len, total_len, ret = -EIO, written = 0, chipnr;
@@ -1898,7 +1905,7 @@ static int nand_writev_ecc (struct mtd_info *mtd, const struct kvec *vecs, unsig
                 return -EINVAL;
         }
 
-        /* reject writes, which are not page aligned */ 
+        /* reject writes, which are not page aligned */
         if (NOTALIGNED (to) || NOTALIGNED(total_len)) {
                 printk (KERN_NOTICE "nand_write_ecc: Attempt to write not page aligned data\n");
                 return -EINVAL;
@@ -1917,21 +1924,21 @@ static int nand_writev_ecc (struct mtd_info *mtd, const struct kvec *vecs, unsig
                 goto out;
 
         /* if oobsel is NULL, use chip defaults */
-        if (oobsel == NULL) 
-                oobsel = &mtd->oobinfo;         
+        if (oobsel == NULL)
+                oobsel = &mtd->oobinfo;
 
         /* Autoplace of oob data ? Use the default placement scheme */
         if (oobsel->useecc == MTD_NANDECC_AUTOPLACE) {
                 oobsel = this->autooob;
                 autoplace = 1;
-        }       
+        }
         if (oobsel->useecc == MTD_NANDECC_AUTOPL_USR)
                 autoplace = 1;
 
         /* Setup start page */
         page = (int) (to >> this->page_shift);
         /* Invalidate the page cache, if we write to the cached page */
-        if (page <= this->pagebuf && this->pagebuf < ((to + total_len) >> this->page_shift))  
+        if (page <= this->pagebuf && this->pagebuf < ((to + total_len) >> this->page_shift))
                 this->pagebuf = -1;
 
         startpage = page & this->pagemask;
@@ -1955,10 +1962,10 @@ static int nand_writev_ecc (struct mtd_info *mtd, const struct kvec *vecs, unsig
                         oob = 0;
                         for (i = 1; i <= numpages; i++) {
                                 /* Write one page. If this is the last page to write
-                                 * then use the real pageprogram command, else select 
+                                 * then use the real pageprogram command, else select
                                  * cached programming if supported by the chip.
                                  */
-                                ret = nand_write_page (mtd, this, page & this->pagemask, 
+                                ret = nand_write_page (mtd, this, page & this->pagemask,
                                         &oobbuf[oob], oobsel, i != numpages);
                                 if (ret)
                                         goto out;
@@ -1974,12 +1981,12 @@ static int nand_writev_ecc (struct mtd_info *mtd, const struct kvec *vecs, unsig
                                 count--;
                         }
                 } else {
-                        /* We must use the internal buffer, read data out of each 
+                        /* We must use the internal buffer, read data out of each
                          * tuple until we have a full page to write
                          */
                         int cnt = 0;
                         while (cnt < mtd->oobblock) {
-                                if (vecs->iov_base != NULL && vecs->iov_len) 
+                                if (vecs->iov_base != NULL && vecs->iov_len)
                                         this->data_buf[cnt++] = ((u_char *) vecs->iov_base)[len++];
                                 /* Check, if we have to switch to the next tuple */
                                 if (len >= (int) vecs->iov_len) {
@@ -1988,10 +1995,10 @@ static int nand_writev_ecc (struct mtd_info *mtd, const struct kvec *vecs, unsig
                                         count--;
                                 }
                         }
-                        this->pagebuf = page;   
-                        this->data_poi = this->data_buf;        
+                        this->pagebuf = page;
+                        this->data_poi = this->data_buf;
                         bufstart = this->data_poi;
-                        numpages = 1;           
+                        numpages = 1;
                         oobbuf = nand_prepare_oobbuf (mtd, NULL, oobsel, autoplace, numpages);
                         ret = nand_write_page (mtd, this, page & this->pagemask,
                                 oobbuf, oobsel, 0);
@@ -2004,7 +2011,7 @@ static int nand_writev_ecc (struct mtd_info *mtd, const struct kvec *vecs, unsig
                 ret = nand_verify_pages (mtd, this, startpage, numpages, oobbuf, oobsel, chipnr, 0);
                 if (ret)
                         goto out;
-                        
+
                 written += mtd->oobblock * numpages;
                 /* All done ? */
                 if (!count)
@@ -2072,7 +2079,7 @@ static int nand_erase (struct mtd_info *mtd, struct erase_info *instr)
 {
         return nand_erase_nand (mtd, instr, 0);
 }
- 
+
 #define BBT_PAGE_MASK   0xffffff3f
 /**
  * nand_erase_intern - [NAND Interface] erase block(s)
@@ -2154,14 +2161,14 @@ int nand_erase_nand (struct mtd_info *mtd, struct erase_info *instr, int allowbb
                         instr->state = MTD_ERASE_FAILED;
                         goto erase_exit;
                 }
-                
-                /* Invalidate the page cache, if we erase the block which contains 
+
+                /* Invalidate the page cache, if we erase the block which contains
                    the current cached page */
                 if (page <= this->pagebuf && this->pagebuf < (page + pages_per_block))
                         this->pagebuf = -1;
 
                 this->erase_cmd (mtd, page & this->pagemask);
-                
+
                 status = this->waitfunc (mtd, this, FL_ERASING);
 
                 /* See if operation failed and additional status checks are available */
@@ -2179,12 +2186,12 @@ int nand_erase_nand (struct mtd_info *mtd, struct erase_info *instr, int allowbb
 
                 /* if BBT requires refresh, set the BBT rewrite flag to the page being erased */
                 if (this->options & BBT_AUTO_REFRESH) {
-                        if (((page & BBT_PAGE_MASK) == bbt_masked_page) && 
+                        if (((page & BBT_PAGE_MASK) == bbt_masked_page) &&
                              (page != this->bbt_td->pages[chipnr])) {
                                 rewrite_bbt[chipnr] = (page << this->page_shift);
                         }
                 }
-                
+
                 /* Increment page address and decrement length */
                 len -= (1 << this->phys_erase_shift);
                 page += pages_per_block;
@@ -2195,7 +2202,7 @@ int nand_erase_nand (struct mtd_info *mtd, struct erase_info *instr, int allowbb
                         this->select_chip(mtd, -1);
                         this->select_chip(mtd, chipnr);
 
-                        /* if BBT requires refresh and BBT-PERCHIP, 
+                        /* if BBT requires refresh and BBT-PERCHIP,
                          *   set the BBT page mask to see if this BBT should be rewritten */
                         if ((this->options & BBT_AUTO_REFRESH) && (this->bbt_td->options & NAND_BBT_PERCHIP)) {
                                 bbt_masked_page = this->bbt_td->pages[chipnr] & BBT_PAGE_MASK;
@@ -2220,7 +2227,7 @@ erase_exit:
                 for (chipnr = 0; chipnr < this->numchips; chipnr++) {
                         if (rewrite_bbt[chipnr]) {
                                 /* update the BBT for chip */
-                                DEBUG (MTD_DEBUG_LEVEL0, "nand_erase_nand: nand_update_bbt (%d:0x%0x 0x%0x)\n", 
+                                DEBUG (MTD_DEBUG_LEVEL0, "nand_erase_nand: nand_update_bbt (%d:0x%0x 0x%0x)\n",
                                         chipnr, rewrite_bbt[chipnr], this->bbt_td->pages[chipnr]);
                                 nand_update_bbt (mtd, rewrite_bbt[chipnr]);
                         }
@@ -2258,9 +2265,9 @@ static void nand_sync (struct mtd_info *mtd)
 static int nand_block_isbad (struct mtd_info *mtd, loff_t ofs)
 {
         /* Check for invalid offset */
-        if (ofs > mtd->size) 
+        if (ofs > mtd->size)
                 return -EINVAL;
-        
+
         return nand_block_checkbad (mtd, ofs, 1, 0);
 }
 
@@ -2285,6 +2292,34 @@ static int nand_block_markbad (struct mtd_info *mtd, loff_t ofs)
 }
 
 /**
+ * nand_suspend - [MTD Interface] Suspend the NAND flash
+ * @mtd:        MTD device structure
+ */
+static int nand_suspend(struct mtd_info *mtd)
+{
+        struct nand_chip *this = mtd->priv;
+
+        return nand_get_device (this, mtd, FL_PM_SUSPENDED);
+}
+
+/**
+ * nand_resume - [MTD Interface] Resume the NAND flash
+ * @mtd:        MTD device structure
+ */
+static void nand_resume(struct mtd_info *mtd)
+{
+        struct nand_chip *this = mtd->priv;
+
+        if (this->state == FL_PM_SUSPENDED)
+                nand_release_device(mtd);
+        else
+                printk(KERN_ERR "resume() called for the chip which is not "
+                                "in suspended state\n");
+
+}
+
+
+/**
  * nand_scan - [NAND Interface] Scan for the NAND device
  * @mtd:        MTD device structure
  * @maxchips:   Number of chips to scan for
@@ -2351,13 +2386,13 @@ int nand_scan (struct mtd_info *mtd, int maxchips)
 
         /* Print and store flash device information */
         for (i = 0; nand_flash_ids[i].name != NULL; i++) {
-                                
-                if (nand_dev_id != nand_flash_ids[i].id) 
+
+                if (nand_dev_id != nand_flash_ids[i].id)
                         continue;
 
                 if (!mtd->name) mtd->name = nand_flash_ids[i].name;
                 this->chipsize = nand_flash_ids[i].chipsize << 20;
-                
+
                 /* New devices have all the information in additional id bytes */
                 if (!nand_flash_ids[i].pagesize) {
                         int extid;
@@ -2369,14 +2404,14 @@ int nand_scan (struct mtd_info *mtd, int maxchips)
                         mtd->oobblock = 1024 << (extid & 0x3);
                         extid >>= 2;
                         /* Calc oobsize */
-                        mtd->oobsize = (8 << (extid & 0x03)) * (mtd->oobblock / 512);
+                        mtd->oobsize = (8 << (extid & 0x01)) * (mtd->oobblock >> 9);
                         extid >>= 2;
                         /* Calc blocksize. Blocksize is multiples of 64KiB */
                         mtd->erasesize = (64 * 1024)  << (extid & 0x03);
                         extid >>= 2;
                         /* Get buswidth information */
                         busw = (extid & 0x01) ? NAND_BUSWIDTH_16 : 0;
-                
+
                 } else {
                         /* Old devices have this data hardcoded in the
                          * device id table */
@@ -2396,23 +2431,23 @@ int nand_scan (struct mtd_info *mtd, int maxchips)
                  * this correct ! */
                 if (busw != (this->options & NAND_BUSWIDTH_16)) {
                         printk (KERN_INFO "NAND device: Manufacturer ID:"
-                                " 0x%02x, Chip ID: 0x%02x (%s %s)\n", nand_maf_id, nand_dev_id, 
+                                " 0x%02x, Chip ID: 0x%02x (%s %s)\n", nand_maf_id, nand_dev_id,
                                 nand_manuf_ids[maf_id].name , mtd->name);
-                        printk (KERN_WARNING 
-                                "NAND bus width %d instead %d bit\n", 
+                        printk (KERN_WARNING
+                                "NAND bus width %d instead %d bit\n",
                                         (this->options & NAND_BUSWIDTH_16) ? 16 : 8,
                                         busw ? 16 : 8);
                         this->select_chip(mtd, -1);
-                        return 1;       
+                        return 1;
                 }
-                
-                /* Calculate the address shift from the page size */    
+
+                /* Calculate the address shift from the page size */
                 this->page_shift = ffs(mtd->oobblock) - 1;
                 this->bbt_erase_shift = this->phys_erase_shift = ffs(mtd->erasesize) - 1;
                 this->chip_shift = ffs(this->chipsize) - 1;
 
                 /* Set the bad block position */
-                this->badblockpos = mtd->oobblock > 512 ? 
+                this->badblockpos = mtd->oobblock > 512 ?
                         NAND_LARGE_BADBLOCK_POS : NAND_SMALL_BADBLOCK_POS;
 
                 /* Get chip options, preserve non chip based options */
@@ -2422,10 +2457,10 @@ int nand_scan (struct mtd_info *mtd, int maxchips)
                 this->options |= NAND_NO_AUTOINCR;
                 /* Check if this is a not a samsung device. Do not clear the options
                  * for chips which are not having an extended id.
-                 */     
+                 */
                 if (nand_maf_id != NAND_MFR_SAMSUNG && !nand_flash_ids[i].pagesize)
                         this->options &= ~NAND_SAMSUNG_LP_OPTIONS;
-                
+
                 /* Check for AND chips with 4 page planes */
                 if (this->options & NAND_4PAGE_ARRAY)
                         this->erase_cmd = multi_erase_cmd;
@@ -2435,9 +2470,9 @@ int nand_scan (struct mtd_info *mtd, int maxchips)
                 /* Do not replace user supplied command function ! */
                 if (mtd->oobblock > 512 && this->cmdfunc == nand_command)
                         this->cmdfunc = nand_command_lp;
-                                
+
                 printk (KERN_INFO "NAND device: Manufacturer ID:"
-                        " 0x%02x, Chip ID: 0x%02x (%s %s)\n", nand_maf_id, nand_dev_id, 
+                        " 0x%02x, Chip ID: 0x%02x (%s %s)\n", nand_maf_id, nand_dev_id,
                         nand_manuf_ids[maf_id].name , nand_flash_ids[i].name);
                 break;
         }
@@ -2461,7 +2496,7 @@ int nand_scan (struct mtd_info *mtd, int maxchips)
         }
         if (i > 1)
                 printk(KERN_INFO "%d NAND chips detected\n", i);
-        
+
         /* Allocate buffers, if neccecary */
         if (!this->oob_buf) {
                 size_t len;
@@ -2473,7 +2508,7 @@ int nand_scan (struct mtd_info *mtd, int maxchips)
                 }
                 this->options |= NAND_OOBBUF_ALLOC;
         }
-        
+
         if (!this->data_buf) {
                 size_t len;
                 len = mtd->oobblock + mtd->oobsize;
@@ -2500,7 +2535,7 @@ int nand_scan (struct mtd_info *mtd, int maxchips)
         if (!this->autooob) {
                 /* Select the appropriate default oob placement scheme for
                  * placement agnostic filesystems */
-                switch (mtd->oobsize) { 
+                switch (mtd->oobsize) {
                 case 8:
                         this->autooob = &nand_oob_8;
                         break;
@@ -2516,19 +2551,19 @@ int nand_scan (struct mtd_info *mtd, int maxchips)
                         BUG();
                 }
         }
-        
+
         /* The number of bytes available for the filesystem to place fs dependend
          * oob data */
         mtd->oobavail = 0;
         for (i = 0; this->autooob->oobfree[i][1]; i++)
                 mtd->oobavail += this->autooob->oobfree[i][1];
 
-        /* 
+        /*
          * check ECC mode, default to software
          * if 3byte/512byte hardware ECC is selected and we have 256 byte pagesize
-         * fallback to software ECC 
+         * fallback to software ECC
         */
-        this->eccsize = 256;    /* set default eccsize */       
+        this->eccsize = 256;    /* set default eccsize */
         this->eccbytes = 3;
 
         switch (this->eccmode) {
@@ -2543,56 +2578,56 @@ int nand_scan (struct mtd_info *mtd, int maxchips)
                         this->eccsize = 2048;
                 break;
 
-        case NAND_ECC_HW3_512: 
-        case NAND_ECC_HW6_512: 
-        case NAND_ECC_HW8_512: 
+        case NAND_ECC_HW3_512:
+        case NAND_ECC_HW6_512:
+        case NAND_ECC_HW8_512:
                 if (mtd->oobblock == 256) {
                         printk (KERN_WARNING "512 byte HW ECC not possible on 256 Byte pagesize, fallback to SW ECC \n");
                         this->eccmode = NAND_ECC_SOFT;
                         this->calculate_ecc = nand_calculate_ecc;
                         this->correct_data = nand_correct_data;
-                } else 
+                } else
                         this->eccsize = 512; /* set eccsize to 512 */
                 break;
-                        
+
         case NAND_ECC_HW3_256:
                 break;
-                
-        case NAND_ECC_NONE: 
+
+        case NAND_ECC_NONE:
                 printk (KERN_WARNING "NAND_ECC_NONE selected by board driver. This is not recommended !!\n");
                 this->eccmode = NAND_ECC_NONE;
                 break;
 
-        case NAND_ECC_SOFT:     
+        case NAND_ECC_SOFT:
                 this->calculate_ecc = nand_calculate_ecc;
                 this->correct_data = nand_correct_data;
                 break;
 
         default:
                 printk (KERN_WARNING "Invalid NAND_ECC_MODE %d\n", this->eccmode);
-                BUG();  
-        }       
+                BUG();
+        }
 
-        /* Check hardware ecc function availability and adjust number of ecc bytes per 
+        /* Check hardware ecc function availability and adjust number of ecc bytes per
          * calculation step
         */
         switch (this->eccmode) {
         case NAND_ECC_HW12_2048:
                 this->eccbytes += 4;
-        case NAND_ECC_HW8_512: 
+        case NAND_ECC_HW8_512:
                 this->eccbytes += 2;
-        case NAND_ECC_HW6_512: 
+        case NAND_ECC_HW6_512:
                 this->eccbytes += 3;
-        case NAND_ECC_HW3_512: 
+        case NAND_ECC_HW3_512:
         case NAND_ECC_HW3_256:
                 if (this->calculate_ecc && this->correct_data && this->enable_hwecc)
                         break;
                 printk (KERN_WARNING "No ECC functions supplied, Hardware ECC not possible\n");
-                BUG();  
+                BUG();
         }
-                
+
         mtd->eccsize = this->eccsize;
-        
+
         /* Set the number of read / write steps for one page to ensure ECC generation */
         switch (this->eccmode) {
         case NAND_ECC_HW12_2048:
@@ -2604,15 +2639,15 @@ int nand_scan (struct mtd_info *mtd, int maxchips)
                 this->eccsteps = mtd->oobblock / 512;
                 break;
         case NAND_ECC_HW3_256:
-        case NAND_ECC_SOFT:     
+        case NAND_ECC_SOFT:
                 this->eccsteps = mtd->oobblock / 256;
                 break;
-                
-        case NAND_ECC_NONE: 
+
+        case NAND_ECC_NONE:
                 this->eccsteps = 1;
                 break;
         }
-        
+
         /* Initialize state, waitqueue and spinlock */
         this->state = FL_READY;
         init_waitqueue_head (&this->wq);
@@ -2643,8 +2678,8 @@ int nand_scan (struct mtd_info *mtd, int maxchips)
         mtd->sync = nand_sync;
         mtd->lock = NULL;
         mtd->unlock = NULL;
-        mtd->suspend = NULL;
-        mtd->resume = NULL;
+        mtd->suspend = nand_suspend;
+        mtd->resume = nand_resume;
         mtd->block_isbad = nand_block_isbad;
         mtd->block_markbad = nand_block_markbad;
 
@@ -2652,7 +2687,7 @@ int nand_scan (struct mtd_info *mtd, int maxchips)
         memcpy(&mtd->oobinfo, this->autooob, sizeof(mtd->oobinfo));
 
         mtd->owner = THIS_MODULE;
-        
+
         /* Check, if we should skip the bad block table scan */
         if (this->options & NAND_SKIP_BBTSCAN)
                 return 0;
@@ -2662,7 +2697,7 @@ int nand_scan (struct mtd_info *mtd, int maxchips)
 }
 
 /**
- * nand_release - [NAND Interface] Free resources held by the NAND device 
+ * nand_release - [NAND Interface] Free resources held by the NAND device
  * @mtd:        MTD device structure
 */
 void nand_release (struct mtd_info *mtd)
@@ -2676,9 +2711,8 @@ void nand_release (struct mtd_info *mtd)
         /* Deregister the device */
         del_mtd_device (mtd);
 
-        /* Free bad block table memory, if allocated */
-        if (this->bbt)
-                kfree (this->bbt);
+        /* Free bad block table memory */
+        kfree (this->bbt);
         /* Buffer allocated by nand_scan ? */
         if (this->options & NAND_OOBBUF_ALLOC)
                 kfree (this->oob_buf);
diff --git a/drivers/mtd/nand/nand_bbt.c b/drivers/mtd/nand/nand_bbt.c
index 7535ef53685e..ca286999fe08 100644
--- a/drivers/mtd/nand/nand_bbt.c
+++ b/drivers/mtd/nand/nand_bbt.c
@@ -3,10 +3,10 @@
  *
  *  Overview:
  *   Bad block table support for the NAND driver
- *   
+ *
  *  Copyright (C) 2004 Thomas Gleixner (tglx@linutronix.de)
  *
- * $Id: nand_bbt.c,v 1.35 2005/07/15 13:53:47 gleixner Exp $
+ * $Id: nand_bbt.c,v 1.36 2005/11/07 11:14:30 gleixner Exp $
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 as
@@ -14,23 +14,23 @@
  *
  * Description:
  *
- * When nand_scan_bbt is called, then it tries to find the bad block table 
- * depending on the options in the bbt descriptor(s). If a bbt is found 
- * then the contents are read and the memory based bbt is created. If a 
+ * When nand_scan_bbt is called, then it tries to find the bad block table
+ * depending on the options in the bbt descriptor(s). If a bbt is found
+ * then the contents are read and the memory based bbt is created. If a
  * mirrored bbt is selected then the mirror is searched too and the
- * versions are compared. If the mirror has a greater version number 
+ * versions are compared. If the mirror has a greater version number
  * than the mirror bbt is used to build the memory based bbt.
  * If the tables are not versioned, then we "or" the bad block information.
- * If one of the bbt's is out of date or does not exist it is (re)created. 
- * If no bbt exists at all then the device is scanned for factory marked 
- * good / bad blocks and the bad block tables are created. 
+ * If one of the bbt's is out of date or does not exist it is (re)created.
+ * If no bbt exists at all then the device is scanned for factory marked
+ * good / bad blocks and the bad block tables are created.
  *
- * For manufacturer created bbts like the one found on M-SYS DOC devices 
+ * For manufacturer created bbts like the one found on M-SYS DOC devices
  * the bbt is searched and read but never created
  *
- * The autogenerated bad block table is located in the last good blocks 
- * of the device. The table is mirrored, so it can be updated eventually. 
- * The table is marked in the oob area with an ident pattern and a version 
+ * The autogenerated bad block table is located in the last good blocks
+ * of the device. The table is mirrored, so it can be updated eventually.
+ * The table is marked in the oob area with an ident pattern and a version
  * number which indicates which of both tables is more up to date.
  *
  * The table uses 2 bits per block
@@ -43,13 +43,13 @@
  * 01b:         block is marked bad due to wear
  * 10b:         block is reserved (to protect the bbt area)
  * 11b:         block is factory marked bad
- * 
+ *
  * Multichip devices like DOC store the bad block info per floor.
  *
  * Following assumptions are made:
  * - bbts start at a page boundary, if autolocated on a block boundary
  * - the space neccecary for a bbt in FLASH does not exceed a block boundary
- * 
+ *
  */
 
 #include <linux/slab.h>
@@ -62,7 +62,7 @@
 #include <linux/delay.h>
 
 
-/** 
+/**
  * check_pattern - [GENERIC] check if a pattern is in the buffer
  * @buf:        the buffer to search
  * @len:        the length of buffer to search
@@ -86,9 +86,9 @@ static int check_pattern (uint8_t *buf, int len, int paglen, struct nand_bbt_des
                         if (p[i] != 0xff)
                                 return -1;
                 }
-        }       
+        }
         p += end;
-        
+
         /* Compare the pattern */
         for (i = 0; i < td->len; i++) {
                 if (p[i] != td->pattern[i])
@@ -106,13 +106,13 @@ static int check_pattern (uint8_t *buf, int len, int paglen, struct nand_bbt_des
         return 0;
 }
 
-/** 
+/**
  * check_short_pattern - [GENERIC] check if a pattern is in the buffer
  * @buf:        the buffer to search
  * @td:         search pattern descriptor
  *
  * Check for a pattern at the given place. Used to search bad block
- * tables and good / bad block identifiers. Same as check_pattern, but 
+ * tables and good / bad block identifiers. Same as check_pattern, but
  * no optional empty check
  *
 */
@@ -142,7 +142,7 @@ static int check_short_pattern (uint8_t *buf, struct nand_bbt_descr *td)
  * Read the bad block table starting from page.
  *
  */
-static int read_bbt (struct mtd_info *mtd, uint8_t *buf, int page, int num, 
+static int read_bbt (struct mtd_info *mtd, uint8_t *buf, int page, int num,
         int bits, int offs, int reserved_block_code)
 {
         int res, i, j, act = 0;
@@ -153,7 +153,7 @@ static int read_bbt (struct mtd_info *mtd, uint8_t *buf, int page, int num,
 
         totlen = (num * bits) >> 3;
         from = ((loff_t)page) << this->page_shift;
-        
+
         while (totlen) {
                 len = min (totlen, (size_t) (1 << this->bbt_erase_shift));
                 res = mtd->read_ecc (mtd, from, len, &retlen, buf, NULL, this->autooob);
@@ -163,7 +163,7 @@ static int read_bbt (struct mtd_info *mtd, uint8_t *buf, int page, int num,
                                 return res;
                         }
                         printk (KERN_WARNING "nand_bbt: ECC error while reading bad block table\n");
-                }       
+                }
 
                 /* Analyse data */
                 for (i = 0; i < len; i++) {
@@ -183,12 +183,12 @@ static int read_bbt (struct mtd_info *mtd, uint8_t *buf, int page, int num,
                                  * message to MTD_DEBUG_LEVEL0 */
                                 printk (KERN_DEBUG "nand_read_bbt: Bad block at 0x%08x\n",
                                         ((offs << 2) + (act >> 1)) << this->bbt_erase_shift);
-                                /* Factory marked bad or worn out ? */  
+                                /* Factory marked bad or worn out ? */
                                 if (tmp == 0)
                                         this->bbt[offs + (act >> 3)] |= 0x3 << (act & 0x06);
                                 else
                                         this->bbt[offs + (act >> 3)] |= 0x1 << (act & 0x06);
-                        }       
+                        }
                 }
                 totlen -= len;
                 from += len;
@@ -200,7 +200,7 @@ static int read_bbt (struct mtd_info *mtd, uint8_t *buf, int page, int num,
  * read_abs_bbt - [GENERIC] Read the bad block table starting at a given page
  * @mtd:        MTD device structure
  * @buf:        temporary buffer
- * @td:         descriptor for the bad block table 
+ * @td:         descriptor for the bad block table
  * @chip:       read the table for a specific chip, -1 read all chips.
  *              Applies only if NAND_BBT_PERCHIP option is set
  *
@@ -235,7 +235,7 @@ static int read_abs_bbt (struct mtd_info *mtd, uint8_t *buf, struct nand_bbt_des
  * read_abs_bbts - [GENERIC] Read the bad block table(s) for all chips starting at a given page
  * @mtd:        MTD device structure
  * @buf:        temporary buffer
- * @td:         descriptor for the bad block table 
+ * @td:         descriptor for the bad block table
  * @md:         descriptor for the bad block table mirror
  *
  * Read the bad block table(s) for all chips starting at a given page
@@ -247,16 +247,16 @@ static int read_abs_bbts (struct mtd_info *mtd, uint8_t *buf, struct nand_bbt_de
 {
         struct nand_chip *this = mtd->priv;
 
-        /* Read the primary version, if available */    
+        /* Read the primary version, if available */
         if (td->options & NAND_BBT_VERSION) {
-                nand_read_raw (mtd, buf, td->pages[0] << this->page_shift, mtd->oobblock, mtd->oobsize); 
+                nand_read_raw (mtd, buf, td->pages[0] << this->page_shift, mtd->oobblock, mtd->oobsize);
                 td->version[0] = buf[mtd->oobblock + td->veroffs];
                 printk (KERN_DEBUG "Bad block table at page %d, version 0x%02X\n", td->pages[0], td->version[0]);
         }
 
-        /* Read the mirror version, if available */     
+        /* Read the mirror version, if available */
         if (md && (md->options & NAND_BBT_VERSION)) {
-                nand_read_raw (mtd, buf, md->pages[0] << this->page_shift, mtd->oobblock, mtd->oobsize); 
+                nand_read_raw (mtd, buf, md->pages[0] << this->page_shift, mtd->oobblock, mtd->oobsize);
                 md->version[0] = buf[mtd->oobblock + md->veroffs];
                 printk (KERN_DEBUG "Bad block table at page %d, version 0x%02X\n", md->pages[0], md->version[0]);
         }
@@ -290,7 +290,7 @@ static int create_bbt (struct mtd_info *mtd, uint8_t *buf, struct nand_bbt_descr
         else {
                 if (bd->options & NAND_BBT_SCAN2NDPAGE)
                         len = 2;
-                else    
+                else
                         len = 1;
         }
 
@@ -322,10 +322,10 @@ static int create_bbt (struct mtd_info *mtd, uint8_t *buf, struct nand_bbt_descr
                 numblocks += startblock;
                 from = startblock << (this->bbt_erase_shift - 1);
         }
-        
+
         for (i = startblock; i < numblocks;) {
                 int ret;
-                
+
                 if (bd->options & NAND_BBT_SCANEMPTY)
                         if ((ret = nand_read_raw (mtd, buf, from, readlen, ooblen)))
                                 return ret;
@@ -333,8 +333,8 @@ static int create_bbt (struct mtd_info *mtd, uint8_t *buf, struct nand_bbt_descr
                 for (j = 0; j < len; j++) {
                         if (!(bd->options & NAND_BBT_SCANEMPTY)) {
                                 size_t retlen;
-                                
-                                /* Read the full oob until read_oob is fixed to 
+
+                                /* Read the full oob until read_oob is fixed to
                                  * handle single byte reads for 16 bit buswidth */
                                 ret = mtd->read_oob(mtd, from + j * mtd->oobblock,
                                                         mtd->oobsize, &retlen, buf);
@@ -343,14 +343,14 @@ static int create_bbt (struct mtd_info *mtd, uint8_t *buf, struct nand_bbt_descr
 
                                 if (check_short_pattern (buf, bd)) {
                                         this->bbt[i >> 3] |= 0x03 << (i & 0x6);
-                                        printk (KERN_WARNING "Bad eraseblock %d at 0x%08x\n", 
+                                        printk (KERN_WARNING "Bad eraseblock %d at 0x%08x\n",
                                                 i >> 1, (unsigned int) from);
                                         break;
                                 }
                         } else {
                                 if (check_pattern (&buf[j * scanlen], scanlen, mtd->oobblock, bd)) {
                                         this->bbt[i >> 3] |= 0x03 << (i & 0x6);
-                                        printk (KERN_WARNING "Bad eraseblock %d at 0x%08x\n", 
+                                        printk (KERN_WARNING "Bad eraseblock %d at 0x%08x\n",
                                                 i >> 1, (unsigned int) from);
                                         break;
                                 }
@@ -369,15 +369,15 @@ static int create_bbt (struct mtd_info *mtd, uint8_t *buf, struct nand_bbt_descr
  * @td:         descriptor for the bad block table
  *
  * Read the bad block table by searching for a given ident pattern.
- * Search is preformed either from the beginning up or from the end of 
+ * Search is preformed either from the beginning up or from the end of
  * the device downwards. The search starts always at the start of a
  * block.
- * If the option NAND_BBT_PERCHIP is given, each chip is searched 
+ * If the option NAND_BBT_PERCHIP is given, each chip is searched
  * for a bbt, which contains the bad block information of this chip.
  * This is neccecary to provide support for certain DOC devices.
  *
- * The bbt ident pattern resides in the oob area of the first page 
- * in a block. 
+ * The bbt ident pattern resides in the oob area of the first page
+ * in a block.
  */
 static int search_bbt (struct mtd_info *mtd, uint8_t *buf, struct nand_bbt_descr *td)
 {
@@ -392,10 +392,10 @@ static int search_bbt (struct mtd_info *mtd, uint8_t *buf, struct nand_bbt_descr
                 startblock = (mtd->size >> this->bbt_erase_shift) -1;
                 dir = -1;
         } else {
-                startblock = 0; 
+                startblock = 0;
                 dir = 1;
-        }       
-        
+        }
+
         /* Do we have a bbt per chip ? */
         if (td->options & NAND_BBT_PERCHIP) {
                 chips = this->numchips;
@@ -405,19 +405,19 @@ static int search_bbt (struct mtd_info *mtd, uint8_t *buf, struct nand_bbt_descr
                 chips = 1;
                 bbtblocks = mtd->size >> this->bbt_erase_shift;
         }
-        
+
         /* Number of bits for each erase block in the bbt */
         bits = td->options & NAND_BBT_NRBITS_MSK;
-        
+
         for (i = 0; i < chips; i++) {
                 /* Reset version information */
-                td->version[i] = 0;     
+                td->version[i] = 0;
                 td->pages[i] = -1;
                 /* Scan the maximum number of blocks */
                 for (block = 0; block < td->maxblocks; block++) {
                         int actblock = startblock + dir * block;
                         /* Read first page */
-                        nand_read_raw (mtd, buf, actblock << this->bbt_erase_shift, mtd->oobblock, mtd->oobsize); 
+                        nand_read_raw (mtd, buf, actblock << this->bbt_erase_shift, mtd->oobblock, mtd->oobsize);
                         if (!check_pattern(buf, scanlen, mtd->oobblock, td)) {
                                 td->pages[i] = actblock << (this->bbt_erase_shift - this->page_shift);
                                 if (td->options & NAND_BBT_VERSION) {
@@ -435,46 +435,46 @@ static int search_bbt (struct mtd_info *mtd, uint8_t *buf, struct nand_bbt_descr
                 else
                         printk (KERN_DEBUG "Bad block table found at page %d, version 0x%02X\n", td->pages[i], td->version[i]);
         }
-        return 0;       
+        return 0;
 }
 
 /**
  * search_read_bbts - [GENERIC] scan the device for bad block table(s)
  * @mtd:        MTD device structure
  * @buf:        temporary buffer
- * @td:         descriptor for the bad block table 
+ * @td:         descriptor for the bad block table
  * @md:         descriptor for the bad block table mirror
  *
  * Search and read the bad block table(s)
 */
-static int search_read_bbts (struct mtd_info *mtd, uint8_t *buf, 
+static int search_read_bbts (struct mtd_info *mtd, uint8_t *buf,
         struct nand_bbt_descr *td, struct nand_bbt_descr *md)
 {
         /* Search the primary table */
         search_bbt (mtd, buf, td);
-                
+
         /* Search the mirror table */
         if (md)
                 search_bbt (mtd, buf, md);
-        
+
         /* Force result check */
-        return 1;       
+        return 1;
 }
-        
 
-/** 
+
+/**
  * write_bbt - [GENERIC] (Re)write the bad block table
  *
  * @mtd:        MTD device structure
  * @buf:        temporary buffer
- * @td:         descriptor for the bad block table 
+ * @td:         descriptor for the bad block table
  * @md:         descriptor for the bad block table mirror
  * @chipsel:    selector for a specific chip, -1 for all
  *
  * (Re)write the bad block table
  *
 */
-static int write_bbt (struct mtd_info *mtd, uint8_t *buf, 
+static int write_bbt (struct mtd_info *mtd, uint8_t *buf,
         struct nand_bbt_descr *td, struct nand_bbt_descr *md, int chipsel)
 {
         struct nand_chip *this = mtd->priv;
@@ -493,7 +493,7 @@ static int write_bbt (struct mtd_info *mtd, uint8_t *buf,
         /* Write bad block table per chip rather than per device ? */
         if (td->options & NAND_BBT_PERCHIP) {
                 numblocks = (int) (this->chipsize >> this->bbt_erase_shift);
-                /* Full device write or specific chip ? */      
+                /* Full device write or specific chip ? */
                 if (chipsel == -1) {
                         nrchips = this->numchips;
                 } else {
@@ -503,19 +503,19 @@ static int write_bbt (struct mtd_info *mtd, uint8_t *buf,
         } else {
                 numblocks = (int) (mtd->size >> this->bbt_erase_shift);
                 nrchips = 1;
-        }       
-        
+        }
+
         /* Loop through the chips */
         for (; chip < nrchips; chip++) {
-                
-                /* There was already a version of the table, reuse the page 
-                 * This applies for absolute placement too, as we have the 
+
+                /* There was already a version of the table, reuse the page
+                 * This applies for absolute placement too, as we have the
                  * page nr. in td->pages.
                  */
                 if (td->pages[chip] != -1) {
                         page = td->pages[chip];
                         goto write;
-                }       
+                }
 
                 /* Automatic placement of the bad block table */
                 /* Search direction top -> down ? */
@@ -525,7 +525,7 @@ static int write_bbt (struct mtd_info *mtd, uint8_t *buf,
                 } else {
                         startblock = chip * numblocks;
                         dir = 1;
-                }       
+                }
 
                 for (i = 0; i < td->maxblocks; i++) {
                         int block = startblock + dir * i;
@@ -542,7 +542,7 @@ static int write_bbt (struct mtd_info *mtd, uint8_t *buf,
                 }
                 printk (KERN_ERR "No space left to write bad block table\n");
                 return -ENOSPC;
-write:  
+write:
 
                 /* Set up shift count and masks for the flash table */
                 bits = td->options & NAND_BBT_NRBITS_MSK;
@@ -553,14 +553,14 @@ write:
                 case 8: sft = 0; sftmsk = 0x00; msk[0] = 0x00; msk[1] = 0x0F; msk[2] = ~rcode; msk[3] = 0xff; break;
                 default: return -EINVAL;
                 }
-                
+
                 bbtoffs = chip * (numblocks >> 2);
-                
+
                 to = ((loff_t) page) << this->page_shift;
 
                 memcpy (&oobinfo, this->autooob, sizeof(oobinfo));
                 oobinfo.useecc = MTD_NANDECC_PLACEONLY;
-                
+
                 /* Must we save the block contents ? */
                 if (td->options & NAND_BBT_SAVECONTENT) {
                         /* Make it block aligned */
@@ -599,7 +599,7 @@ write:
                                 buf[len + td->veroffs] = td->version[chip];
                         }
                 }
-        
+
                 /* walk through the memory table */
                 for (i = 0; i < numblocks; ) {
                         uint8_t dat;
@@ -611,7 +611,7 @@ write:
                                 dat >>= 2;
                         }
                 }
-                
+
                 memset (&einfo, 0, sizeof (einfo));
                 einfo.mtd = mtd;
                 einfo.addr = (unsigned long) to;
@@ -621,18 +621,18 @@ write:
                         printk (KERN_WARNING "nand_bbt: Error during block erase: %d\n", res);
                         return res;
                 }
-        
+
                 res = mtd->write_ecc (mtd, to, len, &retlen, buf, &buf[len], &oobinfo);
                 if (res < 0) {
                         printk (KERN_WARNING "nand_bbt: Error while writing bad block table %d\n", res);
                         return res;
                 }
-                printk (KERN_DEBUG "Bad block table written to 0x%08x, version 0x%02X\n", 
+                printk (KERN_DEBUG "Bad block table written to 0x%08x, version 0x%02X\n",
                         (unsigned int) to, td->version[chip]);
-        
+
                 /* Mark it as used */
                 td->pages[chip] = page;
-        }       
+        }
         return 0;
 }
 
@@ -641,7 +641,7 @@ write:
  * @mtd:        MTD device structure
  * @bd:         descriptor for the good/bad block search pattern
  *
- * The function creates a memory based bbt by scanning the device 
+ * The function creates a memory based bbt by scanning the device
  * for manufacturer / software marked good / bad blocks
 */
 static inline int nand_memory_bbt (struct mtd_info *mtd, struct nand_bbt_descr *bd)
@@ -673,11 +673,11 @@ static int check_create (struct mtd_info *mtd, uint8_t *buf, struct nand_bbt_des
         struct nand_bbt_descr *rd, *rd2;
 
         /* Do we have a bbt per chip ? */
-        if (td->options & NAND_BBT_PERCHIP) 
+        if (td->options & NAND_BBT_PERCHIP)
                 chips = this->numchips;
-        else 
+        else
                 chips = 1;
-        
+
         for (i = 0; i < chips; i++) {
                 writeops = 0;
                 rd = NULL;
@@ -692,7 +692,7 @@ static int check_create (struct mtd_info *mtd, uint8_t *buf, struct nand_bbt_des
                         }
 
                         if (td->pages[i] == -1) {
-                                rd = md;                                
+                                rd = md;
                                 td->version[i] = md->version[i];
                                 writeops = 1;
                                 goto writecheck;
@@ -710,7 +710,7 @@ static int check_create (struct mtd_info *mtd, uint8_t *buf, struct nand_bbt_des
                                 if (!(td->options & NAND_BBT_VERSION))
                                         rd2 = md;
                                 goto writecheck;
-                        }       
+                        }
 
                         if (((int8_t) (td->version[i] - md->version[i])) > 0) {
                                 rd = td;
@@ -735,15 +735,15 @@ static int check_create (struct mtd_info *mtd, uint8_t *buf, struct nand_bbt_des
 create:
                 /* Create the bad block table by scanning the device ? */
                 if (!(td->options & NAND_BBT_CREATE))
-                        continue;       
-                
+                        continue;
+
                 /* Create the table in memory by scanning the chip(s) */
                 create_bbt (mtd, buf, bd, chipsel);
-                
+
                 td->version[i] = 1;
                 if (md)
-                        md->version[i] = 1;     
-writecheck:     
+                        md->version[i] = 1;
+writecheck:
                 /* read back first ? */
                 if (rd)
                         read_abs_bbt (mtd, buf, rd, chipsel);
@@ -757,7 +757,7 @@ writecheck:
                         if (res < 0)
                                 return res;
                 }
-                
+
                 /* Write the mirror bad block table to the device ? */
                 if ((writeops & 0x02) && md && (md->options & NAND_BBT_WRITE)) {
                         res = write_bbt (mtd, buf, md, td, chipsel);
@@ -765,11 +765,11 @@ writecheck:
                                 return res;
                 }
         }
-        return 0;       
+        return 0;
 }
 
 /**
- * mark_bbt_regions - [GENERIC] mark the bad block table regions 
+ * mark_bbt_regions - [GENERIC] mark the bad block table regions
  * @mtd:        MTD device structure
  * @td:         bad block table descriptor
  *
@@ -790,14 +790,14 @@ static void mark_bbt_region (struct mtd_info *mtd, struct nand_bbt_descr *td)
         } else {
                 chips = 1;
                 nrblocks = (int)(mtd->size >> this->bbt_erase_shift);
-        }       
-        
+        }
+
         for (i = 0; i < chips; i++) {
                 if ((td->options & NAND_BBT_ABSPAGE) ||
                     !(td->options & NAND_BBT_WRITE)) {
                         if (td->pages[i] == -1) continue;
                         block = td->pages[i] >> (this->bbt_erase_shift - this->page_shift);
-                        block <<= 1;            
+                        block <<= 1;
                         oldval = this->bbt[(block >> 3)];
                         newval = oldval | (0x2 << (block & 0x06));
                         this->bbt[(block >> 3)] = newval;
@@ -808,16 +808,16 @@ static void mark_bbt_region (struct mtd_info *mtd, struct nand_bbt_descr *td)
                 update = 0;
                 if (td->options & NAND_BBT_LASTBLOCK)
                         block = ((i + 1) * nrblocks) - td->maxblocks;
-                else    
+                else
                         block = i * nrblocks;
-                block <<= 1;    
+                block <<= 1;
                 for (j = 0; j < td->maxblocks; j++) {
                         oldval = this->bbt[(block >> 3)];
                         newval = oldval | (0x2 << (block & 0x06));
                         this->bbt[(block >> 3)] = newval;
                         if (oldval != newval) update = 1;
                         block += 2;
-                }       
+                }
                 /* If we want reserved blocks to be recorded to flash, and some
                    new ones have been marked, then we need to update the stored
                    bbts.  This should only happen once. */
@@ -831,7 +831,7 @@ static void mark_bbt_region (struct mtd_info *mtd, struct nand_bbt_descr *td)
  * @mtd:        MTD device structure
  * @bd:         descriptor for the good/bad block search pattern
  *
- * The function checks, if a bad block table(s) is/are already 
+ * The function checks, if a bad block table(s) is/are already
  * available. If not it scans the device for manufacturer
  * marked good / bad blocks and writes the bad block table(s) to
  * the selected place.
@@ -880,30 +880,30 @@ int nand_scan_bbt (struct mtd_info *mtd, struct nand_bbt_descr *bd)
                 this->bbt = NULL;
                 return -ENOMEM;
         }
-        
+
         /* Is the bbt at a given page ? */
         if (td->options & NAND_BBT_ABSPAGE) {
                 res = read_abs_bbts (mtd, buf, td, md);
-        } else {        
+        } else {
                 /* Search the bad block table using a pattern in oob */
                 res = search_read_bbts (mtd, buf, td, md);
-        }       
+        }
 
-        if (res) 
+        if (res)
                 res = check_create (mtd, buf, bd);
-        
+
         /* Prevent the bbt regions from erasing / writing */
         mark_bbt_region (mtd, td);
         if (md)
                 mark_bbt_region (mtd, md);
-        
+
         kfree (buf);
         return res;
 }
 
 
 /**
- * nand_update_bbt - [NAND Interface] update bad block table(s) 
+ * nand_update_bbt - [NAND Interface] update bad block table(s)
  * @mtd:        MTD device structure
  * @offs:       the offset of the newly marked block
  *
@@ -930,7 +930,7 @@ int nand_update_bbt (struct mtd_info *mtd, loff_t offs)
                 printk (KERN_ERR "nand_update_bbt: Out of memory\n");
                 return -ENOMEM;
         }
-        
+
         writeops = md != NULL ? 0x03 : 0x01;
 
         /* Do we have a bbt per chip ? */
@@ -944,7 +944,7 @@ int nand_update_bbt (struct mtd_info *mtd, loff_t offs)
 
         td->version[chip]++;
         if (md)
-                md->version[chip]++;    
+                md->version[chip]++;
 
         /* Write the bad block table to the device ? */
         if ((writeops & 0x01) && (td->options & NAND_BBT_WRITE)) {
@@ -957,12 +957,12 @@ int nand_update_bbt (struct mtd_info *mtd, loff_t offs)
                 res = write_bbt (mtd, buf, md, td, chipsel);
         }
 
-out:    
+out:
         kfree (buf);
         return res;
 }
 
-/* Define some generic bad / good block scan pattern which are used 
+/* Define some generic bad / good block scan pattern which are used
  * while scanning a device for factory marked good / bad blocks. */
 static uint8_t scan_ff_pattern[] = { 0xff, 0xff };
 
@@ -1009,7 +1009,7 @@ static uint8_t bbt_pattern[] = {'B', 'b', 't', '0' };
 static uint8_t mirror_pattern[] = {'1', 't', 'b', 'B' };
 
 static struct nand_bbt_descr bbt_main_descr = {
-        .options = NAND_BBT_LASTBLOCK | NAND_BBT_CREATE | NAND_BBT_WRITE 
+        .options = NAND_BBT_LASTBLOCK | NAND_BBT_CREATE | NAND_BBT_WRITE
                 | NAND_BBT_2BIT | NAND_BBT_VERSION | NAND_BBT_PERCHIP,
         .offs = 8,
         .len = 4,
@@ -1019,7 +1019,7 @@ static struct nand_bbt_descr bbt_main_descr = {
 };
 
 static struct nand_bbt_descr bbt_mirror_descr = {
-        .options = NAND_BBT_LASTBLOCK | NAND_BBT_CREATE | NAND_BBT_WRITE 
+        .options = NAND_BBT_LASTBLOCK | NAND_BBT_CREATE | NAND_BBT_WRITE
                 | NAND_BBT_2BIT | NAND_BBT_VERSION | NAND_BBT_PERCHIP,
         .offs = 8,
         .len = 4,
@@ -1029,7 +1029,7 @@ static struct nand_bbt_descr bbt_mirror_descr = {
 };
 
 /**
- * nand_default_bbt - [NAND Interface] Select a default bad block table for the device 
+ * nand_default_bbt - [NAND Interface] Select a default bad block table for the device
  * @mtd:        MTD device structure
  *
  * This function selects the default bad block table
@@ -1039,29 +1039,29 @@ static struct nand_bbt_descr bbt_mirror_descr = {
 int nand_default_bbt (struct mtd_info *mtd)
 {
         struct nand_chip *this = mtd->priv;
-        
-        /* Default for AG-AND. We must use a flash based 
+
+        /* Default for AG-AND. We must use a flash based
          * bad block table as the devices have factory marked
          * _good_ blocks. Erasing those blocks leads to loss
          * of the good / bad information, so we _must_ store
-         * this information in a good / bad table during 
+         * this information in a good / bad table during
          * startup
         */
         if (this->options & NAND_IS_AND) {
                 /* Use the default pattern descriptors */
-                if (!this->bbt_td) {    
+                if (!this->bbt_td) {
                         this->bbt_td = &bbt_main_descr;
                         this->bbt_md = &bbt_mirror_descr;
-                }       
+                }
                 this->options |= NAND_USE_FLASH_BBT;
                 return nand_scan_bbt (mtd, &agand_flashbased);
         }
-        
-        
+
+
         /* Is a flash based bad block table requested ? */
         if (this->options & NAND_USE_FLASH_BBT) {
-                /* Use the default pattern descriptors */       
-                if (!this->bbt_td) {    
+                /* Use the default pattern descriptors */
+                if (!this->bbt_td) {
                         this->bbt_td = &bbt_main_descr;
                         this->bbt_md = &bbt_mirror_descr;
                 }
@@ -1081,7 +1081,7 @@ int nand_default_bbt (struct mtd_info *mtd)
 }
 
 /**
- * nand_isbad_bbt - [NAND Interface] Check if a block is bad 
+ * nand_isbad_bbt - [NAND Interface] Check if a block is bad
  * @mtd:        MTD device structure
  * @offs:       offset in the device
  * @allowbbt:   allow access to bad block table region
@@ -1092,12 +1092,12 @@ int nand_isbad_bbt (struct mtd_info *mtd, loff_t offs, int allowbbt)
         struct nand_chip *this = mtd->priv;
         int block;
         uint8_t res;
-        
+
         /* Get block number * 2 */
         block = (int) (offs >> (this->bbt_erase_shift - 1));
         res = (this->bbt[block >> 3] >> (block & 0x06)) & 0x03;
 
-        DEBUG (MTD_DEBUG_LEVEL2, "nand_isbad_bbt(): bbt info for offs 0x%08x: (block %d) 0x%02x\n", 
+        DEBUG (MTD_DEBUG_LEVEL2, "nand_isbad_bbt(): bbt info for offs 0x%08x: (block %d) 0x%02x\n",
                 (unsigned int)offs, block >> 1, res);
 
         switch ((int)res) {
diff --git a/drivers/mtd/nand/nand_ecc.c b/drivers/mtd/nand/nand_ecc.c
index 2e341b75437a..40ac909150a3 100644
--- a/drivers/mtd/nand/nand_ecc.c
+++ b/drivers/mtd/nand/nand_ecc.c
@@ -7,22 +7,22 @@
  * Copyright (C) 2000-2004 Steven J. Hill (sjhill@realitydiluted.com)
  *                         Toshiba America Electronics Components, Inc.
  *
- * $Id: nand_ecc.c,v 1.14 2004/06/16 15:34:37 gleixner Exp $
+ * $Id: nand_ecc.c,v 1.15 2005/11/07 11:14:30 gleixner Exp $
  *
  * This file 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 or (at your option) any
  * later version.
- * 
+ *
  * This file 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 file; if not, write to the Free Software Foundation, Inc.,
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
- * 
+ *
  * As a special exception, if other files instantiate templates or use
  * macros or inline functions from these files, or you compile these
  * files and link them with other works to produce a work based on these
@@ -30,7 +30,7 @@
  * covered by the GNU General Public License. However the source code for
  * these files must still be made available in accordance with section (3)
  * of the GNU General Public License.
- * 
+ *
  * This exception does not invalidate any other reasons why a work based on
  * this file might be covered by the GNU General Public License.
  */
@@ -67,7 +67,7 @@ static const u_char nand_ecc_precalc_table[] = {
  * nand_trans_result - [GENERIC] create non-inverted ECC
  * @reg2:       line parity reg 2
  * @reg3:       line parity reg 3
- * @ecc_code:   ecc 
+ * @ecc_code:   ecc
  *
  * Creates non-inverted ECC code from line parity
  */
@@ -75,11 +75,11 @@ static void nand_trans_result(u_char reg2, u_char reg3,
         u_char *ecc_code)
 {
         u_char a, b, i, tmp1, tmp2;
-        
+
         /* Initialize variables */
         a = b = 0x80;
         tmp1 = tmp2 = 0;
-        
+
         /* Calculate first ECC byte */
         for (i = 0; i < 4; i++) {
                 if (reg3 & a)           /* LP15,13,11,9 --> ecc_code[0] */
@@ -90,7 +90,7 @@ static void nand_trans_result(u_char reg2, u_char reg3,
                 b >>= 1;
                 a >>= 1;
         }
-        
+
         /* Calculate second ECC byte */
         b = 0x80;
         for (i = 0; i < 4; i++) {
@@ -102,7 +102,7 @@ static void nand_trans_result(u_char reg2, u_char reg3,
                 b >>= 1;
                 a >>= 1;
         }
-        
+
         /* Store two of the ECC bytes */
         ecc_code[0] = tmp1;
         ecc_code[1] = tmp2;
@@ -118,28 +118,28 @@ int nand_calculate_ecc(struct mtd_info *mtd, const u_char *dat, u_char *ecc_code
 {
         u_char idx, reg1, reg2, reg3;
         int j;
-        
+
         /* Initialize variables */
         reg1 = reg2 = reg3 = 0;
         ecc_code[0] = ecc_code[1] = ecc_code[2] = 0;
-        
-        /* Build up column parity */ 
+
+        /* Build up column parity */
         for(j = 0; j < 256; j++) {
-                
+
                 /* Get CP0 - CP5 from table */
                 idx = nand_ecc_precalc_table[dat[j]];
                 reg1 ^= (idx & 0x3f);
-                
+
                 /* All bit XOR = 1 ? */
                 if (idx & 0x40) {
                         reg3 ^= (u_char) j;
                         reg2 ^= ~((u_char) j);
                 }
         }
-        
+
         /* Create non-inverted ECC code from line parity */
         nand_trans_result(reg2, reg3, ecc_code);
-        
+
         /* Calculate final ECC code */
         ecc_code[0] = ~ecc_code[0];
         ecc_code[1] = ~ecc_code[1];
@@ -159,12 +159,12 @@ int nand_calculate_ecc(struct mtd_info *mtd, const u_char *dat, u_char *ecc_code
 int nand_correct_data(struct mtd_info *mtd, u_char *dat, u_char *read_ecc, u_char *calc_ecc)
 {
         u_char a, b, c, d1, d2, d3, add, bit, i;
-        
-        /* Do error detection */ 
+
+        /* Do error detection */
         d1 = calc_ecc[0] ^ read_ecc[0];
         d2 = calc_ecc[1] ^ read_ecc[1];
         d3 = calc_ecc[2] ^ read_ecc[2];
-        
+
         if ((d1 | d2 | d3) == 0) {
                 /* No errors */
                 return 0;
@@ -173,7 +173,7 @@ int nand_correct_data(struct mtd_info *mtd, u_char *dat, u_char *read_ecc, u_cha
                 a = (d1 ^ (d1 >> 1)) & 0x55;
                 b = (d2 ^ (d2 >> 1)) & 0x55;
                 c = (d3 ^ (d3 >> 1)) & 0x54;
-                
+
                 /* Found and will correct single bit error in the data */
                 if ((a == 0x55) && (b == 0x55) && (c == 0x54)) {
                         c = 0x80;
@@ -237,7 +237,7 @@ int nand_correct_data(struct mtd_info *mtd, u_char *dat, u_char *read_ecc, u_cha
                         }
                 }
         }
-        
+
         /* Should never happen */
         return -1;
 }
diff --git a/drivers/mtd/nand/nand_ids.c b/drivers/mtd/nand/nand_ids.c
index efe246961b69..dbc7e55a4247 100644
--- a/drivers/mtd/nand/nand_ids.c
+++ b/drivers/mtd/nand/nand_ids.c
@@ -3,7 +3,7 @@
  *
  *  Copyright (C) 2002 Thomas Gleixner (tglx@linutronix.de)
  *
- * $Id: nand_ids.c,v 1.14 2005/06/23 09:38:50 gleixner Exp $
+ * $Id: nand_ids.c,v 1.16 2005/11/07 11:14:31 gleixner Exp $
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 as
@@ -14,14 +14,14 @@
 #include <linux/mtd/nand.h>
 /*
 *       Chip ID list
-*       
+*
 *       Name. ID code, pagesize, chipsize in MegaByte, eraseblock size,
 *       options
-* 
+*
 *       Pagesize; 0, 256, 512
 *       0       get this information from the extended chip ID
 +       256     256 Byte page size
-*       512     512 Byte page size      
+*       512     512 Byte page size
 */
 struct nand_flash_dev nand_flash_ids[] = {
         {"NAND 1MiB 5V 8-bit",          0x6e, 256, 1, 0x1000, 0},
@@ -34,27 +34,27 @@ struct nand_flash_dev nand_flash_ids[] = {
         {"NAND 4MiB 3,3V 8-bit",        0xe3, 512, 4, 0x2000, 0},
         {"NAND 4MiB 3,3V 8-bit",        0xe5, 512, 4, 0x2000, 0},
         {"NAND 8MiB 3,3V 8-bit",        0xd6, 512, 8, 0x2000, 0},
-        
+
         {"NAND 8MiB 1,8V 8-bit",        0x39, 512, 8, 0x2000, 0},
         {"NAND 8MiB 3,3V 8-bit",        0xe6, 512, 8, 0x2000, 0},
         {"NAND 8MiB 1,8V 16-bit",       0x49, 512, 8, 0x2000, NAND_BUSWIDTH_16},
         {"NAND 8MiB 3,3V 16-bit",       0x59, 512, 8, 0x2000, NAND_BUSWIDTH_16},
-        
+
         {"NAND 16MiB 1,8V 8-bit",       0x33, 512, 16, 0x4000, 0},
         {"NAND 16MiB 3,3V 8-bit",       0x73, 512, 16, 0x4000, 0},
         {"NAND 16MiB 1,8V 16-bit",      0x43, 512, 16, 0x4000, NAND_BUSWIDTH_16},
         {"NAND 16MiB 3,3V 16-bit",      0x53, 512, 16, 0x4000, NAND_BUSWIDTH_16},
-        
+
         {"NAND 32MiB 1,8V 8-bit",       0x35, 512, 32, 0x4000, 0},
         {"NAND 32MiB 3,3V 8-bit",       0x75, 512, 32, 0x4000, 0},
         {"NAND 32MiB 1,8V 16-bit",      0x45, 512, 32, 0x4000, NAND_BUSWIDTH_16},
         {"NAND 32MiB 3,3V 16-bit",      0x55, 512, 32, 0x4000, NAND_BUSWIDTH_16},
-        
+
         {"NAND 64MiB 1,8V 8-bit",       0x36, 512, 64, 0x4000, 0},
         {"NAND 64MiB 3,3V 8-bit",       0x76, 512, 64, 0x4000, 0},
         {"NAND 64MiB 1,8V 16-bit",      0x46, 512, 64, 0x4000, NAND_BUSWIDTH_16},
         {"NAND 64MiB 3,3V 16-bit",      0x56, 512, 64, 0x4000, NAND_BUSWIDTH_16},
-        
+
         {"NAND 128MiB 1,8V 8-bit",      0x78, 512, 128, 0x4000, 0},
         {"NAND 128MiB 1,8V 8-bit",      0x39, 512, 128, 0x4000, 0},
         {"NAND 128MiB 3,3V 8-bit",      0x79, 512, 128, 0x4000, 0},
@@ -62,7 +62,7 @@ struct nand_flash_dev nand_flash_ids[] = {
         {"NAND 128MiB 1,8V 16-bit",     0x49, 512, 128, 0x4000, NAND_BUSWIDTH_16},
         {"NAND 128MiB 3,3V 16-bit",     0x74, 512, 128, 0x4000, NAND_BUSWIDTH_16},
         {"NAND 128MiB 3,3V 16-bit",     0x59, 512, 128, 0x4000, NAND_BUSWIDTH_16},
-        
+
         {"NAND 256MiB 3,3V 8-bit",      0x71, 512, 256, 0x4000, 0},
 
         /* These are the new chips with large page size. The pagesize
@@ -73,7 +73,7 @@ struct nand_flash_dev nand_flash_ids[] = {
         {"NAND 64MiB 3,3V 8-bit",       0xF2, 0,  64, 0, NAND_SAMSUNG_LP_OPTIONS | NAND_NO_AUTOINCR},
         {"NAND 64MiB 1,8V 16-bit",      0xB2, 0,  64, 0, NAND_SAMSUNG_LP_OPTIONS | NAND_BUSWIDTH_16 | NAND_NO_AUTOINCR},
         {"NAND 64MiB 3,3V 16-bit",      0xC2, 0,  64, 0, NAND_SAMSUNG_LP_OPTIONS | NAND_BUSWIDTH_16 | NAND_NO_AUTOINCR},
-        
+
         /* 1 Gigabit */
         {"NAND 128MiB 1,8V 8-bit",      0xA1, 0, 128, 0, NAND_SAMSUNG_LP_OPTIONS | NAND_NO_AUTOINCR},
         {"NAND 128MiB 3,3V 8-bit",      0xF1, 0, 128, 0, NAND_SAMSUNG_LP_OPTIONS | NAND_NO_AUTOINCR},
@@ -85,13 +85,13 @@ struct nand_flash_dev nand_flash_ids[] = {
         {"NAND 256MiB 3,3V 8-bit",      0xDA, 0, 256, 0, NAND_SAMSUNG_LP_OPTIONS | NAND_NO_AUTOINCR},
         {"NAND 256MiB 1,8V 16-bit",     0xBA, 0, 256, 0, NAND_SAMSUNG_LP_OPTIONS | NAND_BUSWIDTH_16 | NAND_NO_AUTOINCR},
         {"NAND 256MiB 3,3V 16-bit",     0xCA, 0, 256, 0, NAND_SAMSUNG_LP_OPTIONS | NAND_BUSWIDTH_16 | NAND_NO_AUTOINCR},
-        
+
         /* 4 Gigabit */
         {"NAND 512MiB 1,8V 8-bit",      0xAC, 0, 512, 0, NAND_SAMSUNG_LP_OPTIONS | NAND_NO_AUTOINCR},
         {"NAND 512MiB 3,3V 8-bit",      0xDC, 0, 512, 0, NAND_SAMSUNG_LP_OPTIONS | NAND_NO_AUTOINCR},
         {"NAND 512MiB 1,8V 16-bit",     0xBC, 0, 512, 0, NAND_SAMSUNG_LP_OPTIONS | NAND_BUSWIDTH_16 | NAND_NO_AUTOINCR},
         {"NAND 512MiB 3,3V 16-bit",     0xCC, 0, 512, 0, NAND_SAMSUNG_LP_OPTIONS | NAND_BUSWIDTH_16 | NAND_NO_AUTOINCR},
-        
+
         /* 8 Gigabit */
         {"NAND 1GiB 1,8V 8-bit",        0xA3, 0, 1024, 0, NAND_SAMSUNG_LP_OPTIONS | NAND_NO_AUTOINCR},
         {"NAND 1GiB 3,3V 8-bit",        0xD3, 0, 1024, 0, NAND_SAMSUNG_LP_OPTIONS | NAND_NO_AUTOINCR},
@@ -104,11 +104,11 @@ struct nand_flash_dev nand_flash_ids[] = {
         {"NAND 2GiB 1,8V 16-bit",       0xB5, 0, 2048, 0, NAND_SAMSUNG_LP_OPTIONS | NAND_BUSWIDTH_16 | NAND_NO_AUTOINCR},
         {"NAND 2GiB 3,3V 16-bit",       0xC5, 0, 2048, 0, NAND_SAMSUNG_LP_OPTIONS | NAND_BUSWIDTH_16 | NAND_NO_AUTOINCR},
 
-        /* Renesas AND 1 Gigabit. Those chips do not support extended id and have a strange page/block layout ! 
+        /* Renesas AND 1 Gigabit. Those chips do not support extended id and have a strange page/block layout !
          * The chosen minimum erasesize is 4 * 2 * 2048 = 16384 Byte, as those chips have an array of 4 page planes
          * 1 block = 2 pages, but due to plane arrangement the blocks 0-3 consists of page 0 + 4,1 + 5, 2 + 6, 3 + 7
          * Anyway JFFS2 would increase the eraseblock size so we chose a combined one which can be erased in one go
-         * There are more speed improvements for reads and writes possible, but not implemented now 
+         * There are more speed improvements for reads and writes possible, but not implemented now
          */
         {"AND 128MiB 3,3V 8-bit",       0x01, 2048, 128, 0x4000, NAND_IS_AND | NAND_NO_AUTOINCR | NAND_4PAGE_ARRAY | BBT_AUTO_REFRESH},
 
diff --git a/drivers/mtd/nand/nandsim.c b/drivers/mtd/nand/nandsim.c
index 754b6ed7ce14..de4500395300 100644
--- a/drivers/mtd/nand/nandsim.c
+++ b/drivers/mtd/nand/nandsim.c
@@ -3,7 +3,7 @@
  *
  * Author: Artem B. Bityuckiy <dedekind@oktetlabs.ru>, <dedekind@infradead.org>
  *
- * Copyright (C) 2004 Nokia Corporation 
+ * Copyright (C) 2004 Nokia Corporation
  *
  * Note: NS means "NAND Simulator".
  * Note: Input means input TO flash chip, output means output FROM chip.
@@ -126,7 +126,7 @@ MODULE_PARM_DESC(dbg,            "Output debug information if not zero");
 
 /* The largest possible page size */
 #define NS_LARGEST_PAGE_SIZE    2048
-        
+
 /* The prefix for simulator output */
 #define NS_OUTPUT_PREFIX "[nandsim]"
 
@@ -145,7 +145,7 @@ MODULE_PARM_DESC(dbg,            "Output debug information if not zero");
         do { if (do_delays) udelay(us); } while(0)
 #define NS_MDELAY(us) \
         do { if (do_delays) mdelay(us); } while(0)
-        
+
 /* Is the nandsim structure initialized ? */
 #define NS_IS_INITIALIZED(ns) ((ns)->geom.totsz != 0)
 
@@ -153,12 +153,12 @@ MODULE_PARM_DESC(dbg,            "Output debug information if not zero");
 #define NS_STATUS_OK(ns) (NAND_STATUS_READY | (NAND_STATUS_WP * ((ns)->lines.wp == 0)))
 
 /* Operation failed completion status */
-#define NS_STATUS_FAILED(ns) (NAND_STATUS_FAIL | NS_STATUS_OK(ns)) 
+#define NS_STATUS_FAILED(ns) (NAND_STATUS_FAIL | NS_STATUS_OK(ns))
 
 /* Calculate the page offset in flash RAM image by (row, column) address */
 #define NS_RAW_OFFSET(ns) \
         (((ns)->regs.row << (ns)->geom.pgshift) + ((ns)->regs.row * (ns)->geom.oobsz) + (ns)->regs.column)
-        
+
 /* Calculate the OOB offset in flash RAM image by (row, column) address */
 #define NS_RAW_OFFSET_OOB(ns) (NS_RAW_OFFSET(ns) + ns->geom.pgsz)
 
@@ -223,15 +223,15 @@ MODULE_PARM_DESC(dbg,            "Output debug information if not zero");
 
 /* Remove action bits ftom state */
 #define NS_STATE(x) ((x) & ~ACTION_MASK)
-        
-/* 
+
+/*
  * Maximum previous states which need to be saved. Currently saving is
  * only needed for page programm operation with preceeded read command
  * (which is only valid for 512-byte pages).
  */
 #define NS_MAX_PREVSTATES 1
 
-/* 
+/*
  * The structure which describes all the internal simulator data.
  */
 struct nandsim {
@@ -242,7 +242,7 @@ struct nandsim {
         uint32_t options;       /* chip's characteristic bits */
         uint32_t state;         /* current chip state */
         uint32_t nxstate;       /* next expected state */
-        
+
         uint32_t *op;           /* current operation, NULL operations isn't known yet  */
         uint32_t pstates[NS_MAX_PREVSTATES]; /* previous states */
         uint16_t npstates;      /* number of previous states saved */
@@ -413,7 +413,7 @@ init_nandsim(struct mtd_info *mtd)
                         ns->geom.secaddrbytes = 3;
                 }
         }
-        
+
         /* Detect how many ID bytes the NAND chip outputs */
         for (i = 0; nand_flash_ids[i].name != NULL; i++) {
                 if (second_id_byte != nand_flash_ids[i].id)
@@ -444,7 +444,7 @@ init_nandsim(struct mtd_info *mtd)
 #ifdef CONFIG_NS_ABS_POS
         ns->mem.byte = ioremap(CONFIG_NS_ABS_POS, ns->geom.totszoob);
         if (!ns->mem.byte) {
-                NS_ERR("init_nandsim: failed to map the NAND flash image at address %p\n", 
+                NS_ERR("init_nandsim: failed to map the NAND flash image at address %p\n",
                         (void *)CONFIG_NS_ABS_POS);
                 return -ENOMEM;
         }
@@ -567,7 +567,7 @@ static int
 check_command(int cmd)
 {
         switch (cmd) {
-                
+
         case NAND_CMD_READ0:
         case NAND_CMD_READSTART:
         case NAND_CMD_PAGEPROG:
@@ -580,7 +580,7 @@ check_command(int cmd)
         case NAND_CMD_RESET:
         case NAND_CMD_READ1:
                 return 0;
-                
+
         case NAND_CMD_STATUS_MULTI:
         default:
                 return 1;
@@ -631,7 +631,7 @@ static inline void
 accept_addr_byte(struct nandsim *ns, u_char bt)
 {
         uint byte = (uint)bt;
-        
+
         if (ns->regs.count < (ns->geom.pgaddrbytes - ns->geom.secaddrbytes))
                 ns->regs.column |= (byte << 8 * ns->regs.count);
         else {
@@ -642,11 +642,11 @@ accept_addr_byte(struct nandsim *ns, u_char bt)
 
         return;
 }
-                
+
 /*
  * Switch to STATE_READY state.
  */
-static inline void 
+static inline void
 switch_to_ready_state(struct nandsim *ns, u_char status)
 {
         NS_DBG("switch_to_ready_state: switch to %s state\n", get_state_name(STATE_READY));
@@ -675,7 +675,7 @@ switch_to_ready_state(struct nandsim *ns, u_char status)
  *      (for example program from the second half and read from the
  *      second half operations both begin with the READ1 command). In this
  *      case the ns->pstates[] array contains previous states.
- * 
+ *
  * Thus, the function tries to find operation containing the following
  * states (if the 'flag' parameter is 0):
  *    ns->pstates[0], ... ns->pstates[ns->npstates], ns->state
@@ -683,7 +683,7 @@ switch_to_ready_state(struct nandsim *ns, u_char status)
  * If (one and only one) matching operation is found, it is accepted (
  * ns->ops, ns->state, ns->nxstate are initialized, ns->npstate is
  * zeroed).
- * 
+ *
  * If there are several maches, the current state is pushed to the
  * ns->pstates.
  *
@@ -692,7 +692,7 @@ switch_to_ready_state(struct nandsim *ns, u_char status)
  * In such situation the function is called with 'flag' != 0, and the
  * operation is searched using the following pattern:
  *     ns->pstates[0], ... ns->pstates[ns->npstates], <address input>
- * 
+ *
  * It is supposed that this pattern must either match one operation on
  * none. There can't be ambiguity in that case.
  *
@@ -711,15 +711,15 @@ find_operation(struct nandsim *ns, uint32_t flag)
 {
         int opsfound = 0;
         int i, j, idx = 0;
-        
+
         for (i = 0; i < NS_OPER_NUM; i++) {
 
                 int found = 1;
-        
+
                 if (!(ns->options & ops[i].reqopts))
                         /* Ignore operations we can't perform */
                         continue;
-                        
+
                 if (flag) {
                         if (!(ops[i].states[ns->npstates] & STATE_ADDR_MASK))
                                 continue;
@@ -728,7 +728,7 @@ find_operation(struct nandsim *ns, uint32_t flag)
                                 continue;
                 }
 
-                for (j = 0; j < ns->npstates; j++) 
+                for (j = 0; j < ns->npstates; j++)
                         if (NS_STATE(ops[i].states[j]) != NS_STATE(ns->pstates[j])
                                 && (ns->options & ops[idx].reqopts)) {
                                 found = 0;
@@ -745,7 +745,7 @@ find_operation(struct nandsim *ns, uint32_t flag)
                 /* Exact match */
                 ns->op = &ops[idx].states[0];
                 if (flag) {
-                        /* 
+                        /*
                          * In this case the find_operation function was
                          * called when address has just began input. But it isn't
                          * yet fully input and the current state must
@@ -763,7 +763,7 @@ find_operation(struct nandsim *ns, uint32_t flag)
                                 idx, get_state_name(ns->state), get_state_name(ns->nxstate));
                 return 0;
         }
-        
+
         if (opsfound == 0) {
                 /* Nothing was found. Try to ignore previous commands (if any) and search again */
                 if (ns->npstates != 0) {
@@ -777,13 +777,13 @@ find_operation(struct nandsim *ns, uint32_t flag)
                 switch_to_ready_state(ns, NS_STATUS_FAILED(ns));
                 return -2;
         }
-        
+
         if (flag) {
                 /* This shouldn't happen */
                 NS_DBG("find_operation: BUG, operation must be known if address is input\n");
                 return -2;
         }
-        
+
         NS_DBG("find_operation: there is still ambiguity\n");
 
         ns->pstates[ns->npstates++] = ns->state;
@@ -803,7 +803,7 @@ do_state_action(struct nandsim *ns, uint32_t action)
         int busdiv = ns->busw == 8 ? 1 : 2;
 
         action &= ACTION_MASK;
-        
+
         /* Check that page address input is correct */
         if (action != ACTION_SECERASE && ns->regs.row >= ns->geom.pgnum) {
                 NS_WARN("do_state_action: wrong page number (%#x)\n", ns->regs.row);
@@ -827,14 +827,14 @@ do_state_action(struct nandsim *ns, uint32_t action)
 
                 NS_DBG("do_state_action: (ACTION_CPY:) copy %d bytes to int buf, raw offset %d\n",
                         num, NS_RAW_OFFSET(ns) + ns->regs.off);
-                
+
                 if (ns->regs.off == 0)
                         NS_LOG("read page %d\n", ns->regs.row);
                 else if (ns->regs.off < ns->geom.pgsz)
                         NS_LOG("read page %d (second half)\n", ns->regs.row);
                 else
                         NS_LOG("read OOB of page %d\n", ns->regs.row);
-                
+
                 NS_UDELAY(access_delay);
                 NS_UDELAY(input_cycle * ns->geom.pgsz / 1000 / busdiv);
 
@@ -844,30 +844,30 @@ do_state_action(struct nandsim *ns, uint32_t action)
                 /*
                  * Erase sector.
                  */
-                
+
                 if (ns->lines.wp) {
                         NS_ERR("do_state_action: device is write-protected, ignore sector erase\n");
                         return -1;
                 }
-                
+
                 if (ns->regs.row >= ns->geom.pgnum - ns->geom.pgsec
                         || (ns->regs.row & ~(ns->geom.secsz - 1))) {
                         NS_ERR("do_state_action: wrong sector address (%#x)\n", ns->regs.row);
                         return -1;
                 }
-                
+
                 ns->regs.row = (ns->regs.row <<
                                 8 * (ns->geom.pgaddrbytes - ns->geom.secaddrbytes)) | ns->regs.column;
                 ns->regs.column = 0;
-                
+
                 NS_DBG("do_state_action: erase sector at address %#x, off = %d\n",
                                 ns->regs.row, NS_RAW_OFFSET(ns));
                 NS_LOG("erase sector %d\n", ns->regs.row >> (ns->geom.secshift - ns->geom.pgshift));
 
                 memset(ns->mem.byte + NS_RAW_OFFSET(ns), 0xFF, ns->geom.secszoob);
-                
+
                 NS_MDELAY(erase_delay);
-                
+
                 break;
 
         case ACTION_PRGPAGE:
@@ -893,12 +893,12 @@ do_state_action(struct nandsim *ns, uint32_t action)
                 NS_DBG("do_state_action: copy %d bytes from int buf to (%#x, %#x), raw off = %d\n",
                         num, ns->regs.row, ns->regs.column, NS_RAW_OFFSET(ns) + ns->regs.off);
                 NS_LOG("programm page %d\n", ns->regs.row);
-                
+
                 NS_UDELAY(programm_delay);
                 NS_UDELAY(output_cycle * ns->geom.pgsz / 1000 / busdiv);
-                
+
                 break;
-        
+
         case ACTION_ZEROOFF:
                 NS_DBG("do_state_action: set internal offset to 0\n");
                 ns->regs.off = 0;
@@ -918,7 +918,7 @@ do_state_action(struct nandsim *ns, uint32_t action)
                 NS_DBG("do_state_action: set internal offset to %d\n", ns->geom.pgsz);
                 ns->regs.off = ns->geom.pgsz;
                 break;
-                
+
         default:
                 NS_DBG("do_state_action: BUG! unknown action\n");
         }
@@ -937,7 +937,7 @@ switch_state(struct nandsim *ns)
                  * The current operation have already been identified.
                  * Just follow the states chain.
                  */
-                
+
                 ns->stateidx += 1;
                 ns->state = ns->nxstate;
                 ns->nxstate = ns->op[ns->stateidx + 1];
@@ -951,14 +951,14 @@ switch_state(struct nandsim *ns)
                         switch_to_ready_state(ns, NS_STATUS_FAILED(ns));
                         return;
                 }
-                
+
         } else {
                 /*
                  * We don't yet know which operation we perform.
                  * Try to identify it.
                  */
 
-                /*  
+                /*
                  *  The only event causing the switch_state function to
                  *  be called with yet unknown operation is new command.
                  */
@@ -987,7 +987,7 @@ switch_state(struct nandsim *ns)
                  */
 
                 u_char status = NS_STATUS_OK(ns);
-                
+
                 /* In case of data states, see if all bytes were input/output */
                 if ((ns->state & (STATE_DATAIN_MASK | STATE_DATAOUT_MASK))
                         && ns->regs.count != ns->regs.num) {
@@ -995,17 +995,17 @@ switch_state(struct nandsim *ns)
                                         ns->regs.num - ns->regs.count);
                         status = NS_STATUS_FAILED(ns);
                 }
-                                
+
                 NS_DBG("switch_state: operation complete, switch to STATE_READY state\n");
 
                 switch_to_ready_state(ns, status);
 
                 return;
         } else if (ns->nxstate & (STATE_DATAIN_MASK | STATE_DATAOUT_MASK)) {
-                /* 
+                /*
                  * If the next state is data input/output, switch to it now
                  */
-                
+
                 ns->state      = ns->nxstate;
                 ns->nxstate    = ns->op[++ns->stateidx + 1];
                 ns->regs.num   = ns->regs.count = 0;
@@ -1023,16 +1023,16 @@ switch_state(struct nandsim *ns)
                         case STATE_DATAOUT:
                                 ns->regs.num = ns->geom.pgszoob - ns->regs.off - ns->regs.column;
                                 break;
-                                
+
                         case STATE_DATAOUT_ID:
                                 ns->regs.num = ns->geom.idbytes;
                                 break;
-                                
+
                         case STATE_DATAOUT_STATUS:
                         case STATE_DATAOUT_STATUS_M:
                                 ns->regs.count = ns->regs.num = 0;
                                 break;
-                                
+
                         default:
                                 NS_ERR("switch_state: BUG! unknown data state\n");
                 }
@@ -1044,16 +1044,16 @@ switch_state(struct nandsim *ns)
                  */
 
                 ns->regs.count = 0;
-                
+
                 switch (NS_STATE(ns->nxstate)) {
                         case STATE_ADDR_PAGE:
                                 ns->regs.num = ns->geom.pgaddrbytes;
-                
+
                                 break;
                         case STATE_ADDR_SEC:
                                 ns->regs.num = ns->geom.secaddrbytes;
                                 break;
-        
+
                         case STATE_ADDR_ZERO:
                                 ns->regs.num = 1;
                                 break;
@@ -1062,7 +1062,7 @@ switch_state(struct nandsim *ns)
                                 NS_ERR("switch_state: BUG! unknown address state\n");
                 }
         } else {
-                /* 
+                /*
                  * Just reset internal counters.
                  */
 
@@ -1184,7 +1184,7 @@ ns_nand_read_byte(struct mtd_info *mtd)
                 default:
                         BUG();
         }
-        
+
         if (ns->regs.count == ns->regs.num) {
                 NS_DBG("read_byte: all bytes were read\n");
 
@@ -1201,9 +1201,9 @@ ns_nand_read_byte(struct mtd_info *mtd)
                 }
                 else if (NS_STATE(ns->nxstate) == STATE_READY)
                         switch_state(ns);
-                
+
         }
-        
+
         return outb;
 }
 
@@ -1211,7 +1211,7 @@ static void
 ns_nand_write_byte(struct mtd_info *mtd, u_char byte)
 {
         struct nandsim *ns = (struct nandsim *)((struct nand_chip *)mtd->priv)->priv;
-        
+
         /* Sanity and correctness checks */
         if (!ns->lines.ce) {
                 NS_ERR("write_byte: chip is disabled, ignore write\n");
@@ -1221,7 +1221,7 @@ ns_nand_write_byte(struct mtd_info *mtd, u_char byte)
                 NS_ERR("write_byte: ALE and CLE pins are high simultaneously, ignore write\n");
                 return;
         }
-                        
+
         if (ns->lines.cle == 1) {
                 /*
                  * The byte written is a command.
@@ -1233,7 +1233,7 @@ ns_nand_write_byte(struct mtd_info *mtd, u_char byte)
                         return;
                 }
 
-                /* 
+                /*
                  * Chip might still be in STATE_DATAOUT
                  * (if OPT_AUTOINCR feature is supported), STATE_DATAOUT_STATUS or
                  * STATE_DATAOUT_STATUS_M state. If so, switch state.
@@ -1254,13 +1254,13 @@ ns_nand_write_byte(struct mtd_info *mtd, u_char byte)
                                 "ignore previous states\n", (uint)byte, get_state_name(ns->nxstate));
                         switch_to_ready_state(ns, NS_STATUS_FAILED(ns));
                 }
-                
+
                 /* Check that the command byte is correct */
                 if (check_command(byte)) {
                         NS_ERR("write_byte: unknown command %#x\n", (uint)byte);
                         return;
                 }
-                
+
                 NS_DBG("command byte corresponding to %s state accepted\n",
                         get_state_name(get_state_by_command(byte)));
                 ns->regs.command = byte;
@@ -1277,12 +1277,12 @@ ns_nand_write_byte(struct mtd_info *mtd, u_char byte)
 
                         if (find_operation(ns, 1) < 0)
                                 return;
-                        
+
                         if ((ns->state & ACTION_MASK) && do_state_action(ns, ns->state) < 0) {
                                 switch_to_ready_state(ns, NS_STATUS_FAILED(ns));
                                 return;
                         }
-                                
+
                         ns->regs.count = 0;
                         switch (NS_STATE(ns->nxstate)) {
                                 case STATE_ADDR_PAGE:
@@ -1306,7 +1306,7 @@ ns_nand_write_byte(struct mtd_info *mtd, u_char byte)
                         switch_to_ready_state(ns, NS_STATUS_FAILED(ns));
                         return;
                 }
-                
+
                 /* Check if this is expected byte */
                 if (ns->regs.count == ns->regs.num) {
                         NS_ERR("write_byte: no more address bytes expected\n");
@@ -1325,12 +1325,12 @@ ns_nand_write_byte(struct mtd_info *mtd, u_char byte)
                         NS_DBG("address (%#x, %#x) is accepted\n", ns->regs.row, ns->regs.column);
                         switch_state(ns);
                 }
-                
+
         } else {
                 /*
                  * The byte written is an input data.
                  */
-                
+
                 /* Check that chip is expecting data input */
                 if (!(ns->state & STATE_DATAIN_MASK)) {
                         NS_ERR("write_byte: data input (%#x) isn't expected, state is %s, "
@@ -1372,7 +1372,7 @@ ns_nand_read_word(struct mtd_info *mtd)
         struct nand_chip *chip = (struct nand_chip *)mtd->priv;
 
         NS_DBG("read_word\n");
-        
+
         return chip->read_byte(mtd) | (chip->read_byte(mtd) << 8);
 }
 
@@ -1380,14 +1380,14 @@ static void
 ns_nand_write_word(struct mtd_info *mtd, uint16_t word)
 {
         struct nand_chip *chip = (struct nand_chip *)mtd->priv;
-        
+
         NS_DBG("write_word\n");
-        
+
         chip->write_byte(mtd, word & 0xFF);
         chip->write_byte(mtd, word >> 8);
 }
 
-static void 
+static void
 ns_nand_write_buf(struct mtd_info *mtd, const u_char *buf, int len)
 {
         struct nandsim *ns = (struct nandsim *)((struct nand_chip *)mtd->priv)->priv;
@@ -1409,13 +1409,13 @@ ns_nand_write_buf(struct mtd_info *mtd, const u_char *buf, int len)
 
         memcpy(ns->buf.byte + ns->regs.count, buf, len);
         ns->regs.count += len;
-        
+
         if (ns->regs.count == ns->regs.num) {
                 NS_DBG("write_buf: %d bytes were written\n", ns->regs.count);
         }
 }
 
-static void 
+static void
 ns_nand_read_buf(struct mtd_info *mtd, u_char *buf, int len)
 {
         struct nandsim *ns = (struct nandsim *)((struct nand_chip *)mtd->priv)->priv;
@@ -1453,7 +1453,7 @@ ns_nand_read_buf(struct mtd_info *mtd, u_char *buf, int len)
 
         memcpy(buf, ns->buf.byte + ns->regs.count, len);
         ns->regs.count += len;
-        
+
         if (ns->regs.count == ns->regs.num) {
                 if ((ns->options & OPT_AUTOINCR) && NS_STATE(ns->state) == STATE_DATAOUT) {
                         ns->regs.count = 0;
@@ -1465,11 +1465,11 @@ ns_nand_read_buf(struct mtd_info *mtd, u_char *buf, int len)
                 else if (NS_STATE(ns->nxstate) == STATE_READY)
                         switch_state(ns);
         }
-        
+
         return;
 }
 
-static int 
+static int
 ns_nand_verify_buf(struct mtd_info *mtd, const u_char *buf, int len)
 {
         ns_nand_read_buf(mtd, (u_char *)&ns_verify_buf[0], len);
@@ -1496,7 +1496,7 @@ int __init ns_init_module(void)
                 NS_ERR("wrong bus width (%d), use only 8 or 16\n", bus_width);
                 return -EINVAL;
         }
-        
+
         /* Allocate and initialize mtd_info, nand_chip and nandsim structures */
         nsmtd = kmalloc(sizeof(struct mtd_info) + sizeof(struct nand_chip)
                                 + sizeof(struct nandsim), GFP_KERNEL);
@@ -1509,7 +1509,7 @@ int __init ns_init_module(void)
         chip        = (struct nand_chip *)(nsmtd + 1);
         nsmtd->priv = (void *)chip;
         nand        = (struct nandsim *)(chip + 1);
-        chip->priv  = (void *)nand;     
+        chip->priv  = (void *)nand;
 
         /*
          * Register simulator's callbacks.
@@ -1526,9 +1526,9 @@ int __init ns_init_module(void)
         chip->eccmode    = NAND_ECC_SOFT;
         chip->options   |= NAND_SKIP_BBTSCAN;
 
-        /* 
+        /*
          * Perform minimum nandsim structure initialization to handle
-         * the initial ID read command correctly 
+         * the initial ID read command correctly
          */
         if (third_id_byte != 0xFF || fourth_id_byte != 0xFF)
                 nand->geom.idbytes = 4;
@@ -1557,7 +1557,7 @@ int __init ns_init_module(void)
                 NS_ERR("scan_bbt: can't initialize the nandsim structure\n");
                 goto error;
         }
-        
+
         if ((retval = nand_default_bbt(nsmtd)) != 0) {
                 free_nandsim(nand);
                 goto error;
diff --git a/drivers/mtd/nand/ppchameleonevb.c b/drivers/mtd/nand/ppchameleonevb.c
index e510a83d7bdb..91a95f34a6ee 100644
--- a/drivers/mtd/nand/ppchameleonevb.c
+++ b/drivers/mtd/nand/ppchameleonevb.c
@@ -6,7 +6,7 @@
  *  Derived from drivers/mtd/nand/edb7312.c
  *
  *
- * $Id: ppchameleonevb.c,v 1.6 2004/11/05 16:07:16 kalev Exp $
+ * $Id: ppchameleonevb.c,v 1.7 2005/11/07 11:14:31 gleixner Exp $
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 as
@@ -338,7 +338,7 @@ nand_evb_init:
         out_be32((volatile unsigned*)GPIO0_TSRH, in_be32((volatile unsigned*)GPIO0_TSRH) & 0xFFFFFFF0);
         out_be32((volatile unsigned*)GPIO0_TSRL, in_be32((volatile unsigned*)GPIO0_TSRL) & 0x3FFFFFFF);
         /* enable output driver */
-        out_be32((volatile unsigned*)GPIO0_TCR, in_be32((volatile unsigned*)GPIO0_TCR) | NAND_EVB_nCE_GPIO_PIN | 
+        out_be32((volatile unsigned*)GPIO0_TCR, in_be32((volatile unsigned*)GPIO0_TCR) | NAND_EVB_nCE_GPIO_PIN |
                  NAND_EVB_CLE_GPIO_PIN | NAND_EVB_ALE_GPIO_PIN);
 #ifdef USE_READY_BUSY_PIN
         /* three-state select */
@@ -402,7 +402,7 @@ static void __exit ppchameleonevb_cleanup (void)
         /* Release resources, unregister device(s) */
         nand_release (ppchameleon_mtd);
         nand_release (ppchameleonevb_mtd);
-        
+
         /* Release iomaps */
         this = (struct nand_chip *) &ppchameleon_mtd[1];
         iounmap((void *) this->IO_ADDR_R;
diff --git a/drivers/mtd/nand/rtc_from4.c b/drivers/mtd/nand/rtc_from4.c
index 031051cbde76..3a5841c9d950 100644
--- a/drivers/mtd/nand/rtc_from4.c
+++ b/drivers/mtd/nand/rtc_from4.c
@@ -2,11 +2,11 @@
  *  drivers/mtd/nand/rtc_from4.c
  *
  *  Copyright (C) 2004  Red Hat, Inc.
- * 
+ *
  *  Derived from drivers/mtd/nand/spia.c
  *       Copyright (C) 2000 Steven J. Hill (sjhill@realitydiluted.com)
  *
- * $Id: rtc_from4.c,v 1.9 2005/01/24 20:40:11 dmarlin Exp $
+ * $Id: rtc_from4.c,v 1.10 2005/11/07 11:14:31 gleixner Exp $
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 as
@@ -14,8 +14,8 @@
  *
  * Overview:
  *   This is a device driver for the AG-AND flash device found on the
- *   Renesas Technology Corp. Flash ROM 4-slot interface board (FROM_BOARD4), 
- *   which utilizes the Renesas HN29V1G91T-30 part. 
+ *   Renesas Technology Corp. Flash ROM 4-slot interface board (FROM_BOARD4),
+ *   which utilizes the Renesas HN29V1G91T-30 part.
  *   This chip is a 1 GBibit (128MiB x 8 bits) AG-AND flash device.
  */
 
@@ -105,9 +105,9 @@ const static struct mtd_partition partition_info[] = {
 };
 #define NUM_PARTITIONS 1
 
-/* 
+/*
  *      hardware specific flash bbt decriptors
- *      Note: this is to allow debugging by disabling 
+ *      Note: this is to allow debugging by disabling
  *              NAND_BBT_CREATE and/or NAND_BBT_WRITE
  *
  */
@@ -141,7 +141,7 @@ static struct nand_bbt_descr rtc_from4_bbt_mirror_descr = {
 /* the Reed Solomon control structure */
 static struct rs_control *rs_decoder;
 
-/* 
+/*
  *      hardware specific Out Of Band information
  */
 static struct nand_oobinfo rtc_from4_nand_oobinfo = {
@@ -200,38 +200,38 @@ static uint8_t revbits[256] = {
 
 
 
-/* 
+/*
  * rtc_from4_hwcontrol - hardware specific access to control-lines
  * @mtd:        MTD device structure
  * @cmd:        hardware control command
  *
- * Address lines (A5 and A4) are used to control Command and Address Latch 
+ * Address lines (A5 and A4) are used to control Command and Address Latch
  * Enable on this board, so set the read/write address appropriately.
  *
- * Chip Enable is also controlled by the Chip Select (CS5) and 
+ * Chip Enable is also controlled by the Chip Select (CS5) and
  * Address lines (A24-A22), so no action is required here.
  *
  */
 static void rtc_from4_hwcontrol(struct mtd_info *mtd, int cmd)
 {
         struct nand_chip* this = (struct nand_chip *) (mtd->priv);
-        
+
         switch(cmd) {
-                
-        case NAND_CTL_SETCLE: 
+
+        case NAND_CTL_SETCLE:
                 this->IO_ADDR_W = (void __iomem *)((unsigned long)this->IO_ADDR_W | RTC_FROM4_CLE);
                 break;
-        case NAND_CTL_CLRCLE: 
+        case NAND_CTL_CLRCLE:
                 this->IO_ADDR_W = (void __iomem *)((unsigned long)this->IO_ADDR_W & ~RTC_FROM4_CLE);
                 break;
-                
+
         case NAND_CTL_SETALE:
                 this->IO_ADDR_W = (void __iomem *)((unsigned long)this->IO_ADDR_W | RTC_FROM4_ALE);
                 break;
         case NAND_CTL_CLRALE:
                 this->IO_ADDR_W = (void __iomem *)((unsigned long)this->IO_ADDR_W & ~RTC_FROM4_ALE);
                 break;
-                
+
         case NAND_CTL_SETNCE:
                 break;
         case NAND_CTL_CLRNCE:
@@ -296,7 +296,7 @@ static int rtc_from4_nand_device_ready(struct mtd_info *mtd)
  * @mtd:        MTD device structure
  * @chip:       Chip to select (0 == slot 3, 1 == slot 4)
  *
- * If there was a sudden loss of power during an erase operation, a 
+ * If there was a sudden loss of power during an erase operation, a
  * "device recovery" operation must be performed when power is restored
  * to ensure correct operation.  This routine performs the required steps
  * for the requested chip.
@@ -312,7 +312,7 @@ static void deplete(struct mtd_info *mtd, int chip)
         while (!this->dev_ready(mtd));
 
         this->select_chip(mtd, chip);
-                                                                                                                                              
+
         /* Send the commands for device recovery, phase 1 */
         this->cmdfunc (mtd, NAND_CMD_DEPLETE1, 0x0000, 0x0000);
         this->cmdfunc (mtd, NAND_CMD_DEPLETE2, -1, -1);
@@ -330,7 +330,7 @@ static void deplete(struct mtd_info *mtd, int chip)
  * @mtd:        MTD device structure
  * @mode:       I/O mode; read or write
  *
- * enable hardware ECC for data read or write 
+ * enable hardware ECC for data read or write
  *
  */
 static void rtc_from4_enable_hwecc(struct mtd_info *mtd, int mode)
@@ -340,7 +340,7 @@ static void rtc_from4_enable_hwecc(struct mtd_info *mtd, int mode)
 
         switch (mode) {
             case NAND_ECC_READ :
-                status =  RTC_FROM4_RS_ECC_CTL_CLR 
+                status =  RTC_FROM4_RS_ECC_CTL_CLR
                         | RTC_FROM4_RS_ECC_CTL_FD_E;
 
                 *rs_ecc_ctl = status;
@@ -353,8 +353,8 @@ static void rtc_from4_enable_hwecc(struct mtd_info *mtd, int mode)
                 break;
 
             case NAND_ECC_WRITE :
-                status =  RTC_FROM4_RS_ECC_CTL_CLR 
-                        | RTC_FROM4_RS_ECC_CTL_GEN 
+                status =  RTC_FROM4_RS_ECC_CTL_CLR
+                        | RTC_FROM4_RS_ECC_CTL_GEN
                         | RTC_FROM4_RS_ECC_CTL_FD_E;
 
                 *rs_ecc_ctl = status;
@@ -411,7 +411,7 @@ static void rtc_from4_calculate_ecc(struct mtd_info *mtd, const u_char *dat, u_c
 static int rtc_from4_correct_data(struct mtd_info *mtd, const u_char *buf, u_char *ecc1, u_char *ecc2)
 {
         int i, j, res;
-        unsigned short status; 
+        unsigned short status;
         uint16_t par[6], syn[6];
         uint8_t ecc[8];
         volatile unsigned short *rs_ecc;
@@ -430,7 +430,7 @@ static int rtc_from4_correct_data(struct mtd_info *mtd, const u_char *buf, u_cha
         }
 
         /* convert into 6 10bit syndrome fields */
-        par[5] = rs_decoder->index_of[(((uint16_t)ecc[0] >> 0) & 0x0ff) | 
+        par[5] = rs_decoder->index_of[(((uint16_t)ecc[0] >> 0) & 0x0ff) |
                                       (((uint16_t)ecc[1] << 8) & 0x300)];
         par[4] = rs_decoder->index_of[(((uint16_t)ecc[1] >> 2) & 0x03f) |
                                       (((uint16_t)ecc[2] << 6) & 0x3c0)];
@@ -456,7 +456,7 @@ static int rtc_from4_correct_data(struct mtd_info *mtd, const u_char *buf, u_cha
         /* Let the library code do its magic.*/
         res = decode_rs8(rs_decoder, (uint8_t *)buf, par, 512, syn, 0, NULL, 0xff, NULL);
         if (res > 0) {
-                DEBUG (MTD_DEBUG_LEVEL0, "rtc_from4_correct_data: " 
+                DEBUG (MTD_DEBUG_LEVEL0, "rtc_from4_correct_data: "
                         "ECC corrected %d errors on read\n", res);
         }
         return res;
@@ -470,9 +470,9 @@ static int rtc_from4_correct_data(struct mtd_info *mtd, const u_char *buf, u_cha
  * @state:      state or the operation
  * @status:     status code returned from read status
  * @page:       startpage inside the chip, must be called with (page & this->pagemask)
- * 
- * Perform additional error status checks on erase and write failures 
- * to determine if errors are correctable.  For this device, correctable 
+ *
+ * Perform additional error status checks on erase and write failures
+ * to determine if errors are correctable.  For this device, correctable
  * 1-bit errors on erase and write are considered acceptable.
  *
  * note: see pages 34..37 of data sheet for details.
@@ -633,7 +633,7 @@ int __init rtc_from4_init (void)
 
 #ifdef RTC_FROM4_HWECC
         /* We could create the decoder on demand, if memory is a concern.
-         * This way we have it handy, if an error happens 
+         * This way we have it handy, if an error happens
          *
          * Symbolsize is 10 (bits)
          * Primitve polynomial is x^10+x^3+1
diff --git a/drivers/mtd/nand/s3c2410.c b/drivers/mtd/nand/s3c2410.c
index 2df5e47d1f5c..97e9b7892d29 100644
--- a/drivers/mtd/nand/s3c2410.c
+++ b/drivers/mtd/nand/s3c2410.c
@@ -17,8 +17,9 @@
  *      02-May-2005  BJD  Reduced hwcontrol decode
  *      20-Jun-2005  BJD  Updated s3c2440 support, fixed timing bug
  *      08-Jul-2005  BJD  Fix OOPS when no platform data supplied
+ *      20-Oct-2005  BJD  Fix timing calculation bug
  *
- * $Id: s3c2410.c,v 1.14 2005/07/06 20:05:06 bjd Exp $
+ * $Id: s3c2410.c,v 1.20 2005/11/07 11:14:31 gleixner Exp $
  *
  * 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
@@ -136,13 +137,13 @@ static struct s3c2410_platform_nand *to_nand_plat(struct device *dev)
 
 /* timing calculations */
 
-#define NS_IN_KHZ 10000000
+#define NS_IN_KHZ 1000000
 
 static int s3c2410_nand_calc_rate(int wanted, unsigned long clk, int max)
 {
         int result;
 
-        result = (wanted * NS_IN_KHZ) / clk;
+        result = (wanted * clk) / NS_IN_KHZ;
         result++;
 
         pr_debug("result %d from %ld, %d\n", result, clk, wanted);
@@ -159,20 +160,22 @@ static int s3c2410_nand_calc_rate(int wanted, unsigned long clk, int max)
         return result;
 }
 
-#define to_ns(ticks,clk) (((clk) * (ticks)) / NS_IN_KHZ)
+#define to_ns(ticks,clk) (((ticks) * NS_IN_KHZ) / (unsigned int)(clk))
 
 /* controller setup */
 
-static int s3c2410_nand_inithw(struct s3c2410_nand_info *info, 
+static int s3c2410_nand_inithw(struct s3c2410_nand_info *info,
                                struct device *dev)
 {
         struct s3c2410_platform_nand *plat = to_nand_plat(dev);
-        unsigned int tacls, twrph0, twrph1;
         unsigned long clkrate = clk_get_rate(info->clk);
+        int tacls, twrph0, twrph1;
         unsigned long cfg;
 
         /* calculate the timing information for the controller */
 
+        clkrate /= 1000;        /* turn clock into kHz for ease of use */
+
         if (plat != NULL) {
                 tacls  = s3c2410_nand_calc_rate(plat->tacls, clkrate, 4);
                 twrph0 = s3c2410_nand_calc_rate(plat->twrph0, clkrate, 8);
@@ -183,16 +186,16 @@ static int s3c2410_nand_inithw(struct s3c2410_nand_info *info,
                 twrph0 = 8;
                 twrph1 = 8;
         }
-        
+
         if (tacls < 0 || twrph0 < 0 || twrph1 < 0) {
                 printk(KERN_ERR PFX "cannot get timings suitable for board\n");
                 return -EINVAL;
         }
 
-        printk(KERN_INFO PFX "timing: Tacls %ldns, Twrph0 %ldns, Twrph1 %ldns\n",
-               to_ns(tacls, clkrate),
-               to_ns(twrph0, clkrate),
-               to_ns(twrph1, clkrate));
+        printk(KERN_INFO PFX "Tacls=%d, %dns Twrph0=%d %dns, Twrph1=%d %dns\n",
+               tacls, to_ns(tacls, clkrate),
+               twrph0, to_ns(twrph0, clkrate),
+               twrph1, to_ns(twrph1, clkrate));
 
         if (!info->is_s3c2440) {
                 cfg  = S3C2410_NFCONF_EN;
@@ -216,7 +219,7 @@ static int s3c2410_nand_inithw(struct s3c2410_nand_info *info,
 static void s3c2410_nand_select_chip(struct mtd_info *mtd, int chip)
 {
         struct s3c2410_nand_info *info;
-        struct s3c2410_nand_mtd *nmtd; 
+        struct s3c2410_nand_mtd *nmtd;
         struct nand_chip *this = mtd->priv;
         void __iomem *reg;
         unsigned long cur;
@@ -249,7 +252,7 @@ static void s3c2410_nand_select_chip(struct mtd_info *mtd, int chip)
         writel(cur, reg);
 }
 
-/* command and control functions 
+/* command and control functions
  *
  * Note, these all use tglx's method of changing the IO_ADDR_W field
  * to make the code simpler, and use the nand layer's code to issue the
@@ -321,7 +324,7 @@ static void s3c2440_nand_hwcontrol(struct mtd_info *mtd, int cmd)
 static int s3c2410_nand_devready(struct mtd_info *mtd)
 {
         struct s3c2410_nand_info *info = s3c2410_nand_mtd_toinfo(mtd);
-        
+
         if (info->is_s3c2440)
                 return readb(info->regs + S3C2440_NFSTAT) & S3C2440_NFSTAT_READY;
         return readb(info->regs + S3C2410_NFSTAT) & S3C2410_NFSTAT_BUSY;
@@ -342,7 +345,7 @@ static int s3c2410_nand_correct_data(struct mtd_info *mtd, u_char *dat,
 
         if (read_ecc[0] == calc_ecc[0] &&
             read_ecc[1] == calc_ecc[1] &&
-            read_ecc[2] == calc_ecc[2]) 
+            read_ecc[2] == calc_ecc[2])
                 return 0;
 
         /* we curently have no method for correcting the error */
@@ -433,14 +436,14 @@ static int s3c2410_nand_remove(struct device *dev)
 
         dev_set_drvdata(dev, NULL);
 
-        if (info == NULL) 
+        if (info == NULL)
                 return 0;
 
         /* first thing we need to do is release all our mtds
          * and their partitions, then go through freeing the
-         * resources used 
+         * resources used
          */
-        
+
         if (info->mtds != NULL) {
                 struct s3c2410_nand_mtd *ptr = info->mtds;
                 int mtdno;
@@ -504,7 +507,7 @@ static int s3c2410_nand_add_partition(struct s3c2410_nand_info *info,
 
 /* s3c2410_nand_init_chip
  *
- * init a single instance of an chip 
+ * init a single instance of an chip
 */
 
 static void s3c2410_nand_init_chip(struct s3c2410_nand_info *info,
@@ -576,7 +579,7 @@ static int s3c24xx_nand_probe(struct device *dev, int is_s3c2440)
 
         info = kmalloc(sizeof(*info), GFP_KERNEL);
         if (info == NULL) {
-                printk(KERN_ERR PFX "no memory for flash info\n");
+                dev_err(dev, "no memory for flash info\n");
                 err = -ENOMEM;
                 goto exit_error;
         }
@@ -591,7 +594,7 @@ static int s3c24xx_nand_probe(struct device *dev, int is_s3c2440)
 
         info->clk = clk_get(dev, "nand");
         if (IS_ERR(info->clk)) {
-                printk(KERN_ERR PFX "failed to get clock");
+                dev_err(dev, "failed to get clock");
                 err = -ENOENT;
                 goto exit_error;
         }
@@ -608,7 +611,7 @@ static int s3c24xx_nand_probe(struct device *dev, int is_s3c2440)
         info->area = request_mem_region(res->start, size, pdev->name);
 
         if (info->area == NULL) {
-                printk(KERN_ERR PFX "cannot reserve register region\n");
+                dev_err(dev, "cannot reserve register region\n");
                 err = -ENOENT;
                 goto exit_error;
         }
@@ -619,12 +622,12 @@ static int s3c24xx_nand_probe(struct device *dev, int is_s3c2440)
         info->is_s3c2440 = is_s3c2440;
 
         if (info->regs == NULL) {
-                printk(KERN_ERR PFX "cannot reserve register region\n");
+                dev_err(dev, "cannot reserve register region\n");
                 err = -EIO;
                 goto exit_error;
-        }               
+        }
 
-        printk(KERN_INFO PFX "mapped registers at %p\n", info->regs);
+        dev_dbg(dev, "mapped registers at %p\n", info->regs);
 
         /* initialise the hardware */
 
@@ -642,7 +645,7 @@ static int s3c24xx_nand_probe(struct device *dev, int is_s3c2440)
         size = nr_sets * sizeof(*info->mtds);
         info->mtds = kmalloc(size, GFP_KERNEL);
         if (info->mtds == NULL) {
-                printk(KERN_ERR PFX "failed to allocate mtd storage\n");
+                dev_err(dev, "failed to allocate mtd storage\n");
                 err = -ENOMEM;
                 goto exit_error;
         }
@@ -656,7 +659,7 @@ static int s3c24xx_nand_probe(struct device *dev, int is_s3c2440)
         for (setno = 0; setno < nr_sets; setno++, nmtd++) {
                 pr_debug("initialising set %d (%p, info %p)\n",
                          setno, nmtd, info);
-                
+
                 s3c2410_nand_init_chip(info, nmtd, sets);
 
                 nmtd->scan_res = nand_scan(&nmtd->mtd,
@@ -669,7 +672,7 @@ static int s3c24xx_nand_probe(struct device *dev, int is_s3c2440)
                 if (sets != NULL)
                         sets++;
         }
-        
+
         pr_debug("initialised ok\n");
         return 0;
 
@@ -695,6 +698,7 @@ static int s3c2440_nand_probe(struct device *dev)
 
 static struct device_driver s3c2410_nand_driver = {
         .name           = "s3c2410-nand",
+        .owner          = THIS_MODULE,
         .bus            = &platform_bus_type,
         .probe          = s3c2410_nand_probe,
         .remove         = s3c2410_nand_remove,
@@ -702,6 +706,7 @@ static struct device_driver s3c2410_nand_driver = {
 
 static struct device_driver s3c2440_nand_driver = {
         .name           = "s3c2440-nand",
+        .owner          = THIS_MODULE,
         .bus            = &platform_bus_type,
         .probe          = s3c2440_nand_probe,
         .remove         = s3c2410_nand_remove,
diff --git a/drivers/mtd/nand/sharpsl.c b/drivers/mtd/nand/sharpsl.c
index 88b5b5b40b43..1924a4f137c7 100644
--- a/drivers/mtd/nand/sharpsl.c
+++ b/drivers/mtd/nand/sharpsl.c
@@ -3,7 +3,7 @@
  *
  *  Copyright (C) 2004 Richard Purdie
  *
- *  $Id: sharpsl.c,v 1.4 2005/01/23 11:09:19 rpurdie Exp $
+ *  $Id: sharpsl.c,v 1.7 2005/11/07 11:14:31 gleixner Exp $
  *
  *  Based on Sharp's NAND driver sharp_sl.c
  *
@@ -76,14 +76,14 @@ static struct mtd_partition sharpsl_nand_default_partition_info[] = {
         },
 };
 
-/* 
+/*
  *      hardware specific access to control-lines
  */
 static void
 sharpsl_nand_hwcontrol(struct mtd_info* mtd, int cmd)
 {
         switch (cmd) {
-        case NAND_CTL_SETCLE: 
+        case NAND_CTL_SETCLE:
                 writeb(readb(FLASHCTL) | FLCLE, FLASHCTL);
                 break;
         case NAND_CTL_CLRCLE:
@@ -97,10 +97,10 @@ sharpsl_nand_hwcontrol(struct mtd_info* mtd, int cmd)
                 writeb(readb(FLASHCTL) & ~FLALE, FLASHCTL);
                 break;
 
-        case NAND_CTL_SETNCE: 
+        case NAND_CTL_SETNCE:
                 writeb(readb(FLASHCTL) & ~(FLCE0|FLCE1), FLASHCTL);
                 break;
-        case NAND_CTL_CLRNCE: 
+        case NAND_CTL_CLRNCE:
                 writeb(readb(FLASHCTL) | (FLCE0|FLCE1), FLASHCTL);
                 break;
         }
@@ -115,6 +115,23 @@ static struct nand_bbt_descr sharpsl_bbt = {
         .pattern = scan_ff_pattern
 };
 
+static struct nand_bbt_descr sharpsl_akita_bbt = {
+        .options = 0,
+        .offs = 4,
+        .len = 1,
+        .pattern = scan_ff_pattern
+};
+
+static struct nand_oobinfo akita_oobinfo = {
+        .useecc = MTD_NANDECC_AUTOPLACE,
+        .eccbytes = 24,
+        .eccpos = {
+                0x5,  0x1,  0x2,  0x3,  0x6,  0x7,  0x15, 0x11,
+                0x12, 0x13, 0x16, 0x17, 0x25, 0x21, 0x22, 0x23,
+                0x26, 0x27, 0x35, 0x31, 0x32, 0x33, 0x36, 0x37},
+        .oobfree = { {0x08, 0x09} }
+};
+
 static int
 sharpsl_nand_dev_ready(struct mtd_info* mtd)
 {
@@ -160,7 +177,7 @@ sharpsl_nand_init(void)
                 printk ("Unable to allocate SharpSL NAND MTD device structure.\n");
                 return -ENOMEM;
         }
-        
+
         /* map physical adress */
         sharpsl_io_base = ioremap(sharpsl_phys_base, 0x1000);
         if(!sharpsl_io_base){
@@ -168,7 +185,7 @@ sharpsl_nand_init(void)
                 kfree(sharpsl_mtd);
                 return -EIO;
         }
-        
+
         /* Get pointer to private data */
         this = (struct nand_chip *) (&sharpsl_mtd[1]);
 
@@ -194,10 +211,14 @@ sharpsl_nand_init(void)
         this->chip_delay = 15;
         /* set eccmode using hardware ECC */
         this->eccmode = NAND_ECC_HW3_256;
+        this->badblock_pattern = &sharpsl_bbt;
+        if (machine_is_akita() || machine_is_borzoi()) {
+                this->badblock_pattern = &sharpsl_akita_bbt;
+                this->autooob = &akita_oobinfo;
+        }
         this->enable_hwecc = sharpsl_nand_enable_hwecc;
         this->calculate_ecc = sharpsl_nand_calculate_ecc;
         this->correct_data = nand_correct_data;
-        this->badblock_pattern = &sharpsl_bbt;
 
         /* Scan to find existence of the device */
         err=nand_scan(sharpsl_mtd,1);
@@ -211,7 +232,7 @@ sharpsl_nand_init(void)
         sharpsl_mtd->name = "sharpsl-nand";
         nr_partitions = parse_mtd_partitions(sharpsl_mtd, part_probes,
                                                 &sharpsl_partition_info, 0);
-                                                 
+
         if (nr_partitions <= 0) {
                 nr_partitions = DEFAULT_NUM_PARTITIONS;
                 sharpsl_partition_info = sharpsl_nand_default_partition_info;
@@ -230,7 +251,7 @@ sharpsl_nand_init(void)
                 }
         }
 
-        if (machine_is_husky() || machine_is_borzoi()) {
+        if (machine_is_husky() || machine_is_borzoi() || machine_is_akita()) {
                 /* Need to use small eraseblock size for backward compatibility */
                 sharpsl_mtd->flags |= MTD_NO_VIRTBLOCKS;
         }
diff --git a/drivers/mtd/nand/spia.c b/drivers/mtd/nand/spia.c
index b777c412b758..32541cbb0103 100644
--- a/drivers/mtd/nand/spia.c
+++ b/drivers/mtd/nand/spia.c
@@ -8,7 +8,7 @@
  *                      to controllines (due to change in nand.c)
  *                      page_cache added
  *
- * $Id: spia.c,v 1.24 2004/11/04 12:53:10 gleixner Exp $
+ * $Id: spia.c,v 1.25 2005/11/07 11:14:31 gleixner Exp $
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 as
@@ -82,7 +82,7 @@ const static struct mtd_partition partition_info[] = {
 #define NUM_PARTITIONS 2
 
 
-/* 
+/*
  *      hardware specific access to control-lines
 */
 static void spia_hwcontrol(struct mtd_info *mtd, int cmd){
@@ -137,7 +137,7 @@ int __init spia_init (void)
         /* Set address of hardware control function */
         this->hwcontrol = spia_hwcontrol;
         /* 15 us command delay time */
-        this->chip_delay = 15;          
+        this->chip_delay = 15;
 
         /* Scan to find existence of the device */
         if (nand_scan (spia_mtd, 1)) {
diff --git a/drivers/mtd/nand/toto.c b/drivers/mtd/nand/toto.c
index 52c808fb5fa9..7609c43cb3ec 100644
--- a/drivers/mtd/nand/toto.c
+++ b/drivers/mtd/nand/toto.c
@@ -15,7 +15,7 @@
  *   This is a device driver for the NAND flash device found on the
  *   TI fido board. It supports 32MiB and 64MiB cards
  *
- * $Id: toto.c,v 1.4 2004/10/05 13:50:20 gleixner Exp $
+ * $Id: toto.c,v 1.5 2005/11/07 11:14:31 gleixner Exp $
  */
 
 #include <linux/slab.h>
@@ -57,7 +57,7 @@ static unsigned long toto_io_base = OMAP_FLASH_1_BASE;
 #endif
 #define T_NAND_CTL_SETNCE(iob)  gpiosetout(NAND_NCE, 0)
 #define T_NAND_CTL_CLRNCE(iob)  gpiosetout(NAND_NCE, NAND_NCE)
-                
+
 /*
  * Define partitions for flash devices
  */
@@ -91,7 +91,7 @@ static struct mtd_partition partition_info32M[] = {
 
 #define NUM_PARTITIONS32M 3
 #define NUM_PARTITIONS64M 4
-/* 
+/*
  *      hardware specific access to control-lines
 */
 
@@ -146,7 +146,7 @@ int __init toto_init (void)
         this->hwcontrol = toto_hwcontrol;
         this->dev_ready = NULL;
         /* 25 us command delay time */
-        this->chip_delay = 30;          
+        this->chip_delay = 30;
         this->eccmode = NAND_ECC_SOFT;
 
         /* Scan to find existance of the device */
@@ -157,10 +157,10 @@ int __init toto_init (void)
 
         /* Register the partitions */
         switch(toto_mtd->size){
-                case SZ_64M: add_mtd_partitions(toto_mtd, partition_info64M, NUM_PARTITIONS64M); break; 
-                case SZ_32M: add_mtd_partitions(toto_mtd, partition_info32M, NUM_PARTITIONS32M); break; 
+                case SZ_64M: add_mtd_partitions(toto_mtd, partition_info64M, NUM_PARTITIONS64M); break;
+                case SZ_32M: add_mtd_partitions(toto_mtd, partition_info32M, NUM_PARTITIONS32M); break;
                 default: {
-                        printk (KERN_WARNING "Unsupported Nand device\n"); 
+                        printk (KERN_WARNING "Unsupported Nand device\n");
                         err = -ENXIO;
                         goto out_buf;
                 }
@@ -170,9 +170,9 @@ int __init toto_init (void)
         archflashwp(0,0);        /* open up flash for writing */
 
         goto out;
-    
+
 out_buf:
-        kfree (this->data_buf);    
+        kfree (this->data_buf);
 out_mtd:
         kfree (toto_mtd);
 out:
@@ -194,7 +194,7 @@ static void __exit toto_cleanup (void)
 
         /* stop flash writes */
          archflashwp(0,1);
-        
+
         /* release gpios to system */
          gpiorelease(NAND_MASK);
 }
diff --git a/drivers/mtd/nftlcore.c b/drivers/mtd/nftlcore.c
index b2014043634f..d7cd5fa16ba4 100644
--- a/drivers/mtd/nftlcore.c
+++ b/drivers/mtd/nftlcore.c
@@ -1,7 +1,7 @@
 /* Linux driver for NAND Flash Translation Layer      */
 /* (c) 1999 Machine Vision Holdings, Inc.             */
 /* Author: David Woodhouse <dwmw2@infradead.org>      */
-/* $Id: nftlcore.c,v 1.97 2004/11/16 18:28:59 dwmw2 Exp $ */
+/* $Id: nftlcore.c,v 1.98 2005/11/07 11:14:21 gleixner Exp $ */
 
 /*
   The contents of this file are distributed under the GNU General
@@ -101,23 +101,21 @@ static void nftl_add_mtd(struct mtd_blktrans_ops *tr, struct mtd_info *mtd)
 
         if (nftl->mbd.size != nftl->heads * nftl->cylinders * nftl->sectors) {
                 /*
-                  Oh no we don't have 
+                  Oh no we don't have
                    mbd.size == heads * cylinders * sectors
                 */
                 printk(KERN_WARNING "NFTL: cannot calculate a geometry to "
                        "match size of 0x%lx.\n", nftl->mbd.size);
                 printk(KERN_WARNING "NFTL: using C:%d H:%d S:%d "
                         "(== 0x%lx sects)\n",
-                        nftl->cylinders, nftl->heads , nftl->sectors, 
+                        nftl->cylinders, nftl->heads , nftl->sectors,
                         (long)nftl->cylinders * (long)nftl->heads *
                         (long)nftl->sectors );
         }
 
         if (add_mtd_blktrans_dev(&nftl->mbd)) {
-                if (nftl->ReplUnitTable)
-                        kfree(nftl->ReplUnitTable);
-                if (nftl->EUNtable)
-                        kfree(nftl->EUNtable);
+                kfree(nftl->ReplUnitTable);
+                kfree(nftl->EUNtable);
                 kfree(nftl);
                 return;
         }
@@ -133,10 +131,8 @@ static void nftl_remove_dev(struct mtd_blktrans_dev *dev)
         DEBUG(MTD_DEBUG_LEVEL1, "NFTL: remove_dev (i=%d)\n", dev->devnum);
 
         del_mtd_blktrans_dev(dev);
-        if (nftl->ReplUnitTable)
-                kfree(nftl->ReplUnitTable);
-        if (nftl->EUNtable)
-                kfree(nftl->EUNtable);
+        kfree(nftl->ReplUnitTable);
+        kfree(nftl->EUNtable);
         kfree(nftl);
 }
 
@@ -178,7 +174,7 @@ static u16 NFTL_findfreeblock(struct NFTLrecord *nftl, int desperate )
 
                 if (!silly--) {
                         printk("Argh! No free blocks found! LastFreeEUN = %d, "
-                               "FirstEUN = %d\n", nftl->LastFreeEUN, 
+                               "FirstEUN = %d\n", nftl->LastFreeEUN,
                                le16_to_cpu(nftl->MediaHdr.FirstPhysicalEUN));
                         return 0xffff;
                 }
@@ -210,7 +206,7 @@ static u16 NFTL_foldchain (struct NFTLrecord *nftl, unsigned thisVUC, unsigned p
                        "Virtual Unit Chain %d!\n", thisVUC);
                 return BLOCK_NIL;
         }
-        
+
         /* Scan to find the Erase Unit which holds the actual data for each
            512-byte block within the Chain.
         */
@@ -227,7 +223,7 @@ static u16 NFTL_foldchain (struct NFTLrecord *nftl, unsigned thisVUC, unsigned p
                         if (block == 2) {
                                 foldmark = oob.u.c.FoldMark | oob.u.c.FoldMark1;
                                 if (foldmark == FOLD_MARK_IN_PROGRESS) {
-                                        DEBUG(MTD_DEBUG_LEVEL1, 
+                                        DEBUG(MTD_DEBUG_LEVEL1,
                                               "Write Inhibited on EUN %d\n", thisEUN);
                                         inplace = 0;
                                 } else {
@@ -249,7 +245,7 @@ static u16 NFTL_foldchain (struct NFTLrecord *nftl, unsigned thisVUC, unsigned p
                                 if (!BlockFreeFound[block])
                                         BlockMap[block] = thisEUN;
                                 else
-                                        printk(KERN_WARNING 
+                                        printk(KERN_WARNING
                                                "SECTOR_USED found after SECTOR_FREE "
                                                "in Virtual Unit Chain %d for block %d\n",
                                                thisVUC, block);
@@ -258,7 +254,7 @@ static u16 NFTL_foldchain (struct NFTLrecord *nftl, unsigned thisVUC, unsigned p
                                 if (!BlockFreeFound[block])
                                         BlockMap[block] = BLOCK_NIL;
                                 else
-                                        printk(KERN_WARNING 
+                                        printk(KERN_WARNING
                                                "SECTOR_DELETED found after SECTOR_FREE "
                                                "in Virtual Unit Chain %d for block %d\n",
                                                thisVUC, block);
@@ -277,14 +273,14 @@ static u16 NFTL_foldchain (struct NFTLrecord *nftl, unsigned thisVUC, unsigned p
                                thisVUC);
                         return BLOCK_NIL;
                 }
-                
+
                 thisEUN = nftl->ReplUnitTable[thisEUN];
         }
 
         if (inplace) {
                 /* We're being asked to be a fold-in-place. Check
                    that all blocks which actually have data associated
-                   with them (i.e. BlockMap[block] != BLOCK_NIL) are 
+                   with them (i.e. BlockMap[block] != BLOCK_NIL) are
                    either already present or SECTOR_FREE in the target
                    block. If not, we're going to have to fold out-of-place
                    anyway.
@@ -297,7 +293,7 @@ static u16 NFTL_foldchain (struct NFTLrecord *nftl, unsigned thisVUC, unsigned p
                                       "block %d was %x lastEUN, "
                                       "and is in EUN %d (%s) %d\n",
                                       thisVUC, block, BlockLastState[block],
-                                      BlockMap[block], 
+                                      BlockMap[block],
                                       BlockMap[block]== targetEUN ? "==" : "!=",
                                       targetEUN);
                                 inplace = 0;
@@ -314,17 +310,17 @@ static u16 NFTL_foldchain (struct NFTLrecord *nftl, unsigned thisVUC, unsigned p
                         inplace = 0;
                 }
         }
-        
+
         if (!inplace) {
                 DEBUG(MTD_DEBUG_LEVEL1, "Cannot fold Virtual Unit Chain %d in place. "
                       "Trying out-of-place\n", thisVUC);
                 /* We need to find a targetEUN to fold into. */
                 targetEUN = NFTL_findfreeblock(nftl, 1);
                 if (targetEUN == BLOCK_NIL) {
-                        /* Ouch. Now we're screwed. We need to do a 
+                        /* Ouch. Now we're screwed. We need to do a
                            fold-in-place of another chain to make room
                            for this one. We need a better way of selecting
-                           which chain to fold, because makefreeblock will 
+                           which chain to fold, because makefreeblock will
                            only ask us to fold the same one again.
                         */
                         printk(KERN_WARNING
@@ -338,7 +334,7 @@ static u16 NFTL_foldchain (struct NFTLrecord *nftl, unsigned thisVUC, unsigned p
                chain by selecting the longer one */
             oob.u.c.FoldMark = oob.u.c.FoldMark1 = cpu_to_le16(FOLD_MARK_IN_PROGRESS);
             oob.u.c.unused = 0xffffffff;
-            MTD_WRITEOOB(nftl->mbd.mtd, (nftl->EraseSize * targetEUN) + 2 * 512 + 8, 
+            MTD_WRITEOOB(nftl->mbd.mtd, (nftl->EraseSize * targetEUN) + 2 * 512 + 8,
                          8, &retlen, (char *)&oob.u);
         }
 
@@ -361,14 +357,14 @@ static u16 NFTL_foldchain (struct NFTLrecord *nftl, unsigned thisVUC, unsigned p
                    happen in case of media errors or deleted blocks) */
                 if (BlockMap[block] == BLOCK_NIL)
                         continue;
-                
+
                 ret = MTD_READ(nftl->mbd.mtd, (nftl->EraseSize * BlockMap[block]) + (block * 512),
-                                  512, &retlen, movebuf); 
+                                  512, &retlen, movebuf);
                 if (ret < 0) {
                     ret = MTD_READ(nftl->mbd.mtd, (nftl->EraseSize * BlockMap[block])
                                       + (block * 512), 512, &retlen,
-                                      movebuf); 
-                    if (ret != -EIO) 
+                                      movebuf);
+                    if (ret != -EIO)
                         printk("Error went away on retry.\n");
                 }
                 memset(&oob, 0xff, sizeof(struct nftl_oob));
@@ -376,18 +372,18 @@ static u16 NFTL_foldchain (struct NFTLrecord *nftl, unsigned thisVUC, unsigned p
                 MTD_WRITEECC(nftl->mbd.mtd, (nftl->EraseSize * targetEUN) + (block * 512),
                              512, &retlen, movebuf, (char *)&oob, &nftl->oobinfo);
         }
-        
+
         /* add the header so that it is now a valid chain */
         oob.u.a.VirtUnitNum = oob.u.a.SpareVirtUnitNum
                 = cpu_to_le16(thisVUC);
         oob.u.a.ReplUnitNum = oob.u.a.SpareReplUnitNum = 0xffff;
-        
-        MTD_WRITEOOB(nftl->mbd.mtd, (nftl->EraseSize * targetEUN) + 8, 
+
+        MTD_WRITEOOB(nftl->mbd.mtd, (nftl->EraseSize * targetEUN) + 8,
                      8, &retlen, (char *)&oob.u);
 
         /* OK. We've moved the whole lot into the new block. Now we have to free the original blocks. */
 
-        /* At this point, we have two different chains for this Virtual Unit, and no way to tell 
+        /* At this point, we have two different chains for this Virtual Unit, and no way to tell
            them apart. If we crash now, we get confused. However, both contain the same data, so we
            shouldn't actually lose data in this case. It's just that when we load up on a medium which
            has duplicate chains, we need to free one of the chains because it's not necessary any more.
@@ -395,7 +391,7 @@ static u16 NFTL_foldchain (struct NFTLrecord *nftl, unsigned thisVUC, unsigned p
         thisEUN = nftl->EUNtable[thisVUC];
         DEBUG(MTD_DEBUG_LEVEL1,"Want to erase\n");
 
-        /* For each block in the old chain (except the targetEUN of course), 
+        /* For each block in the old chain (except the targetEUN of course),
            free it and make it available for future use */
         while (thisEUN <= nftl->lastEUN && thisEUN != targetEUN) {
                 unsigned int EUNtmp;
@@ -413,7 +409,7 @@ static u16 NFTL_foldchain (struct NFTLrecord *nftl, unsigned thisVUC, unsigned p
                 }
                 thisEUN = EUNtmp;
         }
-        
+
         /* Make this the new start of chain for thisVUC */
         nftl->ReplUnitTable[targetEUN] = BLOCK_NIL;
         nftl->EUNtable[thisVUC] = targetEUN;
@@ -423,7 +419,7 @@ static u16 NFTL_foldchain (struct NFTLrecord *nftl, unsigned thisVUC, unsigned p
 
 static u16 NFTL_makefreeblock( struct NFTLrecord *nftl , unsigned pendingblock)
 {
-        /* This is the part that needs some cleverness applied. 
+        /* This is the part that needs some cleverness applied.
            For now, I'm doing the minimum applicable to actually
            get the thing to work.
            Wear-levelling and other clever stuff needs to be implemented
@@ -470,7 +466,7 @@ static u16 NFTL_makefreeblock( struct NFTLrecord *nftl , unsigned pendingblock)
         return NFTL_foldchain (nftl, LongestChain, pendingblock);
 }
 
-/* NFTL_findwriteunit: Return the unit number into which we can write 
+/* NFTL_findwriteunit: Return the unit number into which we can write
                        for this block. Make it available if it isn't already
 */
 static inline u16 NFTL_findwriteunit(struct NFTLrecord *nftl, unsigned block)
@@ -488,7 +484,7 @@ static inline u16 NFTL_findwriteunit(struct NFTLrecord *nftl, unsigned block)
                    a free space for the block in question.
                 */
 
-                /* This condition catches the 0x[7f]fff cases, as well as 
+                /* This condition catches the 0x[7f]fff cases, as well as
                    being a sanity check for past-end-of-media access
                 */
                 lastEUN = BLOCK_NIL;
@@ -503,7 +499,7 @@ static inline u16 NFTL_findwriteunit(struct NFTLrecord *nftl, unsigned block)
 
                         MTD_READOOB(nftl->mbd.mtd, (writeEUN * nftl->EraseSize) + blockofs,
                                     8, &retlen, (char *)&bci);
-                        
+
                         DEBUG(MTD_DEBUG_LEVEL2, "Status of block %d in EUN %d is %x\n",
                               block , writeEUN, le16_to_cpu(bci.Status));
 
@@ -518,10 +514,10 @@ static inline u16 NFTL_findwriteunit(struct NFTLrecord *nftl, unsigned block)
                                 break;
                         default:
                                 // Invalid block. Don't use it any more. Must implement.
-                                break;                  
+                                break;
                         }
-                        
-                        if (!silly--) { 
+
+                        if (!silly--) {
                                 printk(KERN_WARNING
                                        "Infinite loop in Virtual Unit Chain 0x%x\n",
                                        thisVUC);
@@ -532,7 +528,7 @@ static inline u16 NFTL_findwriteunit(struct NFTLrecord *nftl, unsigned block)
                         writeEUN = nftl->ReplUnitTable[writeEUN];
                 }
 
-                /* OK. We didn't find one in the existing chain, or there 
+                /* OK. We didn't find one in the existing chain, or there
                    is no existing chain. */
 
                 /* Try to find an already-free block */
@@ -546,12 +542,12 @@ static inline u16 NFTL_findwriteunit(struct NFTLrecord *nftl, unsigned block)
 
                         /* First remember the start of this chain */
                         //u16 startEUN = nftl->EUNtable[thisVUC];
-                        
+
                         //printk("Write to VirtualUnitChain %d, calling makefreeblock()\n", thisVUC);
                         writeEUN = NFTL_makefreeblock(nftl, 0xffff);
 
                         if (writeEUN == BLOCK_NIL) {
-                                /* OK, we accept that the above comment is 
+                                /* OK, we accept that the above comment is
                                    lying - there may have been free blocks
                                    last time we called NFTL_findfreeblock(),
                                    but they are reserved for when we're
@@ -562,21 +558,21 @@ static inline u16 NFTL_findwriteunit(struct NFTLrecord *nftl, unsigned block)
                         }
                         if (writeEUN == BLOCK_NIL) {
                                 /* Ouch. This should never happen - we should
-                                   always be able to make some room somehow. 
-                                   If we get here, we've allocated more storage 
+                                   always be able to make some room somehow.
+                                   If we get here, we've allocated more storage
                                    space than actual media, or our makefreeblock
                                    routine is missing something.
                                 */
                                 printk(KERN_WARNING "Cannot make free space.\n");
                                 return BLOCK_NIL;
-                        }                       
+                        }
                         //printk("Restarting scan\n");
                         lastEUN = BLOCK_NIL;
                         continue;
                 }
 
                 /* We've found a free block. Insert it into the chain. */
-                
+
                 if (lastEUN != BLOCK_NIL) {
                     thisVUC |= 0x8000; /* It's a replacement block */
                 } else {
@@ -749,7 +745,7 @@ extern char nftlmountrev[];
 
 static int __init init_nftl(void)
 {
-        printk(KERN_INFO "NFTL driver: nftlcore.c $Revision: 1.97 $, nftlmount.c %s\n", nftlmountrev);
+        printk(KERN_INFO "NFTL driver: nftlcore.c $Revision: 1.98 $, nftlmount.c %s\n", nftlmountrev);
 
         return register_mtd_blktrans(&nftl_tr);
 }
diff --git a/drivers/mtd/nftlmount.c b/drivers/mtd/nftlmount.c
index 84afd9029f53..3b104ebb219a 100644
--- a/drivers/mtd/nftlmount.c
+++ b/drivers/mtd/nftlmount.c
@@ -1,10 +1,10 @@
-/* 
+/*
  * NFTL mount code with extensive checks
  *
- * Author: Fabrice Bellard (fabrice.bellard@netgem.com) 
+ * Author: Fabrice Bellard (fabrice.bellard@netgem.com)
  * Copyright (C) 2000 Netgem S.A.
  *
- * $Id: nftlmount.c,v 1.40 2004/11/22 14:38:29 kalev Exp $
+ * $Id: nftlmount.c,v 1.41 2005/11/07 11:14:21 gleixner Exp $
  *
  * 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
@@ -31,7 +31,7 @@
 
 #define SECTORSIZE 512
 
-char nftlmountrev[]="$Revision: 1.40 $";
+char nftlmountrev[]="$Revision: 1.41 $";
 
 /* find_boot_record: Find the NFTL Media Header and its Spare copy which contains the
  *      various device information of the NFTL partition and Bad Unit Table. Update
@@ -47,7 +47,7 @@ static int find_boot_record(struct NFTLrecord *nftl)
         struct NFTLMediaHeader *mh = &nftl->MediaHdr;
         unsigned int i;
 
-        /* Assume logical EraseSize == physical erasesize for starting the scan. 
+        /* Assume logical EraseSize == physical erasesize for starting the scan.
            We'll sort it out later if we find a MediaHeader which says otherwise */
         /* Actually, we won't.  The new DiskOnChip driver has already scanned
            the MediaHeader and adjusted the virtual erasesize it presents in
@@ -83,9 +83,9 @@ static int find_boot_record(struct NFTLrecord *nftl)
                 if (retlen < 6 || memcmp(buf, "ANAND", 6)) {
                         /* ANAND\0 not found. Continue */
 #if 0
-                        printk(KERN_DEBUG "ANAND header not found at 0x%x in mtd%d\n", 
+                        printk(KERN_DEBUG "ANAND header not found at 0x%x in mtd%d\n",
                                block * nftl->EraseSize, nftl->mbd.mtd->index);
-#endif                  
+#endif
                         continue;
                 }
 
@@ -103,7 +103,7 @@ static int find_boot_record(struct NFTLrecord *nftl)
       */
                 if (le16_to_cpu(h1.EraseMark | h1.EraseMark1) != ERASE_MARK) {
                         printk(KERN_NOTICE "ANAND header found at 0x%x in mtd%d, but erase mark not present (0x%04x,0x%04x instead)\n",
-                               block * nftl->EraseSize, nftl->mbd.mtd->index, 
+                               block * nftl->EraseSize, nftl->mbd.mtd->index,
                                le16_to_cpu(h1.EraseMark), le16_to_cpu(h1.EraseMark1));
                         continue;
                 }
@@ -175,7 +175,7 @@ device is already correct.
                 nftl->nb_boot_blocks = le16_to_cpu(mh->FirstPhysicalEUN);
                 if ((nftl->nb_boot_blocks + 2) >= nftl->nb_blocks) {
                         printk(KERN_NOTICE "NFTL Media Header sanity check failed:\n");
-                        printk(KERN_NOTICE "nb_boot_blocks (%d) + 2 > nb_blocks (%d)\n", 
+                        printk(KERN_NOTICE "nb_boot_blocks (%d) + 2 > nb_blocks (%d)\n",
                                nftl->nb_boot_blocks, nftl->nb_blocks);
                         return -1;
                 }
@@ -187,7 +187,7 @@ device is already correct.
                                nftl->numvunits, nftl->nb_blocks, nftl->nb_boot_blocks);
                         return -1;
                 }
-                
+
                 nftl->mbd.size  = nftl->numvunits * (nftl->EraseSize / SECTORSIZE);
 
                 /* If we're not using the last sectors in the device for some reason,
@@ -210,12 +210,12 @@ device is already correct.
                         printk(KERN_NOTICE "NFTL: allocation of ReplUnitTable failed\n");
                         return -ENOMEM;
                 }
-                
+
                 /* mark the bios blocks (blocks before NFTL MediaHeader) as reserved */
                 for (i = 0; i < nftl->nb_boot_blocks; i++)
                         nftl->ReplUnitTable[i] = BLOCK_RESERVED;
                 /* mark all remaining blocks as potentially containing data */
-                for (; i < nftl->nb_blocks; i++) { 
+                for (; i < nftl->nb_blocks; i++) {
                         nftl->ReplUnitTable[i] = BLOCK_NOTEXPLORED;
                 }
 
@@ -245,12 +245,12 @@ The new DiskOnChip driver already scanned the bad block table.  Just query it.
                         if (nftl->mbd.mtd->block_isbad(nftl->mbd.mtd, i * nftl->EraseSize))
                                 nftl->ReplUnitTable[i] = BLOCK_RESERVED;
                 }
-                
+
                 nftl->MediaUnit = block;
                 boot_record_count++;
-                
+
         } /* foreach (block) */
-                
+
         return boot_record_count?0:-1;
 }
 
@@ -265,7 +265,7 @@ static int memcmpb(void *a, int c, int n)
 }
 
 /* check_free_sector: check if a free sector is actually FREE, i.e. All 0xff in data and oob area */
-static int check_free_sectors(struct NFTLrecord *nftl, unsigned int address, int len, 
+static int check_free_sectors(struct NFTLrecord *nftl, unsigned int address, int len,
                               int check_oob)
 {
         int i;
@@ -293,7 +293,7 @@ static int check_free_sectors(struct NFTLrecord *nftl, unsigned int address, int
  *
  * Return: 0 when succeed, -1 on error.
  *
- *  ToDo: 1. Is it neceressary to check_free_sector after erasing ?? 
+ *  ToDo: 1. Is it neceressary to check_free_sector after erasing ??
  */
 int NFTL_formatblock(struct NFTLrecord *nftl, int block)
 {
@@ -385,7 +385,7 @@ static void check_sectors_in_chain(struct NFTLrecord *nftl, unsigned int first_b
                                 /* verify that the sector is really free. If not, mark
                                    as ignore */
                                 if (memcmpb(&bci, 0xff, 8) != 0 ||
-                                    check_free_sectors(nftl, block * nftl->EraseSize + i * SECTORSIZE, 
+                                    check_free_sectors(nftl, block * nftl->EraseSize + i * SECTORSIZE,
                                                        SECTORSIZE, 0) != 0) {
                                         printk("Incorrect free sector %d in block %d: "
                                                "marking it as ignored\n",
@@ -486,7 +486,7 @@ static int check_and_mark_free_block(struct NFTLrecord *nftl, int block)
         size_t retlen;
 
         /* check erase mark. */
-        if (MTD_READOOB(nftl->mbd.mtd, block * nftl->EraseSize + SECTORSIZE + 8, 8, 
+        if (MTD_READOOB(nftl->mbd.mtd, block * nftl->EraseSize + SECTORSIZE + 8, 8,
                         &retlen, (char *)&h1) < 0)
                 return -1;
 
@@ -501,7 +501,7 @@ static int check_and_mark_free_block(struct NFTLrecord *nftl, int block)
                 h1.EraseMark = cpu_to_le16(ERASE_MARK);
                 h1.EraseMark1 = cpu_to_le16(ERASE_MARK);
                 h1.WearInfo = cpu_to_le32(0);
-                if (MTD_WRITEOOB(nftl->mbd.mtd, block * nftl->EraseSize + SECTORSIZE + 8, 8, 
+                if (MTD_WRITEOOB(nftl->mbd.mtd, block * nftl->EraseSize + SECTORSIZE + 8, 8,
                                  &retlen, (char *)&h1) < 0)
                         return -1;
         } else {
@@ -582,9 +582,9 @@ int NFTL_mount(struct NFTLrecord *s)
 
                         for (;;) {
                                 /* read the block header. If error, we format the chain */
-                                if (MTD_READOOB(s->mbd.mtd, block * s->EraseSize + 8, 8, 
+                                if (MTD_READOOB(s->mbd.mtd, block * s->EraseSize + 8, 8,
                                                 &retlen, (char *)&h0) < 0 ||
-                                    MTD_READOOB(s->mbd.mtd, block * s->EraseSize + SECTORSIZE + 8, 8, 
+                                    MTD_READOOB(s->mbd.mtd, block * s->EraseSize + SECTORSIZE + 8, 8,
                                                 &retlen, (char *)&h1) < 0) {
                                         s->ReplUnitTable[block] = BLOCK_NIL;
                                         do_format_chain = 1;
@@ -639,7 +639,7 @@ int NFTL_mount(struct NFTLrecord *s)
                                         first_logical_block = logical_block;
                                 } else {
                                         if (logical_block != first_logical_block) {
-                                                printk("Block %d: incorrect logical block: %d expected: %d\n", 
+                                                printk("Block %d: incorrect logical block: %d expected: %d\n",
                                                        block, logical_block, first_logical_block);
                                                 /* the chain is incorrect : we must format it,
                                                    but we need to read it completly */
@@ -668,7 +668,7 @@ int NFTL_mount(struct NFTLrecord *s)
                                         s->ReplUnitTable[block] = BLOCK_NIL;
                                         break;
                                 } else if (rep_block >= s->nb_blocks) {
-                                        printk("Block %d: referencing invalid block %d\n", 
+                                        printk("Block %d: referencing invalid block %d\n",
                                                block, rep_block);
                                         do_format_chain = 1;
                                         s->ReplUnitTable[block] = BLOCK_NIL;
@@ -688,7 +688,7 @@ int NFTL_mount(struct NFTLrecord *s)
                                                 s->ReplUnitTable[block] = rep_block;
                                                 s->EUNtable[first_logical_block] = BLOCK_NIL;
                                         } else {
-                                                printk("Block %d: referencing block %d already in another chain\n", 
+                                                printk("Block %d: referencing block %d already in another chain\n",
                                                        block, rep_block);
                                                 /* XXX: should handle correctly fold in progress chains */
                                                 do_format_chain = 1;
@@ -710,7 +710,7 @@ int NFTL_mount(struct NFTLrecord *s)
                         } else {
                                 unsigned int first_block1, chain_to_format, chain_length1;
                                 int fold_mark;
-                                
+
                                 /* valid chain : get foldmark */
                                 fold_mark = get_fold_mark(s, first_block);
                                 if (fold_mark == 0) {
@@ -729,9 +729,9 @@ int NFTL_mount(struct NFTLrecord *s)
                                         if (first_block1 != BLOCK_NIL) {
                                                 /* XXX: what to do if same length ? */
                                                 chain_length1 = calc_chain_length(s, first_block1);
-                                                printk("Two chains at blocks %d (len=%d) and %d (len=%d)\n", 
+                                                printk("Two chains at blocks %d (len=%d) and %d (len=%d)\n",
                                                        first_block1, chain_length1, first_block, chain_length);
-                                                
+
                                                 if (chain_length >= chain_length1) {
                                                         chain_to_format = first_block1;
                                                         s->EUNtable[first_logical_block] = first_block;
diff --git a/drivers/mtd/onenand/Kconfig b/drivers/mtd/onenand/Kconfig
new file mode 100644
index 000000000000..126ff6bf63d5
--- /dev/null
+++ b/drivers/mtd/onenand/Kconfig
@@ -0,0 +1,38 @@
+#
+# linux/drivers/mtd/onenand/Kconfig
+#
+
+menu "OneNAND Flash Device Drivers"
+        depends on MTD != n
+
+config MTD_ONENAND
+        tristate "OneNAND Device Support"
+        depends on MTD
+        help
+          This enables support for accessing all type of OneNAND flash
+          devices. For further information see
+          <http://www.samsung.com/Products/Semiconductor/Flash/OneNAND_TM/index.htm>.
+
+config MTD_ONENAND_VERIFY_WRITE
+        bool "Verify OneNAND page writes"
+        depends on MTD_ONENAND
+        help
+          This adds an extra check when data is written to the flash. The
+          OneNAND flash device internally checks only bits transitioning
+          from 1 to 0. There is a rare possibility that even though the
+          device thinks the write was successful, a bit could have been
+          flipped accidentaly due to device wear or something else.
+
+config MTD_ONENAND_GENERIC
+        tristate "OneNAND Flash device via platform device driver"
+        depends on MTD_ONENAND && ARM
+        help
+          Support for OneNAND flash via platform device driver.
+
+config MTD_ONENAND_SYNC_READ
+        bool "OneNAND Sync. Burst Read Support"
+        depends on ARCH_OMAP
+        help
+          This enables support for Sync. Burst Read.
+
+endmenu
diff --git a/drivers/mtd/onenand/Makefile b/drivers/mtd/onenand/Makefile
new file mode 100644
index 000000000000..269cfe467345
--- /dev/null
+++ b/drivers/mtd/onenand/Makefile
@@ -0,0 +1,11 @@
+#
+# Makefile for the OneNAND MTD
+#
+
+# Core functionality.
+obj-$(CONFIG_MTD_ONENAND)               += onenand.o
+
+# Board specific.
+obj-$(CONFIG_MTD_ONENAND_GENERIC)       += generic.o
+
+onenand-objs = onenand_base.o onenand_bbt.o
diff --git a/drivers/mtd/onenand/generic.c b/drivers/mtd/onenand/generic.c
new file mode 100644
index 000000000000..48cce431f89f
--- /dev/null
+++ b/drivers/mtd/onenand/generic.c
@@ -0,0 +1,147 @@
+/*
+ *  linux/drivers/mtd/onenand/generic.c
+ *
+ *  Copyright (c) 2005 Samsung Electronics
+ *  Kyungmin Park <kyungmin.park@samsung.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ *
+ *  Overview:
+ *   This is a device driver for the OneNAND flash for generic boards.
+ */
+
+#include <linux/device.h>
+#include <linux/module.h>
+#include <linux/init.h>
+#include <linux/mtd/mtd.h>
+#include <linux/mtd/onenand.h>
+#include <linux/mtd/partitions.h>
+
+#include <asm/io.h>
+#include <asm/mach/flash.h>
+
+#define DRIVER_NAME     "onenand"
+
+
+#ifdef CONFIG_MTD_PARTITIONS
+static const char *part_probes[] = { "cmdlinepart", NULL,  };
+#endif
+
+struct onenand_info {
+        struct mtd_info         mtd;
+        struct mtd_partition    *parts;
+        struct onenand_chip     onenand;
+};
+
+static int __devinit generic_onenand_probe(struct device *dev)
+{
+        struct onenand_info *info;
+        struct platform_device *pdev = to_platform_device(dev);
+        struct onenand_platform_data *pdata = pdev->dev.platform_data;
+        struct resource *res = pdev->resource;
+        unsigned long size = res->end - res->start + 1;
+        int err;
+
+        info = kmalloc(sizeof(struct onenand_info), GFP_KERNEL);
+        if (!info)
+                return -ENOMEM;
+
+        memset(info, 0, sizeof(struct onenand_info));
+
+        if (!request_mem_region(res->start, size, dev->driver->name)) {
+                err = -EBUSY;
+                goto out_free_info;
+        }
+
+        info->onenand.base = ioremap(res->start, size);
+        if (!info->onenand.base) {
+                err = -ENOMEM;
+                goto out_release_mem_region;
+        }
+
+        info->onenand.mmcontrol = pdata->mmcontrol;
+
+        info->mtd.name = pdev->dev.bus_id;
+        info->mtd.priv = &info->onenand;
+        info->mtd.owner = THIS_MODULE;
+
+        if (onenand_scan(&info->mtd, 1)) {
+                err = -ENXIO;
+                goto out_iounmap;
+        }
+
+#ifdef CONFIG_MTD_PARTITIONS
+        err = parse_mtd_partitions(&info->mtd, part_probes, &info->parts, 0);
+        if (err > 0)
+                add_mtd_partitions(&info->mtd, info->parts, err);
+        else if (err < 0 && pdata->parts)
+                add_mtd_partitions(&info->mtd, pdata->parts, pdata->nr_parts);
+        else
+#endif
+                err = add_mtd_device(&info->mtd);
+
+        dev_set_drvdata(&pdev->dev, info);
+
+        return 0;
+
+out_iounmap:
+        iounmap(info->onenand.base);
+out_release_mem_region:
+        release_mem_region(res->start, size);
+out_free_info:
+        kfree(info);
+
+        return err;
+}
+
+static int __devexit generic_onenand_remove(struct device *dev)
+{
+        struct platform_device *pdev = to_platform_device(dev);
+        struct onenand_info *info = dev_get_drvdata(&pdev->dev);
+        struct resource *res = pdev->resource;
+        unsigned long size = res->end - res->start + 1;
+
+        dev_set_drvdata(&pdev->dev, NULL);
+
+        if (info) {
+                if (info->parts)
+                        del_mtd_partitions(&info->mtd);
+                else
+                        del_mtd_device(&info->mtd);
+
+                onenand_release(&info->mtd);
+                release_mem_region(res->start, size);
+                iounmap(info->onenand.base);
+                kfree(info);
+        }
+
+        return 0;
+}
+
+static struct device_driver generic_onenand_driver = {
+        .name           = DRIVER_NAME,
+        .bus            = &platform_bus_type,
+        .probe          = generic_onenand_probe,
+        .remove         = __devexit_p(generic_onenand_remove),
+};
+
+MODULE_ALIAS(DRIVER_NAME);
+
+static int __init generic_onenand_init(void)
+{
+        return driver_register(&generic_onenand_driver);
+}
+
+static void __exit generic_onenand_exit(void)
+{
+        driver_unregister(&generic_onenand_driver);
+}
+
+module_init(generic_onenand_init);
+module_exit(generic_onenand_exit);
+
+MODULE_LICENSE("GPL");
+MODULE_AUTHOR("Kyungmin Park <kyungmin.park@samsung.com>");
+MODULE_DESCRIPTION("Glue layer for OneNAND flash on generic boards");
diff --git a/drivers/mtd/onenand/onenand_base.c b/drivers/mtd/onenand/onenand_base.c
new file mode 100644
index 000000000000..cc38fa0d45c6
--- /dev/null
+++ b/drivers/mtd/onenand/onenand_base.c
@@ -0,0 +1,1588 @@
+/*
+ *  linux/drivers/mtd/onenand/onenand_base.c
+ *
+ *  Copyright (C) 2005 Samsung Electronics
+ *  Kyungmin Park <kyungmin.park@samsung.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+
+#include <linux/kernel.h>
+#include <linux/module.h>
+#include <linux/init.h>
+#include <linux/mtd/mtd.h>
+#include <linux/mtd/onenand.h>
+#include <linux/mtd/partitions.h>
+
+#include <asm/io.h>
+
+/**
+ * onenand_oob_64 - oob info for large (2KB) page
+ */
+static struct nand_oobinfo onenand_oob_64 = {
+        .useecc         = MTD_NANDECC_AUTOPLACE,
+        .eccbytes       = 20,
+        .eccpos         = {
+                8, 9, 10, 11, 12,
+                24, 25, 26, 27, 28,
+                40, 41, 42, 43, 44,
+                56, 57, 58, 59, 60,
+                },
+        .oobfree        = {
+                {2, 3}, {14, 2}, {18, 3}, {30, 2},
+                {24, 3}, {46, 2}, {40, 3}, {62, 2} }
+};
+
+/**
+ * onenand_oob_32 - oob info for middle (1KB) page
+ */
+static struct nand_oobinfo onenand_oob_32 = {
+        .useecc         = MTD_NANDECC_AUTOPLACE,
+        .eccbytes       = 10,
+        .eccpos         = {
+                8, 9, 10, 11, 12,
+                24, 25, 26, 27, 28,
+                },
+        .oobfree        = { {2, 3}, {14, 2}, {18, 3}, {30, 2} }
+};
+
+static const unsigned char ffchars[] = {
+        0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+        0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, /* 16 */
+        0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+        0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, /* 32 */
+        0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+        0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, /* 48 */
+        0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+        0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, /* 64 */
+};
+
+/**
+ * onenand_readw - [OneNAND Interface] Read OneNAND register
+ * @param addr          address to read
+ *
+ * Read OneNAND register
+ */
+static unsigned short onenand_readw(void __iomem *addr)
+{
+        return readw(addr);
+}
+
+/**
+ * onenand_writew - [OneNAND Interface] Write OneNAND register with value
+ * @param value         value to write
+ * @param addr          address to write
+ *
+ * Write OneNAND register with value
+ */
+static void onenand_writew(unsigned short value, void __iomem *addr)
+{
+        writew(value, addr);
+}
+
+/**
+ * onenand_block_address - [DEFAULT] Get block address
+ * @param this          onenand chip data structure
+ * @param block         the block
+ * @return              translated block address if DDP, otherwise same
+ *
+ * Setup Start Address 1 Register (F100h)
+ */
+static int onenand_block_address(struct onenand_chip *this, int block)
+{
+        if (this->device_id & ONENAND_DEVICE_IS_DDP) {
+                /* Device Flash Core select, NAND Flash Block Address */
+                int dfs = 0;
+
+                if (block & this->density_mask)
+                        dfs = 1;
+
+                return (dfs << ONENAND_DDP_SHIFT) |
+                        (block & (this->density_mask - 1));
+        }
+
+        return block;
+}
+
+/**
+ * onenand_bufferram_address - [DEFAULT] Get bufferram address
+ * @param this          onenand chip data structure
+ * @param block         the block
+ * @return              set DBS value if DDP, otherwise 0
+ *
+ * Setup Start Address 2 Register (F101h) for DDP
+ */
+static int onenand_bufferram_address(struct onenand_chip *this, int block)
+{
+        if (this->device_id & ONENAND_DEVICE_IS_DDP) {
+                /* Device BufferRAM Select */
+                int dbs = 0;
+
+                if (block & this->density_mask)
+                        dbs = 1;
+
+                return (dbs << ONENAND_DDP_SHIFT);
+        }
+
+        return 0;
+}
+
+/**
+ * onenand_page_address - [DEFAULT] Get page address
+ * @param page          the page address
+ * @param sector        the sector address
+ * @return              combined page and sector address
+ *
+ * Setup Start Address 8 Register (F107h)
+ */
+static int onenand_page_address(int page, int sector)
+{
+        /* Flash Page Address, Flash Sector Address */
+        int fpa, fsa;
+
+        fpa = page & ONENAND_FPA_MASK;
+        fsa = sector & ONENAND_FSA_MASK;
+
+        return ((fpa << ONENAND_FPA_SHIFT) | fsa);
+}
+
+/**
+ * onenand_buffer_address - [DEFAULT] Get buffer address
+ * @param dataram1      DataRAM index
+ * @param sectors       the sector address
+ * @param count         the number of sectors
+ * @return              the start buffer value
+ *
+ * Setup Start Buffer Register (F200h)
+ */
+static int onenand_buffer_address(int dataram1, int sectors, int count)
+{
+        int bsa, bsc;
+
+        /* BufferRAM Sector Address */
+        bsa = sectors & ONENAND_BSA_MASK;
+
+        if (dataram1)
+                bsa |= ONENAND_BSA_DATARAM1;    /* DataRAM1 */
+        else
+                bsa |= ONENAND_BSA_DATARAM0;    /* DataRAM0 */
+
+        /* BufferRAM Sector Count */
+        bsc = count & ONENAND_BSC_MASK;
+
+        return ((bsa << ONENAND_BSA_SHIFT) | bsc);
+}
+
+/**
+ * onenand_command - [DEFAULT] Send command to OneNAND device
+ * @param mtd           MTD device structure
+ * @param cmd           the command to be sent
+ * @param addr          offset to read from or write to
+ * @param len           number of bytes to read or write
+ *
+ * Send command to OneNAND device. This function is used for middle/large page
+ * devices (1KB/2KB Bytes per page)
+ */
+static int onenand_command(struct mtd_info *mtd, int cmd, loff_t addr, size_t len)
+{
+        struct onenand_chip *this = mtd->priv;
+        int value, readcmd = 0;
+        int block, page;
+        /* Now we use page size operation */
+        int sectors = 4, count = 4;
+
+        /* Address translation */
+        switch (cmd) {
+        case ONENAND_CMD_UNLOCK:
+        case ONENAND_CMD_LOCK:
+        case ONENAND_CMD_LOCK_TIGHT:
+                block = -1;
+                page = -1;
+                break;
+
+        case ONENAND_CMD_ERASE:
+        case ONENAND_CMD_BUFFERRAM:
+                block = (int) (addr >> this->erase_shift);
+                page = -1;
+                break;
+
+        default:
+                block = (int) (addr >> this->erase_shift);
+                page = (int) (addr >> this->page_shift);
+                page &= this->page_mask;
+                break;
+        }
+
+        /* NOTE: The setting order of the registers is very important! */
+        if (cmd == ONENAND_CMD_BUFFERRAM) {
+                /* Select DataRAM for DDP */
+                value = onenand_bufferram_address(this, block);
+                this->write_word(value, this->base + ONENAND_REG_START_ADDRESS2);
+
+                /* Switch to the next data buffer */
+                ONENAND_SET_NEXT_BUFFERRAM(this);
+
+                return 0;
+        }
+
+        if (block != -1) {
+                /* Write 'DFS, FBA' of Flash */
+                value = onenand_block_address(this, block);
+                this->write_word(value, this->base + ONENAND_REG_START_ADDRESS1);
+        }
+
+        if (page != -1) {
+                int dataram;
+
+                switch (cmd) {
+                case ONENAND_CMD_READ:
+                case ONENAND_CMD_READOOB:
+                        dataram = ONENAND_SET_NEXT_BUFFERRAM(this);
+                        readcmd = 1;
+                        break;
+
+                default:
+                        dataram = ONENAND_CURRENT_BUFFERRAM(this);
+                        break;
+                }
+
+                /* Write 'FPA, FSA' of Flash */
+                value = onenand_page_address(page, sectors);
+                this->write_word(value, this->base + ONENAND_REG_START_ADDRESS8);
+
+                /* Write 'BSA, BSC' of DataRAM */
+                value = onenand_buffer_address(dataram, sectors, count);
+                this->write_word(value, this->base + ONENAND_REG_START_BUFFER);
+
+                if (readcmd) {
+                        /* Select DataRAM for DDP */
+                        value = onenand_bufferram_address(this, block);
+                        this->write_word(value, this->base + ONENAND_REG_START_ADDRESS2);
+                }
+        }
+
+        /* Interrupt clear */
+        this->write_word(ONENAND_INT_CLEAR, this->base + ONENAND_REG_INTERRUPT);
+
+        /* Write command */
+        this->write_word(cmd, this->base + ONENAND_REG_COMMAND);
+
+        return 0;
+}
+
+/**
+ * onenand_wait - [DEFAULT] wait until the command is done
+ * @param mtd           MTD device structure
+ * @param state         state to select the max. timeout value
+ *
+ * Wait for command done. This applies to all OneNAND command
+ * Read can take up to 30us, erase up to 2ms and program up to 350us
+ * according to general OneNAND specs
+ */
+static int onenand_wait(struct mtd_info *mtd, int state)
+{
+        struct onenand_chip * this = mtd->priv;
+        unsigned long timeout;
+        unsigned int flags = ONENAND_INT_MASTER;
+        unsigned int interrupt = 0;
+        unsigned int ctrl, ecc;
+
+        /* The 20 msec is enough */
+        timeout = jiffies + msecs_to_jiffies(20);
+        while (time_before(jiffies, timeout)) {
+                interrupt = this->read_word(this->base + ONENAND_REG_INTERRUPT);
+
+                if (interrupt & flags)
+                        break;
+
+                if (state != FL_READING)
+                        cond_resched();
+        }
+        /* To get correct interrupt status in timeout case */
+        interrupt = this->read_word(this->base + ONENAND_REG_INTERRUPT);
+
+        ctrl = this->read_word(this->base + ONENAND_REG_CTRL_STATUS);
+
+        if (ctrl & ONENAND_CTRL_ERROR) {
+                /* It maybe occur at initial bad block */
+                DEBUG(MTD_DEBUG_LEVEL0, "onenand_wait: controller error = 0x%04x\n", ctrl);
+                /* Clear other interrupt bits for preventing ECC error */
+                interrupt &= ONENAND_INT_MASTER;
+        }
+
+        if (ctrl & ONENAND_CTRL_LOCK) {
+                DEBUG(MTD_DEBUG_LEVEL0, "onenand_wait: it's locked error = 0x%04x\n", ctrl);
+                return -EACCES;
+        }
+
+        if (interrupt & ONENAND_INT_READ) {
+                ecc = this->read_word(this->base + ONENAND_REG_ECC_STATUS);
+                if (ecc & ONENAND_ECC_2BIT_ALL) {
+                        DEBUG(MTD_DEBUG_LEVEL0, "onenand_wait: ECC error = 0x%04x\n", ecc);
+                        return -EBADMSG;
+                }
+        }
+
+        return 0;
+}
+
+/**
+ * onenand_bufferram_offset - [DEFAULT] BufferRAM offset
+ * @param mtd           MTD data structure
+ * @param area          BufferRAM area
+ * @return              offset given area
+ *
+ * Return BufferRAM offset given area
+ */
+static inline int onenand_bufferram_offset(struct mtd_info *mtd, int area)
+{
+        struct onenand_chip *this = mtd->priv;
+
+        if (ONENAND_CURRENT_BUFFERRAM(this)) {
+                if (area == ONENAND_DATARAM)
+                        return mtd->oobblock;
+                if (area == ONENAND_SPARERAM)
+                        return mtd->oobsize;
+        }
+
+        return 0;
+}
+
+/**
+ * onenand_read_bufferram - [OneNAND Interface] Read the bufferram area
+ * @param mtd           MTD data structure
+ * @param area          BufferRAM area
+ * @param buffer        the databuffer to put/get data
+ * @param offset        offset to read from or write to
+ * @param count         number of bytes to read/write
+ *
+ * Read the BufferRAM area
+ */
+static int onenand_read_bufferram(struct mtd_info *mtd, int area,
+                unsigned char *buffer, int offset, size_t count)
+{
+        struct onenand_chip *this = mtd->priv;
+        void __iomem *bufferram;
+
+        bufferram = this->base + area;
+
+        bufferram += onenand_bufferram_offset(mtd, area);
+
+        memcpy(buffer, bufferram + offset, count);
+
+        return 0;
+}
+
+/**
+ * onenand_sync_read_bufferram - [OneNAND Interface] Read the bufferram area with Sync. Burst mode
+ * @param mtd           MTD data structure
+ * @param area          BufferRAM area
+ * @param buffer        the databuffer to put/get data
+ * @param offset        offset to read from or write to
+ * @param count         number of bytes to read/write
+ *
+ * Read the BufferRAM area with Sync. Burst Mode
+ */
+static int onenand_sync_read_bufferram(struct mtd_info *mtd, int area,
+                unsigned char *buffer, int offset, size_t count)
+{
+        struct onenand_chip *this = mtd->priv;
+        void __iomem *bufferram;
+
+        bufferram = this->base + area;
+
+        bufferram += onenand_bufferram_offset(mtd, area);
+
+        this->mmcontrol(mtd, ONENAND_SYS_CFG1_SYNC_READ);
+
+        memcpy(buffer, bufferram + offset, count);
+
+        this->mmcontrol(mtd, 0);
+
+        return 0;
+}
+
+/**
+ * onenand_write_bufferram - [OneNAND Interface] Write the bufferram area
+ * @param mtd           MTD data structure
+ * @param area          BufferRAM area
+ * @param buffer        the databuffer to put/get data
+ * @param offset        offset to read from or write to
+ * @param count         number of bytes to read/write
+ *
+ * Write the BufferRAM area
+ */
+static int onenand_write_bufferram(struct mtd_info *mtd, int area,
+                const unsigned char *buffer, int offset, size_t count)
+{
+        struct onenand_chip *this = mtd->priv;
+        void __iomem *bufferram;
+
+        bufferram = this->base + area;
+
+        bufferram += onenand_bufferram_offset(mtd, area);
+
+        memcpy(bufferram + offset, buffer, count);
+
+        return 0;
+}
+
+/**
+ * onenand_check_bufferram - [GENERIC] Check BufferRAM information
+ * @param mtd           MTD data structure
+ * @param addr          address to check
+ * @return              1 if there are valid data, otherwise 0
+ *
+ * Check bufferram if there is data we required
+ */
+static int onenand_check_bufferram(struct mtd_info *mtd, loff_t addr)
+{
+        struct onenand_chip *this = mtd->priv;
+        int block, page;
+        int i;
+
+        block = (int) (addr >> this->erase_shift);
+        page = (int) (addr >> this->page_shift);
+        page &= this->page_mask;
+
+        i = ONENAND_CURRENT_BUFFERRAM(this);
+
+        /* Is there valid data? */
+        if (this->bufferram[i].block == block &&
+            this->bufferram[i].page == page &&
+            this->bufferram[i].valid)
+                return 1;
+
+        return 0;
+}
+
+/**
+ * onenand_update_bufferram - [GENERIC] Update BufferRAM information
+ * @param mtd           MTD data structure
+ * @param addr          address to update
+ * @param valid         valid flag
+ *
+ * Update BufferRAM information
+ */
+static int onenand_update_bufferram(struct mtd_info *mtd, loff_t addr,
+                int valid)
+{
+        struct onenand_chip *this = mtd->priv;
+        int block, page;
+        int i;
+
+        block = (int) (addr >> this->erase_shift);
+        page = (int) (addr >> this->page_shift);
+        page &= this->page_mask;
+
+        /* Invalidate BufferRAM */
+        for (i = 0; i < MAX_BUFFERRAM; i++) {
+                if (this->bufferram[i].block == block &&
+                    this->bufferram[i].page == page)
+                        this->bufferram[i].valid = 0;
+        }
+
+        /* Update BufferRAM */
+        i = ONENAND_CURRENT_BUFFERRAM(this);
+        this->bufferram[i].block = block;
+        this->bufferram[i].page = page;
+        this->bufferram[i].valid = valid;
+
+        return 0;
+}
+
+/**
+ * onenand_get_device - [GENERIC] Get chip for selected access
+ * @param mtd           MTD device structure
+ * @param new_state     the state which is requested
+ *
+ * Get the device and lock it for exclusive access
+ */
+static int onenand_get_device(struct mtd_info *mtd, int new_state)
+{
+        struct onenand_chip *this = mtd->priv;
+        DECLARE_WAITQUEUE(wait, current);
+
+        /*
+         * Grab the lock and see if the device is available
+         */
+        while (1) {
+                spin_lock(&this->chip_lock);
+                if (this->state == FL_READY) {
+                        this->state = new_state;
+                        spin_unlock(&this->chip_lock);
+                        break;
+                }
+                if (new_state == FL_PM_SUSPENDED) {
+                        spin_unlock(&this->chip_lock);
+                        return (this->state == FL_PM_SUSPENDED) ? 0 : -EAGAIN;
+                }
+                set_current_state(TASK_UNINTERRUPTIBLE);
+                add_wait_queue(&this->wq, &wait);
+                spin_unlock(&this->chip_lock);
+                schedule();
+                remove_wait_queue(&this->wq, &wait);
+        }
+
+        return 0;
+}
+
+/**
+ * onenand_release_device - [GENERIC] release chip
+ * @param mtd           MTD device structure
+ *
+ * Deselect, release chip lock and wake up anyone waiting on the device
+ */
+static void onenand_release_device(struct mtd_info *mtd)
+{
+        struct onenand_chip *this = mtd->priv;
+
+        /* Release the chip */
+        spin_lock(&this->chip_lock);
+        this->state = FL_READY;
+        wake_up(&this->wq);
+        spin_unlock(&this->chip_lock);
+}
+
+/**
+ * onenand_read_ecc - [MTD Interface] Read data with ECC
+ * @param mtd           MTD device structure
+ * @param from          offset to read from
+ * @param len           number of bytes to read
+ * @param retlen        pointer to variable to store the number of read bytes
+ * @param buf           the databuffer to put data
+ * @param oob_buf       filesystem supplied oob data buffer
+ * @param oobsel        oob selection structure
+ *
+ * OneNAND read with ECC
+ */
+static int onenand_read_ecc(struct mtd_info *mtd, loff_t from, size_t len,
+        size_t *retlen, u_char *buf,
+        u_char *oob_buf, struct nand_oobinfo *oobsel)
+{
+        struct onenand_chip *this = mtd->priv;
+        int read = 0, column;
+        int thislen;
+        int ret = 0;
+
+        DEBUG(MTD_DEBUG_LEVEL3, "onenand_read_ecc: from = 0x%08x, len = %i\n", (unsigned int) from, (int) len);
+
+        /* Do not allow reads past end of device */
+        if ((from + len) > mtd->size) {
+                DEBUG(MTD_DEBUG_LEVEL0, "onenand_read_ecc: Attempt read beyond end of device\n");
+                *retlen = 0;
+                return -EINVAL;
+        }
+
+        /* Grab the lock and see if the device is available */
+        onenand_get_device(mtd, FL_READING);
+
+        /* TODO handling oob */
+
+        while (read < len) {
+                thislen = min_t(int, mtd->oobblock, len - read);
+
+                column = from & (mtd->oobblock - 1);
+                if (column + thislen > mtd->oobblock)
+                        thislen = mtd->oobblock - column;
+
+                if (!onenand_check_bufferram(mtd, from)) {
+                        this->command(mtd, ONENAND_CMD_READ, from, mtd->oobblock);
+
+                        ret = this->wait(mtd, FL_READING);
+                        /* First copy data and check return value for ECC handling */
+                        onenand_update_bufferram(mtd, from, 1);
+                }
+
+                this->read_bufferram(mtd, ONENAND_DATARAM, buf, column, thislen);
+
+                read += thislen;
+
+                if (read == len)
+                        break;
+
+                if (ret) {
+                        DEBUG(MTD_DEBUG_LEVEL0, "onenand_read_ecc: read failed = %d\n", ret);
+                        goto out;
+                }
+
+                from += thislen;
+                buf += thislen;
+        }
+
+out:
+        /* Deselect and wake up anyone waiting on the device */
+        onenand_release_device(mtd);
+
+        /*
+         * Return success, if no ECC failures, else -EBADMSG
+         * fs driver will take care of that, because
+         * retlen == desired len and result == -EBADMSG
+         */
+        *retlen = read;
+        return ret;
+}
+
+/**
+ * onenand_read - [MTD Interface] MTD compability function for onenand_read_ecc
+ * @param mtd           MTD device structure
+ * @param from          offset to read from
+ * @param len           number of bytes to read
+ * @param retlen        pointer to variable to store the number of read bytes
+ * @param buf           the databuffer to put data
+ *
+ * This function simply calls onenand_read_ecc with oob buffer and oobsel = NULL
+*/
+static int onenand_read(struct mtd_info *mtd, loff_t from, size_t len,
+        size_t *retlen, u_char *buf)
+{
+        return onenand_read_ecc(mtd, from, len, retlen, buf, NULL, NULL);
+}
+
+/**
+ * onenand_read_oob - [MTD Interface] OneNAND read out-of-band
+ * @param mtd           MTD device structure
+ * @param from          offset to read from
+ * @param len           number of bytes to read
+ * @param retlen        pointer to variable to store the number of read bytes
+ * @param buf           the databuffer to put data
+ *
+ * OneNAND read out-of-band data from the spare area
+ */
+static int onenand_read_oob(struct mtd_info *mtd, loff_t from, size_t len,
+        size_t *retlen, u_char *buf)
+{
+        struct onenand_chip *this = mtd->priv;
+        int read = 0, thislen, column;
+        int ret = 0;
+
+        DEBUG(MTD_DEBUG_LEVEL3, "onenand_read_oob: from = 0x%08x, len = %i\n", (unsigned int) from, (int) len);
+
+        /* Initialize return length value */
+        *retlen = 0;
+
+        /* Do not allow reads past end of device */
+        if (unlikely((from + len) > mtd->size)) {
+                DEBUG(MTD_DEBUG_LEVEL0, "onenand_read_oob: Attempt read beyond end of device\n");
+                return -EINVAL;
+        }
+
+        /* Grab the lock and see if the device is available */
+        onenand_get_device(mtd, FL_READING);
+
+        column = from & (mtd->oobsize - 1);
+
+        while (read < len) {
+                thislen = mtd->oobsize - column;
+                thislen = min_t(int, thislen, len);
+
+                this->command(mtd, ONENAND_CMD_READOOB, from, mtd->oobsize);
+
+                onenand_update_bufferram(mtd, from, 0);
+
+                ret = this->wait(mtd, FL_READING);
+                /* First copy data and check return value for ECC handling */
+
+                this->read_bufferram(mtd, ONENAND_SPARERAM, buf, column, thislen);
+
+                read += thislen;
+
+                if (read == len)
+                        break;
+
+                if (ret) {
+                        DEBUG(MTD_DEBUG_LEVEL0, "onenand_read_oob: read failed = %d\n", ret);
+                        goto out;
+                }
+
+                buf += thislen;
+
+                /* Read more? */
+                if (read < len) {
+                        /* Page size */
+                        from += mtd->oobblock;
+                        column = 0;
+                }
+        }
+
+out:
+        /* Deselect and wake up anyone waiting on the device */
+        onenand_release_device(mtd);
+
+        *retlen = read;
+        return ret;
+}
+
+#ifdef CONFIG_MTD_ONENAND_VERIFY_WRITE
+/**
+ * onenand_verify_page - [GENERIC] verify the chip contents after a write
+ * @param mtd           MTD device structure
+ * @param buf           the databuffer to verify
+ *
+ * Check DataRAM area directly
+ */
+static int onenand_verify_page(struct mtd_info *mtd, u_char *buf, loff_t addr)
+{
+        struct onenand_chip *this = mtd->priv;
+        void __iomem *dataram0, *dataram1;
+        int ret = 0;
+
+        this->command(mtd, ONENAND_CMD_READ, addr, mtd->oobblock);
+
+        ret = this->wait(mtd, FL_READING);
+        if (ret)
+                return ret;
+
+        onenand_update_bufferram(mtd, addr, 1);
+
+        /* Check, if the two dataram areas are same */
+        dataram0 = this->base + ONENAND_DATARAM;
+        dataram1 = dataram0 + mtd->oobblock;
+
+        if (memcmp(dataram0, dataram1, mtd->oobblock))
+                return -EBADMSG;
+
+        return 0;
+}
+#else
+#define onenand_verify_page(...)        (0)
+#endif
+
+#define NOTALIGNED(x)   ((x & (mtd->oobblock - 1)) != 0)
+
+/**
+ * onenand_write_ecc - [MTD Interface] OneNAND write with ECC
+ * @param mtd           MTD device structure
+ * @param to            offset to write to
+ * @param len           number of bytes to write
+ * @param retlen        pointer to variable to store the number of written bytes
+ * @param buf           the data to write
+ * @param eccbuf        filesystem supplied oob data buffer
+ * @param oobsel        oob selection structure
+ *
+ * OneNAND write with ECC
+ */
+static int onenand_write_ecc(struct mtd_info *mtd, loff_t to, size_t len,
+        size_t *retlen, const u_char *buf,
+        u_char *eccbuf, struct nand_oobinfo *oobsel)
+{
+        struct onenand_chip *this = mtd->priv;
+        int written = 0;
+        int ret = 0;
+
+        DEBUG(MTD_DEBUG_LEVEL3, "onenand_write_ecc: to = 0x%08x, len = %i\n", (unsigned int) to, (int) len);
+
+        /* Initialize retlen, in case of early exit */
+        *retlen = 0;
+
+        /* Do not allow writes past end of device */
+        if (unlikely((to + len) > mtd->size)) {
+                DEBUG(MTD_DEBUG_LEVEL0, "onenand_write_ecc: Attempt write to past end of device\n");
+                return -EINVAL;
+        }
+
+        /* Reject writes, which are not page aligned */
+        if (unlikely(NOTALIGNED(to)) || unlikely(NOTALIGNED(len))) {
+                DEBUG(MTD_DEBUG_LEVEL0, "onenand_write_ecc: Attempt to write not page aligned data\n");
+                return -EINVAL;
+        }
+
+        /* Grab the lock and see if the device is available */
+        onenand_get_device(mtd, FL_WRITING);
+
+        /* Loop until all data write */
+        while (written < len) {
+                int thislen = min_t(int, mtd->oobblock, len - written);
+
+                this->command(mtd, ONENAND_CMD_BUFFERRAM, to, mtd->oobblock);
+
+                this->write_bufferram(mtd, ONENAND_DATARAM, buf, 0, thislen);
+                this->write_bufferram(mtd, ONENAND_SPARERAM, ffchars, 0, mtd->oobsize);
+
+                this->command(mtd, ONENAND_CMD_PROG, to, mtd->oobblock);
+
+                onenand_update_bufferram(mtd, to, 1);
+
+                ret = this->wait(mtd, FL_WRITING);
+                if (ret) {
+                        DEBUG(MTD_DEBUG_LEVEL0, "onenand_write_ecc: write filaed %d\n", ret);
+                        goto out;
+                }
+
+                written += thislen;
+
+                /* Only check verify write turn on */
+                ret = onenand_verify_page(mtd, (u_char *) buf, to);
+                if (ret) {
+                        DEBUG(MTD_DEBUG_LEVEL0, "onenand_write_ecc: verify failed %d\n", ret);
+                        goto out;
+                }
+
+                if (written == len)
+                        break;
+
+                to += thislen;
+                buf += thislen;
+        }
+
+out:
+        /* Deselect and wake up anyone waiting on the device */
+        onenand_release_device(mtd);
+
+        *retlen = written;
+
+        return ret;
+}
+
+/**
+ * onenand_write - [MTD Interface] compability function for onenand_write_ecc
+ * @param mtd           MTD device structure
+ * @param to            offset to write to
+ * @param len           number of bytes to write
+ * @param retlen        pointer to variable to store the number of written bytes
+ * @param buf           the data to write
+ *
+ * This function simply calls onenand_write_ecc
+ * with oob buffer and oobsel = NULL
+ */
+static int onenand_write(struct mtd_info *mtd, loff_t to, size_t len,
+        size_t *retlen, const u_char *buf)
+{
+        return onenand_write_ecc(mtd, to, len, retlen, buf, NULL, NULL);
+}
+
+/**
+ * onenand_write_oob - [MTD Interface] OneNAND write out-of-band
+ * @param mtd           MTD device structure
+ * @param to            offset to write to
+ * @param len           number of bytes to write
+ * @param retlen        pointer to variable to store the number of written bytes
+ * @param buf           the data to write
+ *
+ * OneNAND write out-of-band
+ */
+static int onenand_write_oob(struct mtd_info *mtd, loff_t to, size_t len,
+        size_t *retlen, const u_char *buf)
+{
+        struct onenand_chip *this = mtd->priv;
+        int column, status;
+        int written = 0;
+
+        DEBUG(MTD_DEBUG_LEVEL3, "onenand_write_oob: to = 0x%08x, len = %i\n", (unsigned int) to, (int) len);
+
+        /* Initialize retlen, in case of early exit */
+        *retlen = 0;
+
+        /* Do not allow writes past end of device */
+        if (unlikely((to + len) > mtd->size)) {
+                DEBUG(MTD_DEBUG_LEVEL0, "onenand_write_oob: Attempt write to past end of device\n");
+                return -EINVAL;
+        }
+
+        /* Grab the lock and see if the device is available */
+        onenand_get_device(mtd, FL_WRITING);
+
+        /* Loop until all data write */
+        while (written < len) {
+                int thislen = min_t(int, mtd->oobsize, len - written);
+
+                column = to & (mtd->oobsize - 1);
+
+                this->command(mtd, ONENAND_CMD_BUFFERRAM, to, mtd->oobsize);
+
+                this->write_bufferram(mtd, ONENAND_SPARERAM, ffchars, 0, mtd->oobsize);
+                this->write_bufferram(mtd, ONENAND_SPARERAM, buf, column, thislen);
+
+                this->command(mtd, ONENAND_CMD_PROGOOB, to, mtd->oobsize);
+
+                onenand_update_bufferram(mtd, to, 0);
+
+                status = this->wait(mtd, FL_WRITING);
+                if (status)
+                        goto out;
+
+                written += thislen;
+
+                if (written == len)
+                        break;
+
+                to += thislen;
+                buf += thislen;
+        }
+
+out:
+        /* Deselect and wake up anyone waiting on the device */
+        onenand_release_device(mtd);
+
+        *retlen = written;
+
+        return 0;
+}
+
+/**
+ * onenand_writev_ecc - [MTD Interface] write with iovec with ecc
+ * @param mtd           MTD device structure
+ * @param vecs          the iovectors to write
+ * @param count         number of vectors
+ * @param to            offset to write to
+ * @param retlen        pointer to variable to store the number of written bytes
+ * @param eccbuf        filesystem supplied oob data buffer
+ * @param oobsel        oob selection structure
+ *
+ * OneNAND write with iovec with ecc
+ */
+static int onenand_writev_ecc(struct mtd_info *mtd, const struct kvec *vecs,
+        unsigned long count, loff_t to, size_t *retlen,
+        u_char *eccbuf, struct nand_oobinfo *oobsel)
+{
+        struct onenand_chip *this = mtd->priv;
+        unsigned char buffer[MAX_ONENAND_PAGESIZE], *pbuf;
+        size_t total_len, len;
+        int i, written = 0;
+        int ret = 0;
+
+        /* Preset written len for early exit */
+        *retlen = 0;
+
+        /* Calculate total length of data */
+        total_len = 0;
+        for (i = 0; i < count; i++)
+                total_len += vecs[i].iov_len;
+
+        DEBUG(MTD_DEBUG_LEVEL3, "onenand_writev_ecc: to = 0x%08x, len = %i, count = %ld\n", (unsigned int) to, (unsigned int) total_len, count);
+
+        /* Do not allow write past end of the device */
+        if (unlikely((to + total_len) > mtd->size)) {
+                DEBUG(MTD_DEBUG_LEVEL0, "onenand_writev_ecc: Attempted write past end of device\n");
+                return -EINVAL;
+        }
+
+        /* Reject writes, which are not page aligned */
+        if (unlikely(NOTALIGNED(to)) || unlikely(NOTALIGNED(total_len))) {
+                DEBUG(MTD_DEBUG_LEVEL0, "onenand_writev_ecc: Attempt to write not page aligned data\n");
+                return -EINVAL;
+        }
+
+        /* Grab the lock and see if the device is available */
+        onenand_get_device(mtd, FL_WRITING);
+
+        /* TODO handling oob */
+
+        /* Loop until all keve's data has been written */
+        len = 0;
+        while (count) {
+                pbuf = buffer;
+                /*
+                 * If the given tuple is >= pagesize then
+                 * write it out from the iov
+                 */
+                if ((vecs->iov_len - len) >= mtd->oobblock) {
+                        pbuf = vecs->iov_base + len;
+
+                        len += mtd->oobblock;
+
+                        /* Check, if we have to switch to the next tuple */
+                        if (len >= (int) vecs->iov_len) {
+                                vecs++;
+                                len = 0;
+                                count--;
+                        }
+                } else {
+                        int cnt = 0, thislen;
+                        while (cnt < mtd->oobblock) {
+                                thislen = min_t(int, mtd->oobblock - cnt, vecs->iov_len - len);
+                                memcpy(buffer + cnt, vecs->iov_base + len, thislen);
+                                cnt += thislen;
+                                len += thislen;
+
+                                /* Check, if we have to switch to the next tuple */
+                                if (len >= (int) vecs->iov_len) {
+                                        vecs++;
+                                        len = 0;
+                                        count--;
+                                }
+                        }
+                }
+
+                this->command(mtd, ONENAND_CMD_BUFFERRAM, to, mtd->oobblock);
+
+                this->write_bufferram(mtd, ONENAND_DATARAM, pbuf, 0, mtd->oobblock);
+                this->write_bufferram(mtd, ONENAND_SPARERAM, ffchars, 0, mtd->oobsize);
+
+                this->command(mtd, ONENAND_CMD_PROG, to, mtd->oobblock);
+
+                onenand_update_bufferram(mtd, to, 1);
+
+                ret = this->wait(mtd, FL_WRITING);
+                if (ret) {
+                        DEBUG(MTD_DEBUG_LEVEL0, "onenand_writev_ecc: write failed %d\n", ret);
+                        goto out;
+                }
+
+
+                /* Only check verify write turn on */
+                ret = onenand_verify_page(mtd, (u_char *) pbuf, to);
+                if (ret) {
+                        DEBUG(MTD_DEBUG_LEVEL0, "onenand_writev_ecc: verify failed %d\n", ret);
+                        goto out;
+                }
+
+                written += mtd->oobblock;
+
+                to += mtd->oobblock;
+        }
+
+out:
+        /* Deselect and wakt up anyone waiting on the device */
+        onenand_release_device(mtd);
+
+        *retlen = written;
+
+        return 0;
+}
+
+/**
+ * onenand_writev - [MTD Interface] compabilty function for onenand_writev_ecc
+ * @param mtd           MTD device structure
+ * @param vecs          the iovectors to write
+ * @param count         number of vectors
+ * @param to            offset to write to
+ * @param retlen        pointer to variable to store the number of written bytes
+ *
+ * OneNAND write with kvec. This just calls the ecc function
+ */
+static int onenand_writev(struct mtd_info *mtd, const struct kvec *vecs,
+        unsigned long count, loff_t to, size_t *retlen)
+{
+        return onenand_writev_ecc(mtd, vecs, count, to, retlen, NULL, NULL);
+}
+
+/**
+ * onenand_block_checkbad - [GENERIC] Check if a block is marked bad
+ * @param mtd           MTD device structure
+ * @param ofs           offset from device start
+ * @param getchip       0, if the chip is already selected
+ * @param allowbbt      1, if its allowed to access the bbt area
+ *
+ * Check, if the block is bad. Either by reading the bad block table or
+ * calling of the scan function.
+ */
+static int onenand_block_checkbad(struct mtd_info *mtd, loff_t ofs, int getchip, int allowbbt)
+{
+        struct onenand_chip *this = mtd->priv;
+        struct bbm_info *bbm = this->bbm;
+
+        /* Return info from the table */
+        return bbm->isbad_bbt(mtd, ofs, allowbbt);
+}
+
+/**
+ * onenand_erase - [MTD Interface] erase block(s)
+ * @param mtd           MTD device structure
+ * @param instr         erase instruction
+ *
+ * Erase one ore more blocks
+ */
+static int onenand_erase(struct mtd_info *mtd, struct erase_info *instr)
+{
+        struct onenand_chip *this = mtd->priv;
+        unsigned int block_size;
+        loff_t addr;
+        int len;
+        int ret = 0;
+
+        DEBUG(MTD_DEBUG_LEVEL3, "onenand_erase: start = 0x%08x, len = %i\n", (unsigned int) instr->addr, (unsigned int) instr->len);
+
+        block_size = (1 << this->erase_shift);
+
+        /* Start address must align on block boundary */
+        if (unlikely(instr->addr & (block_size - 1))) {
+                DEBUG(MTD_DEBUG_LEVEL0, "onenand_erase: Unaligned address\n");
+                return -EINVAL;
+        }
+
+        /* Length must align on block boundary */
+        if (unlikely(instr->len & (block_size - 1))) {
+                DEBUG(MTD_DEBUG_LEVEL0, "onenand_erase: Length not block aligned\n");
+                return -EINVAL;
+        }
+
+        /* Do not allow erase past end of device */
+        if (unlikely((instr->len + instr->addr) > mtd->size)) {
+                DEBUG(MTD_DEBUG_LEVEL0, "onenand_erase: Erase past end of device\n");
+                return -EINVAL;
+        }
+
+        instr->fail_addr = 0xffffffff;
+
+        /* Grab the lock and see if the device is available */
+        onenand_get_device(mtd, FL_ERASING);
+
+        /* Loop throught the pages */
+        len = instr->len;
+        addr = instr->addr;
+
+        instr->state = MTD_ERASING;
+
+        while (len) {
+
+                /* Check if we have a bad block, we do not erase bad blocks */
+                if (onenand_block_checkbad(mtd, addr, 0, 0)) {
+                        printk (KERN_WARNING "onenand_erase: attempt to erase a bad block at addr 0x%08x\n", (unsigned int) addr);
+                        instr->state = MTD_ERASE_FAILED;
+                        goto erase_exit;
+                }
+
+                this->command(mtd, ONENAND_CMD_ERASE, addr, block_size);
+
+                ret = this->wait(mtd, FL_ERASING);
+                /* Check, if it is write protected */
+                if (ret) {
+                        if (ret == -EPERM)
+                                DEBUG(MTD_DEBUG_LEVEL0, "onenand_erase: Device is write protected!!!\n");
+                        else
+                                DEBUG(MTD_DEBUG_LEVEL0, "onenand_erase: Failed erase, block %d\n", (unsigned) (addr >> this->erase_shift));
+                        instr->state = MTD_ERASE_FAILED;
+                        instr->fail_addr = addr;
+                        goto erase_exit;
+                }
+
+                len -= block_size;
+                addr += block_size;
+        }
+
+        instr->state = MTD_ERASE_DONE;
+
+erase_exit:
+
+        ret = instr->state == MTD_ERASE_DONE ? 0 : -EIO;
+        /* Do call back function */
+        if (!ret)
+                mtd_erase_callback(instr);
+
+        /* Deselect and wake up anyone waiting on the device */
+        onenand_release_device(mtd);
+
+        return ret;
+}
+
+/**
+ * onenand_sync - [MTD Interface] sync
+ * @param mtd           MTD device structure
+ *
+ * Sync is actually a wait for chip ready function
+ */
+static void onenand_sync(struct mtd_info *mtd)
+{
+        DEBUG(MTD_DEBUG_LEVEL3, "onenand_sync: called\n");
+
+        /* Grab the lock and see if the device is available */
+        onenand_get_device(mtd, FL_SYNCING);
+
+        /* Release it and go back */
+        onenand_release_device(mtd);
+}
+
+
+/**
+ * onenand_block_isbad - [MTD Interface] Check whether the block at the given offset is bad
+ * @param mtd           MTD device structure
+ * @param ofs           offset relative to mtd start
+ *
+ * Check whether the block is bad
+ */
+static int onenand_block_isbad(struct mtd_info *mtd, loff_t ofs)
+{
+        /* Check for invalid offset */
+        if (ofs > mtd->size)
+                return -EINVAL;
+
+        return onenand_block_checkbad(mtd, ofs, 1, 0);
+}
+
+/**
+ * onenand_default_block_markbad - [DEFAULT] mark a block bad
+ * @param mtd           MTD device structure
+ * @param ofs           offset from device start
+ *
+ * This is the default implementation, which can be overridden by
+ * a hardware specific driver.
+ */
+static int onenand_default_block_markbad(struct mtd_info *mtd, loff_t ofs)
+{
+        struct onenand_chip *this = mtd->priv;
+        struct bbm_info *bbm = this->bbm;
+        u_char buf[2] = {0, 0};
+        size_t retlen;
+        int block;
+
+        /* Get block number */
+        block = ((int) ofs) >> bbm->bbt_erase_shift;
+        if (bbm->bbt)
+                bbm->bbt[block >> 2] |= 0x01 << ((block & 0x03) << 1);
+
+        /* We write two bytes, so we dont have to mess with 16 bit access */
+        ofs += mtd->oobsize + (bbm->badblockpos & ~0x01);
+        return mtd->write_oob(mtd, ofs , 2, &retlen, buf);
+}
+
+/**
+ * onenand_block_markbad - [MTD Interface] Mark the block at the given offset as bad
+ * @param mtd           MTD device structure
+ * @param ofs           offset relative to mtd start
+ *
+ * Mark the block as bad
+ */
+static int onenand_block_markbad(struct mtd_info *mtd, loff_t ofs)
+{
+        struct onenand_chip *this = mtd->priv;
+        int ret;
+
+        ret = onenand_block_isbad(mtd, ofs);
+        if (ret) {
+                /* If it was bad already, return success and do nothing */
+                if (ret > 0)
+                        return 0;
+                return ret;
+        }
+
+        return this->block_markbad(mtd, ofs);
+}
+
+/**
+ * onenand_unlock - [MTD Interface] Unlock block(s)
+ * @param mtd           MTD device structure
+ * @param ofs           offset relative to mtd start
+ * @param len           number of bytes to unlock
+ *
+ * Unlock one or more blocks
+ */
+static int onenand_unlock(struct mtd_info *mtd, loff_t ofs, size_t len)
+{
+        struct onenand_chip *this = mtd->priv;
+        int start, end, block, value, status;
+
+        start = ofs >> this->erase_shift;
+        end = len >> this->erase_shift;
+
+        /* Continuous lock scheme */
+        if (this->options & ONENAND_CONT_LOCK) {
+                /* Set start block address */
+                this->write_word(start, this->base + ONENAND_REG_START_BLOCK_ADDRESS);
+                /* Set end block address */
+                this->write_word(end - 1, this->base + ONENAND_REG_END_BLOCK_ADDRESS);
+                /* Write unlock command */
+                this->command(mtd, ONENAND_CMD_UNLOCK, 0, 0);
+
+                /* There's no return value */
+                this->wait(mtd, FL_UNLOCKING);
+
+                /* Sanity check */
+                while (this->read_word(this->base + ONENAND_REG_CTRL_STATUS)
+                    & ONENAND_CTRL_ONGO)
+                        continue;
+
+                /* Check lock status */
+                status = this->read_word(this->base + ONENAND_REG_WP_STATUS);
+                if (!(status & ONENAND_WP_US))
+                        printk(KERN_ERR "wp status = 0x%x\n", status);
+
+                return 0;
+        }
+
+        /* Block lock scheme */
+        for (block = start; block < end; block++) {
+                /* Set start block address */
+                this->write_word(block, this->base + ONENAND_REG_START_BLOCK_ADDRESS);
+                /* Write unlock command */
+                this->command(mtd, ONENAND_CMD_UNLOCK, 0, 0);
+
+                /* There's no return value */
+                this->wait(mtd, FL_UNLOCKING);
+
+                /* Sanity check */
+                while (this->read_word(this->base + ONENAND_REG_CTRL_STATUS)
+                    & ONENAND_CTRL_ONGO)
+                        continue;
+
+                /* Set block address for read block status */
+                value = onenand_block_address(this, block);
+                this->write_word(value, this->base + ONENAND_REG_START_ADDRESS1);
+
+                /* Check lock status */
+                status = this->read_word(this->base + ONENAND_REG_WP_STATUS);
+                if (!(status & ONENAND_WP_US))
+                        printk(KERN_ERR "block = %d, wp status = 0x%x\n", block, status);
+        }
+
+        return 0;
+}
+
+/**
+ * onenand_print_device_info - Print device ID
+ * @param device        device ID
+ *
+ * Print device ID
+ */
+static void onenand_print_device_info(int device)
+{
+        int vcc, demuxed, ddp, density;
+
+        vcc = device & ONENAND_DEVICE_VCC_MASK;
+        demuxed = device & ONENAND_DEVICE_IS_DEMUX;
+        ddp = device & ONENAND_DEVICE_IS_DDP;
+        density = device >> ONENAND_DEVICE_DENSITY_SHIFT;
+        printk(KERN_INFO "%sOneNAND%s %dMB %sV 16-bit (0x%02x)\n",
+                demuxed ? "" : "Muxed ",
+                ddp ? "(DDP)" : "",
+                (16 << density),
+                vcc ? "2.65/3.3" : "1.8",
+                device);
+}
+
+static const struct onenand_manufacturers onenand_manuf_ids[] = {
+        {ONENAND_MFR_SAMSUNG, "Samsung"},
+        {ONENAND_MFR_UNKNOWN, "Unknown"}
+};
+
+/**
+ * onenand_check_maf - Check manufacturer ID
+ * @param manuf         manufacturer ID
+ *
+ * Check manufacturer ID
+ */
+static int onenand_check_maf(int manuf)
+{
+        int i;
+
+        for (i = 0; onenand_manuf_ids[i].id; i++) {
+                if (manuf == onenand_manuf_ids[i].id)
+                        break;
+        }
+
+        printk(KERN_DEBUG "OneNAND Manufacturer: %s (0x%0x)\n",
+                onenand_manuf_ids[i].name, manuf);
+
+        return (i != ONENAND_MFR_UNKNOWN);
+}
+
+/**
+ * onenand_probe - [OneNAND Interface] Probe the OneNAND device
+ * @param mtd           MTD device structure
+ *
+ * OneNAND detection method:
+ *   Compare the the values from command with ones from register
+ */
+static int onenand_probe(struct mtd_info *mtd)
+{
+        struct onenand_chip *this = mtd->priv;
+        int bram_maf_id, bram_dev_id, maf_id, dev_id;
+        int version_id;
+        int density;
+
+        /* Send the command for reading device ID from BootRAM */
+        this->write_word(ONENAND_CMD_READID, this->base + ONENAND_BOOTRAM);
+
+        /* Read manufacturer and device IDs from BootRAM */
+        bram_maf_id = this->read_word(this->base + ONENAND_BOOTRAM + 0x0);
+        bram_dev_id = this->read_word(this->base + ONENAND_BOOTRAM + 0x2);
+
+        /* Check manufacturer ID */
+        if (onenand_check_maf(bram_maf_id))
+                return -ENXIO;
+
+        /* Reset OneNAND to read default register values */
+        this->write_word(ONENAND_CMD_RESET, this->base + ONENAND_BOOTRAM);
+
+        /* Read manufacturer and device IDs from Register */
+        maf_id = this->read_word(this->base + ONENAND_REG_MANUFACTURER_ID);
+        dev_id = this->read_word(this->base + ONENAND_REG_DEVICE_ID);
+
+        /* Check OneNAND device */
+        if (maf_id != bram_maf_id || dev_id != bram_dev_id)
+                return -ENXIO;
+
+        /* Flash device information */
+        onenand_print_device_info(dev_id);
+        this->device_id = dev_id;
+
+        density = dev_id >> ONENAND_DEVICE_DENSITY_SHIFT;
+        this->chipsize = (16 << density) << 20;
+        /* Set density mask. it is used for DDP */
+        this->density_mask = (1 << (density + 6));
+
+        /* OneNAND page size & block size */
+        /* The data buffer size is equal to page size */
+        mtd->oobblock = this->read_word(this->base + ONENAND_REG_DATA_BUFFER_SIZE);
+        mtd->oobsize = mtd->oobblock >> 5;
+        /* Pagers per block is always 64 in OneNAND */
+        mtd->erasesize = mtd->oobblock << 6;
+
+        this->erase_shift = ffs(mtd->erasesize) - 1;
+        this->page_shift = ffs(mtd->oobblock) - 1;
+        this->ppb_shift = (this->erase_shift - this->page_shift);
+        this->page_mask = (mtd->erasesize / mtd->oobblock) - 1;
+
+        /* REVIST: Multichip handling */
+
+        mtd->size = this->chipsize;
+
+        /* Version ID */
+        version_id = this->read_word(this->base + ONENAND_REG_VERSION_ID);
+        printk(KERN_DEBUG "OneNAND version = 0x%04x\n", version_id);
+
+        /* Lock scheme */
+        if (density <= ONENAND_DEVICE_DENSITY_512Mb &&
+            !(version_id >> ONENAND_VERSION_PROCESS_SHIFT)) {
+                printk(KERN_INFO "Lock scheme is Continues Lock\n");
+                this->options |= ONENAND_CONT_LOCK;
+        }
+
+        return 0;
+}
+
+/**
+ * onenand_suspend - [MTD Interface] Suspend the OneNAND flash
+ * @param mtd           MTD device structure
+ */
+static int onenand_suspend(struct mtd_info *mtd)
+{
+        return onenand_get_device(mtd, FL_PM_SUSPENDED);
+}
+
+/**
+ * onenand_resume - [MTD Interface] Resume the OneNAND flash
+ * @param mtd           MTD device structure
+ */
+static void onenand_resume(struct mtd_info *mtd)
+{
+        struct onenand_chip *this = mtd->priv;
+
+        if (this->state == FL_PM_SUSPENDED)
+                onenand_release_device(mtd);
+        else
+                printk(KERN_ERR "resume() called for the chip which is not"
+                                "in suspended state\n");
+}
+
+
+/**
+ * onenand_scan - [OneNAND Interface] Scan for the OneNAND device
+ * @param mtd           MTD device structure
+ * @param maxchips      Number of chips to scan for
+ *
+ * This fills out all the not initialized function pointers
+ * with the defaults.
+ * The flash ID is read and the mtd/chip structures are
+ * filled with the appropriate values.
+ */
+int onenand_scan(struct mtd_info *mtd, int maxchips)
+{
+        struct onenand_chip *this = mtd->priv;
+
+        if (!this->read_word)
+                this->read_word = onenand_readw;
+        if (!this->write_word)
+                this->write_word = onenand_writew;
+
+        if (!this->command)
+                this->command = onenand_command;
+        if (!this->wait)
+                this->wait = onenand_wait;
+
+        if (!this->read_bufferram)
+                this->read_bufferram = onenand_read_bufferram;
+        if (!this->write_bufferram)
+                this->write_bufferram = onenand_write_bufferram;
+
+        if (!this->block_markbad)
+                this->block_markbad = onenand_default_block_markbad;
+        if (!this->scan_bbt)
+                this->scan_bbt = onenand_default_bbt;
+
+        if (onenand_probe(mtd))
+                return -ENXIO;
+
+        /* Set Sync. Burst Read after probing */
+        if (this->mmcontrol) {
+                printk(KERN_INFO "OneNAND Sync. Burst Read support\n");
+                this->read_bufferram = onenand_sync_read_bufferram;
+        }
+
+        this->state = FL_READY;
+        init_waitqueue_head(&this->wq);
+        spin_lock_init(&this->chip_lock);
+
+        switch (mtd->oobsize) {
+        case 64:
+                this->autooob = &onenand_oob_64;
+                break;
+
+        case 32:
+                this->autooob = &onenand_oob_32;
+                break;
+
+        default:
+                printk(KERN_WARNING "No OOB scheme defined for oobsize %d\n",
+                        mtd->oobsize);
+                /* To prevent kernel oops */
+                this->autooob = &onenand_oob_32;
+                break;
+        }
+
+        memcpy(&mtd->oobinfo, this->autooob, sizeof(mtd->oobinfo));
+
+        /* Fill in remaining MTD driver data */
+        mtd->type = MTD_NANDFLASH;
+        mtd->flags = MTD_CAP_NANDFLASH | MTD_ECC;
+        mtd->ecctype = MTD_ECC_SW;
+        mtd->erase = onenand_erase;
+        mtd->point = NULL;
+        mtd->unpoint = NULL;
+        mtd->read = onenand_read;
+        mtd->write = onenand_write;
+        mtd->read_ecc = onenand_read_ecc;
+        mtd->write_ecc = onenand_write_ecc;
+        mtd->read_oob = onenand_read_oob;
+        mtd->write_oob = onenand_write_oob;
+        mtd->readv = NULL;
+        mtd->readv_ecc = NULL;
+        mtd->writev = onenand_writev;
+        mtd->writev_ecc = onenand_writev_ecc;
+        mtd->sync = onenand_sync;
+        mtd->lock = NULL;
+        mtd->unlock = onenand_unlock;
+        mtd->suspend = onenand_suspend;
+        mtd->resume = onenand_resume;
+        mtd->block_isbad = onenand_block_isbad;
+        mtd->block_markbad = onenand_block_markbad;
+        mtd->owner = THIS_MODULE;
+
+        /* Unlock whole block */
+        mtd->unlock(mtd, 0x0, this->chipsize);
+
+        return this->scan_bbt(mtd);
+}
+
+/**
+ * onenand_release - [OneNAND Interface] Free resources held by the OneNAND device
+ * @param mtd           MTD device structure
+ */
+void onenand_release(struct mtd_info *mtd)
+{
+#ifdef CONFIG_MTD_PARTITIONS
+        /* Deregister partitions */
+        del_mtd_partitions (mtd);
+#endif
+        /* Deregister the device */
+        del_mtd_device (mtd);
+}
+
+EXPORT_SYMBOL_GPL(onenand_scan);
+EXPORT_SYMBOL_GPL(onenand_release);
+
+MODULE_LICENSE("GPL");
+MODULE_AUTHOR("Kyungmin Park <kyungmin.park@samsung.com>");
+MODULE_DESCRIPTION("Generic OneNAND flash driver code");
diff --git a/drivers/mtd/onenand/onenand_bbt.c b/drivers/mtd/onenand/onenand_bbt.c
new file mode 100644
index 000000000000..f40190f499e1
--- /dev/null
+++ b/drivers/mtd/onenand/onenand_bbt.c
@@ -0,0 +1,246 @@
+/*
+ *  linux/drivers/mtd/onenand/onenand_bbt.c
+ *
+ *  Bad Block Table support for the OneNAND driver
+ *
+ *  Copyright(c) 2005 Samsung Electronics
+ *  Kyungmin Park <kyungmin.park@samsung.com>
+ *
+ *  Derived from nand_bbt.c
+ *
+ *  TODO:
+ *    Split BBT core and chip specific BBT.
+ */
+
+#include <linux/slab.h>
+#include <linux/mtd/mtd.h>
+#include <linux/mtd/onenand.h>
+#include <linux/mtd/compatmac.h>
+
+/**
+ * check_short_pattern - [GENERIC] check if a pattern is in the buffer
+ * @param buf           the buffer to search
+ * @param len           the length of buffer to search
+ * @param paglen        the pagelength
+ * @param td            search pattern descriptor
+ *
+ * Check for a pattern at the given place. Used to search bad block
+ * tables and good / bad block identifiers. Same as check_pattern, but
+ * no optional empty check and the pattern is expected to start
+ * at offset 0.
+ *
+ */
+static int check_short_pattern(uint8_t *buf, int len, int paglen, struct nand_bbt_descr *td)
+{
+        int i;
+        uint8_t *p = buf;
+
+        /* Compare the pattern */
+        for (i = 0; i < td->len; i++) {
+                if (p[i] != td->pattern[i])
+                        return -1;
+        }
+        return 0;
+}
+
+/**
+ * create_bbt - [GENERIC] Create a bad block table by scanning the device
+ * @param mtd           MTD device structure
+ * @param buf           temporary buffer
+ * @param bd            descriptor for the good/bad block search pattern
+ * @param chip          create the table for a specific chip, -1 read all chips.
+ *              Applies only if NAND_BBT_PERCHIP option is set
+ *
+ * Create a bad block table by scanning the device
+ * for the given good/bad block identify pattern
+ */
+static int create_bbt(struct mtd_info *mtd, uint8_t *buf, struct nand_bbt_descr *bd, int chip)
+{
+        struct onenand_chip *this = mtd->priv;
+        struct bbm_info *bbm = this->bbm;
+        int i, j, numblocks, len, scanlen;
+        int startblock;
+        loff_t from;
+        size_t readlen, ooblen;
+
+        printk(KERN_INFO "Scanning device for bad blocks\n");
+
+        len = 1;
+
+        /* We need only read few bytes from the OOB area */
+        scanlen = ooblen = 0;
+        readlen = bd->len;
+
+        /* chip == -1 case only */
+        /* Note that numblocks is 2 * (real numblocks) here;
+         * see i += 2 below as it makses shifting and masking less painful
+         */
+        numblocks = mtd->size >> (bbm->bbt_erase_shift - 1);
+        startblock = 0;
+        from = 0;
+
+        for (i = startblock; i < numblocks; ) {
+                int ret;
+
+                for (j = 0; j < len; j++) {
+                        size_t retlen;
+
+                        /* No need to read pages fully,
+                         * just read required OOB bytes */
+                        ret = mtd->read_oob(mtd, from + j * mtd->oobblock + bd->offs,
+                                                readlen, &retlen, &buf[0]);
+
+                        if (ret)
+                                return ret;
+
+                        if (check_short_pattern(&buf[j * scanlen], scanlen, mtd->oobblock, bd)) {
+                                bbm->bbt[i >> 3] |= 0x03 << (i & 0x6);
+                                printk(KERN_WARNING "Bad eraseblock %d at 0x%08x\n",
+                                        i >> 1, (unsigned int) from);
+                                break;
+                        }
+                }
+                i += 2;
+                from += (1 << bbm->bbt_erase_shift);
+        }
+
+        return 0;
+}
+
+
+/**
+ * onenand_memory_bbt - [GENERIC] create a memory based bad block table
+ * @param mtd           MTD device structure
+ * @param bd            descriptor for the good/bad block search pattern
+ *
+ * The function creates a memory based bbt by scanning the device
+ * for manufacturer / software marked good / bad blocks
+ */
+static inline int onenand_memory_bbt (struct mtd_info *mtd, struct nand_bbt_descr *bd)
+{
+        unsigned char data_buf[MAX_ONENAND_PAGESIZE];
+
+        bd->options &= ~NAND_BBT_SCANEMPTY;
+        return create_bbt(mtd, data_buf, bd, -1);
+}
+
+/**
+ * onenand_isbad_bbt - [OneNAND Interface] Check if a block is bad
+ * @param mtd           MTD device structure
+ * @param offs          offset in the device
+ * @param allowbbt      allow access to bad block table region
+ */
+static int onenand_isbad_bbt(struct mtd_info *mtd, loff_t offs, int allowbbt)
+{
+        struct onenand_chip *this = mtd->priv;
+        struct bbm_info *bbm = this->bbm;
+        int block;
+        uint8_t res;
+
+        /* Get block number * 2 */
+        block = (int) (offs >> (bbm->bbt_erase_shift - 1));
+        res = (bbm->bbt[block >> 3] >> (block & 0x06)) & 0x03;
+
+        DEBUG(MTD_DEBUG_LEVEL2, "onenand_isbad_bbt: bbt info for offs 0x%08x: (block %d) 0x%02x\n",
+                (unsigned int) offs, block >> 1, res);
+
+        switch ((int) res) {
+        case 0x00:      return 0;
+        case 0x01:      return 1;
+        case 0x02:      return allowbbt ? 0 : 1;
+        }
+
+        return 1;
+}
+
+/**
+ * onenand_scan_bbt - [OneNAND Interface] scan, find, read and maybe create bad block table(s)
+ * @param mtd           MTD device structure
+ * @param bd            descriptor for the good/bad block search pattern
+ *
+ * The function checks, if a bad block table(s) is/are already
+ * available. If not it scans the device for manufacturer
+ * marked good / bad blocks and writes the bad block table(s) to
+ * the selected place.
+ *
+ * The bad block table memory is allocated here. It must be freed
+ * by calling the onenand_free_bbt function.
+ *
+ */
+int onenand_scan_bbt(struct mtd_info *mtd, struct nand_bbt_descr *bd)
+{
+        struct onenand_chip *this = mtd->priv;
+        struct bbm_info *bbm = this->bbm;
+        int len, ret = 0;
+
+        len = mtd->size >> (this->erase_shift + 2);
+        /* Allocate memory (2bit per block) */
+        bbm->bbt = kmalloc(len, GFP_KERNEL);
+        if (!bbm->bbt) {
+                printk(KERN_ERR "onenand_scan_bbt: Out of memory\n");
+                return -ENOMEM;
+        }
+        /* Clear the memory bad block table */
+        memset(bbm->bbt, 0x00, len);
+
+        /* Set the bad block position */
+        bbm->badblockpos = ONENAND_BADBLOCK_POS;
+
+        /* Set erase shift */
+        bbm->bbt_erase_shift = this->erase_shift;
+
+        if (!bbm->isbad_bbt)
+                bbm->isbad_bbt = onenand_isbad_bbt;
+
+        /* Scan the device to build a memory based bad block table */
+        if ((ret = onenand_memory_bbt(mtd, bd))) {
+                printk(KERN_ERR "onenand_scan_bbt: Can't scan flash and build the RAM-based BBT\n");
+                kfree(bbm->bbt);
+                bbm->bbt = NULL;
+        }
+
+        return ret;
+}
+
+/*
+ * Define some generic bad / good block scan pattern which are used
+ * while scanning a device for factory marked good / bad blocks.
+ */
+static uint8_t scan_ff_pattern[] = { 0xff, 0xff };
+
+static struct nand_bbt_descr largepage_memorybased = {
+        .options = 0,
+        .offs = 0,
+        .len = 2,
+        .pattern = scan_ff_pattern,
+};
+
+/**
+ * onenand_default_bbt - [OneNAND Interface] Select a default bad block table for the device
+ * @param mtd           MTD device structure
+ *
+ * This function selects the default bad block table
+ * support for the device and calls the onenand_scan_bbt function
+ */
+int onenand_default_bbt(struct mtd_info *mtd)
+{
+        struct onenand_chip *this = mtd->priv;
+        struct bbm_info *bbm;
+
+        this->bbm = kmalloc(sizeof(struct bbm_info), GFP_KERNEL);
+        if (!this->bbm)
+                return -ENOMEM;
+
+        bbm = this->bbm;
+
+        memset(bbm, 0, sizeof(struct bbm_info));
+
+        /* 1KB page has same configuration as 2KB page */
+        if (!bbm->badblock_pattern)
+                bbm->badblock_pattern = &largepage_memorybased;
+
+        return onenand_scan_bbt(mtd, bbm->badblock_pattern);
+}
+
+EXPORT_SYMBOL(onenand_scan_bbt);
+EXPORT_SYMBOL(onenand_default_bbt);
diff --git a/drivers/mtd/redboot.c b/drivers/mtd/redboot.c
index 13f9e992bef8..7b7ca5ab5ae4 100644
--- a/drivers/mtd/redboot.c
+++ b/drivers/mtd/redboot.c
@@ -1,5 +1,5 @@
 /*
- * $Id: redboot.c,v 1.17 2004/11/22 11:33:56 ijc Exp $
+ * $Id: redboot.c,v 1.18 2005/11/07 11:14:21 gleixner Exp $
  *
  * Parse RedBoot-style Flash Image System (FIS) tables and
  * produce a Linux partition array to match.
@@ -39,7 +39,7 @@ static inline int redboot_checksum(struct fis_image_desc *img)
         return 1;
 }
 
-static int parse_redboot_partitions(struct mtd_info *master, 
+static int parse_redboot_partitions(struct mtd_info *master,
                              struct mtd_partition **pparts,
                              unsigned long fis_origin)
 {
diff --git a/drivers/mtd/rfd_ftl.c b/drivers/mtd/rfd_ftl.c
new file mode 100644
index 000000000000..041ee59ea77d
--- /dev/null
+++ b/drivers/mtd/rfd_ftl.c
@@ -0,0 +1,855 @@
+/*
+ * rfd_ftl.c -- resident flash disk (flash translation layer)
+ *
+ * Copyright (C) 2005  Sean Young <sean@mess.org>
+ *
+ * $Id: rfd_ftl.c,v 1.5 2005/11/07 11:14:21 gleixner Exp $
+ *
+ * This type of flash translation layer (FTL) is used by the Embedded BIOS
+ * by General Software. It is known as the Resident Flash Disk (RFD), see:
+ *
+ *      http://www.gensw.com/pages/prod/bios/rfd.htm
+ *
+ * based on ftl.c
+ */
+
+#include <linux/hdreg.h>
+#include <linux/init.h>
+#include <linux/mtd/blktrans.h>
+#include <linux/mtd/mtd.h>
+#include <linux/vmalloc.h>
+
+#include <asm/types.h>
+
+#define const_cpu_to_le16       __constant_cpu_to_le16
+
+static int block_size = 0;
+module_param(block_size, int, 0);
+MODULE_PARM_DESC(block_size, "Block size to use by RFD, defaults to erase unit size");
+
+#define PREFIX "rfd_ftl: "
+
+/* Major device # for FTL device */
+
+/* A request for this major has been sent to device@lanana.org */
+#ifndef RFD_FTL_MAJOR
+#define RFD_FTL_MAJOR           95
+#endif
+
+/* Maximum number of partitions in an FTL region */
+#define PART_BITS               4
+
+/* An erase unit should start with this value */
+#define RFD_MAGIC               0x9193
+
+/* the second value is 0xffff or 0xffc8; function unknown */
+
+/* the third value is always 0xffff, ignored */
+
+/* next is an array of mapping for each corresponding sector */
+#define HEADER_MAP_OFFSET       3
+#define SECTOR_DELETED          0x0000
+#define SECTOR_ZERO             0xfffe
+#define SECTOR_FREE             0xffff
+
+#define SECTOR_SIZE             512
+
+#define SECTORS_PER_TRACK       63
+
+struct block {
+        enum {
+                BLOCK_OK,
+                BLOCK_ERASING,
+                BLOCK_ERASED,
+                BLOCK_FAILED
+        } state;
+        int free_sectors;
+        int used_sectors;
+        int erases;
+        u_long offset;
+};
+
+struct partition {
+        struct mtd_blktrans_dev mbd;
+
+        u_int block_size;               /* size of erase unit */
+        u_int total_blocks;             /* number of erase units */
+        u_int header_sectors_per_block; /* header sectors in erase unit */
+        u_int data_sectors_per_block;   /* data sectors in erase unit */
+        u_int sector_count;             /* sectors in translated disk */
+        u_int header_size;              /* bytes in header sector */
+        int reserved_block;             /* block next up for reclaim */
+        int current_block;              /* block to write to */
+        u16 *header_cache;              /* cached header */
+
+        int is_reclaiming;
+        int cylinders;
+        int errors;
+        u_long *sector_map;
+        struct block *blocks;
+};
+
+static int rfd_ftl_writesect(struct mtd_blktrans_dev *dev, u_long sector, char *buf);
+
+static int build_block_map(struct partition *part, int block_no)
+{
+        struct block *block = &part->blocks[block_no];
+        int i;
+
+        block->offset = part->block_size * block_no;
+
+        if (le16_to_cpu(part->header_cache[0]) != RFD_MAGIC) {
+                block->state = BLOCK_ERASED; /* assumption */
+                block->free_sectors = part->data_sectors_per_block;
+                part->reserved_block = block_no;
+                return 1;
+        }
+
+        block->state = BLOCK_OK;
+
+        for (i=0; i<part->data_sectors_per_block; i++) {
+                u16 entry;
+
+                entry = le16_to_cpu(part->header_cache[HEADER_MAP_OFFSET + i]);
+
+                if (entry == SECTOR_DELETED)
+                        continue;
+
+                if (entry == SECTOR_FREE) {
+                        block->free_sectors++;
+                        continue;
+                }
+
+                if (entry == SECTOR_ZERO)
+                        entry = 0;
+
+                if (entry >= part->sector_count) {
+                        printk(KERN_NOTICE PREFIX
+                                "'%s': unit #%d: entry %d corrupt, "
+                                "sector %d out of range\n",
+                                part->mbd.mtd->name, block_no, i, entry);
+                        continue;
+                }
+
+                if (part->sector_map[entry] != -1) {
+                        printk(KERN_NOTICE PREFIX
+                                "'%s': more than one entry for sector %d\n",
+                                part->mbd.mtd->name, entry);
+                        part->errors = 1;
+                        continue;
+                }
+
+                part->sector_map[entry] = block->offset +
+                        (i + part->header_sectors_per_block) * SECTOR_SIZE;
+
+                block->used_sectors++;
+        }
+
+        if (block->free_sectors == part->data_sectors_per_block)
+                part->reserved_block = block_no;
+
+        return 0;
+}
+
+static int scan_header(struct partition *part)
+{
+        int sectors_per_block;
+        int i, rc = -ENOMEM;
+        int blocks_found;
+        size_t retlen;
+
+        sectors_per_block = part->block_size / SECTOR_SIZE;
+        part->total_blocks = part->mbd.mtd->size / part->block_size;
+
+        if (part->total_blocks < 2)
+                return -ENOENT;
+
+        /* each erase block has three bytes header, followed by the map */
+        part->header_sectors_per_block =
+                        ((HEADER_MAP_OFFSET + sectors_per_block) *
+                        sizeof(u16) + SECTOR_SIZE - 1) / SECTOR_SIZE;
+
+        part->data_sectors_per_block = sectors_per_block -
+                        part->header_sectors_per_block;
+
+        part->header_size = (HEADER_MAP_OFFSET +
+                        part->data_sectors_per_block) * sizeof(u16);
+
+        part->cylinders = (part->data_sectors_per_block *
+                        (part->total_blocks - 1) - 1) / SECTORS_PER_TRACK;
+
+        part->sector_count = part->cylinders * SECTORS_PER_TRACK;
+
+        part->current_block = -1;
+        part->reserved_block = -1;
+        part->is_reclaiming = 0;
+
+        part->header_cache = kmalloc(part->header_size, GFP_KERNEL);
+        if (!part->header_cache)
+                goto err;
+
+        part->blocks = kcalloc(part->total_blocks, sizeof(struct block),
+                        GFP_KERNEL);
+        if (!part->blocks)
+                goto err;
+
+        part->sector_map = vmalloc(part->sector_count * sizeof(u_long));
+        if (!part->sector_map) {
+                printk(KERN_ERR PREFIX "'%s': unable to allocate memory for "
+                        "sector map", part->mbd.mtd->name);
+                goto err;
+        }
+
+        for (i=0; i<part->sector_count; i++)
+                part->sector_map[i] = -1;
+
+        for (i=0, blocks_found=0; i<part->total_blocks; i++) {
+                rc = part->mbd.mtd->read(part->mbd.mtd,
+                                i * part->block_size, part->header_size,
+                                &retlen, (u_char*)part->header_cache);
+
+                if (!rc && retlen != part->header_size)
+                        rc = -EIO;
+
+                if (rc)
+                        goto err;
+
+                if (!build_block_map(part, i))
+                        blocks_found++;
+        }
+
+        if (blocks_found == 0) {
+                printk(KERN_NOTICE PREFIX "no RFD magic found in '%s'\n",
+                                part->mbd.mtd->name);
+                rc = -ENOENT;
+                goto err;
+        }
+
+        if (part->reserved_block == -1) {
+                printk(KERN_NOTICE PREFIX "'%s': no empty erase unit found\n",
+                                part->mbd.mtd->name);
+
+                part->errors = 1;
+        }
+
+        return 0;
+
+err:
+        vfree(part->sector_map);
+        kfree(part->header_cache);
+        kfree(part->blocks);
+
+        return rc;
+}
+
+static int rfd_ftl_readsect(struct mtd_blktrans_dev *dev, u_long sector, char *buf)
+{
+        struct partition *part = (struct partition*)dev;
+        u_long addr;
+        size_t retlen;
+        int rc;
+
+        if (sector >= part->sector_count)
+                return -EIO;
+
+        addr = part->sector_map[sector];
+        if (addr != -1) {
+                rc = part->mbd.mtd->read(part->mbd.mtd, addr, SECTOR_SIZE,
+                                                &retlen, (u_char*)buf);
+                if (!rc && retlen != SECTOR_SIZE)
+                        rc = -EIO;
+
+                if (rc) {
+                        printk(KERN_WARNING PREFIX "error reading '%s' at "
+                                "0x%lx\n", part->mbd.mtd->name, addr);
+                        return rc;
+                }
+        } else
+                memset(buf, 0, SECTOR_SIZE);
+
+        return 0;
+}
+
+static void erase_callback(struct erase_info *erase)
+{
+        struct partition *part;
+        u16 magic;
+        int i, rc;
+        size_t retlen;
+
+        part = (struct partition*)erase->priv;
+
+        i = erase->addr / part->block_size;
+        if (i >= part->total_blocks || part->blocks[i].offset != erase->addr) {
+                printk(KERN_ERR PREFIX "erase callback for unknown offset %x "
+                                "on '%s'\n", erase->addr, part->mbd.mtd->name);
+                return;
+        }
+
+        if (erase->state != MTD_ERASE_DONE) {
+                printk(KERN_WARNING PREFIX "erase failed at 0x%x on '%s', "
+                                "state %d\n", erase->addr,
+                                part->mbd.mtd->name, erase->state);
+
+                part->blocks[i].state = BLOCK_FAILED;
+                part->blocks[i].free_sectors = 0;
+                part->blocks[i].used_sectors = 0;
+
+                kfree(erase);
+
+                return;
+        }
+
+        magic = const_cpu_to_le16(RFD_MAGIC);
+
+        part->blocks[i].state = BLOCK_ERASED;
+        part->blocks[i].free_sectors = part->data_sectors_per_block;
+        part->blocks[i].used_sectors = 0;
+        part->blocks[i].erases++;
+
+        rc = part->mbd.mtd->write(part->mbd.mtd,
+                part->blocks[i].offset, sizeof(magic), &retlen,
+                (u_char*)&magic);
+
+        if (!rc && retlen != sizeof(magic))
+                rc = -EIO;
+
+        if (rc) {
+                printk(KERN_NOTICE PREFIX "'%s': unable to write RFD "
+                                "header at 0x%lx\n",
+                                part->mbd.mtd->name,
+                                part->blocks[i].offset);
+                part->blocks[i].state = BLOCK_FAILED;
+        }
+        else
+                part->blocks[i].state = BLOCK_OK;
+
+        kfree(erase);
+}
+
+static int erase_block(struct partition *part, int block)
+{
+        struct erase_info *erase;
+        int rc = -ENOMEM;
+
+        erase = kmalloc(sizeof(struct erase_info), GFP_KERNEL);
+        if (!erase)
+                goto err;
+
+        erase->mtd = part->mbd.mtd;
+        erase->callback = erase_callback;
+        erase->addr = part->blocks[block].offset;
+        erase->len = part->block_size;
+        erase->priv = (u_long)part;
+
+        part->blocks[block].state = BLOCK_ERASING;
+        part->blocks[block].free_sectors = 0;
+
+        rc = part->mbd.mtd->erase(part->mbd.mtd, erase);
+
+        if (rc) {
+                printk(KERN_WARNING PREFIX "erase of region %x,%x on '%s' "
+                                "failed\n", erase->addr, erase->len,
+                                part->mbd.mtd->name);
+                kfree(erase);
+        }
+
+err:
+        return rc;
+}
+
+static int move_block_contents(struct partition *part, int block_no, u_long *old_sector)
+{
+        void *sector_data;
+        u16 *map;
+        size_t retlen;
+        int i, rc = -ENOMEM;
+
+        part->is_reclaiming = 1;
+
+        sector_data = kmalloc(SECTOR_SIZE, GFP_KERNEL);
+        if (!sector_data)
+                goto err3;
+
+        map = kmalloc(part->header_size, GFP_KERNEL);
+        if (!map)
+                goto err2;
+
+        rc = part->mbd.mtd->read(part->mbd.mtd,
+                part->blocks[block_no].offset, part->header_size,
+                &retlen, (u_char*)map);
+
+        if (!rc && retlen != part->header_size)
+                rc = -EIO;
+
+        if (rc) {
+                printk(KERN_NOTICE PREFIX "error reading '%s' at "
+                        "0x%lx\n", part->mbd.mtd->name,
+                        part->blocks[block_no].offset);
+
+                goto err;
+        }
+
+        for (i=0; i<part->data_sectors_per_block; i++) {
+                u16 entry = le16_to_cpu(map[HEADER_MAP_OFFSET + i]);
+                u_long addr;
+
+
+                if (entry == SECTOR_FREE || entry == SECTOR_DELETED)
+                        continue;
+
+                if (entry == SECTOR_ZERO)
+                        entry = 0;
+
+                /* already warned about and ignored in build_block_map() */
+                if (entry >= part->sector_count)
+                        continue;
+
+                addr = part->blocks[block_no].offset +
+                        (i + part->header_sectors_per_block) * SECTOR_SIZE;
+
+                if (*old_sector == addr) {
+                        *old_sector = -1;
+                        if (!part->blocks[block_no].used_sectors--) {
+                                rc = erase_block(part, block_no);
+                                break;
+                        }
+                        continue;
+                }
+                rc = part->mbd.mtd->read(part->mbd.mtd, addr,
+                        SECTOR_SIZE, &retlen, sector_data);
+
+                if (!rc && retlen != SECTOR_SIZE)
+                        rc = -EIO;
+
+                if (rc) {
+                        printk(KERN_NOTICE PREFIX "'%s': Unable to "
+                                "read sector for relocation\n",
+                                part->mbd.mtd->name);
+
+                        goto err;
+                }
+
+                rc = rfd_ftl_writesect((struct mtd_blktrans_dev*)part,
+                                entry, sector_data);
+
+                if (rc)
+                        goto err;
+        }
+
+err:
+        kfree(map);
+err2:
+        kfree(sector_data);
+err3:
+        part->is_reclaiming = 0;
+
+        return rc;
+}
+
+static int reclaim_block(struct partition *part, u_long *old_sector)
+{
+        int block, best_block, score, old_sector_block;
+        int rc;
+
+        /* we have a race if sync doesn't exist */
+        if (part->mbd.mtd->sync)
+                part->mbd.mtd->sync(part->mbd.mtd);
+
+        score = 0x7fffffff; /* MAX_INT */
+        best_block = -1;
+        if (*old_sector != -1)
+                old_sector_block = *old_sector / part->block_size;
+        else
+                old_sector_block = -1;
+
+        for (block=0; block<part->total_blocks; block++) {
+                int this_score;
+
+                if (block == part->reserved_block)
+                        continue;
+
+                /*
+                 * Postpone reclaiming if there is a free sector as
+                 * more removed sectors is more efficient (have to move
+                 * less).
+                 */
+                if (part->blocks[block].free_sectors)
+                        return 0;
+
+                this_score = part->blocks[block].used_sectors;
+
+                if (block == old_sector_block)
+                        this_score--;
+                else {
+                        /* no point in moving a full block */
+                        if (part->blocks[block].used_sectors ==
+                                        part->data_sectors_per_block)
+                                continue;
+                }
+
+                this_score += part->blocks[block].erases;
+
+                if (this_score < score) {
+                        best_block = block;
+                        score = this_score;
+                }
+        }
+
+        if (best_block == -1)
+                return -ENOSPC;
+
+        part->current_block = -1;
+        part->reserved_block = best_block;
+
+        pr_debug("reclaim_block: reclaiming block #%d with %d used "
+                 "%d free sectors\n", best_block,
+                 part->blocks[best_block].used_sectors,
+                 part->blocks[best_block].free_sectors);
+
+        if (part->blocks[best_block].used_sectors)
+                rc = move_block_contents(part, best_block, old_sector);
+        else
+                rc = erase_block(part, best_block);
+
+        return rc;
+}
+
+/*
+ * IMPROVE: It would be best to choose the block with the most deleted sectors,
+ * because if we fill that one up first it'll have the most chance of having
+ * the least live sectors at reclaim.
+ */
+static int find_free_block(const struct partition *part)
+{
+        int block, stop;
+
+        block = part->current_block == -1 ?
+                        jiffies % part->total_blocks : part->current_block;
+        stop = block;
+
+        do {
+                if (part->blocks[block].free_sectors &&
+                                block != part->reserved_block)
+                        return block;
+
+                if (++block >= part->total_blocks)
+                        block = 0;
+
+        } while (block != stop);
+
+        return -1;
+}
+
+static int find_writeable_block(struct partition *part, u_long *old_sector)
+{
+        int rc, block;
+        size_t retlen;
+
+        block = find_free_block(part);
+
+        if (block == -1) {
+                if (!part->is_reclaiming) {
+                        rc = reclaim_block(part, old_sector);
+                        if (rc)
+                                goto err;
+
+                        block = find_free_block(part);
+                }
+
+                if (block == -1) {
+                        rc = -ENOSPC;
+                        goto err;
+                }
+        }
+
+        rc = part->mbd.mtd->read(part->mbd.mtd, part->blocks[block].offset,
+                part->header_size, &retlen, (u_char*)part->header_cache);
+
+        if (!rc && retlen != part->header_size)
+                rc = -EIO;
+
+        if (rc) {
+                printk(KERN_NOTICE PREFIX "'%s': unable to read header at "
+                                "0x%lx\n", part->mbd.mtd->name,
+                                part->blocks[block].offset);
+                goto err;
+        }
+
+        part->current_block = block;
+
+err:
+        return rc;
+}
+
+static int mark_sector_deleted(struct partition *part, u_long old_addr)
+{
+        int block, offset, rc;
+        u_long addr;
+        size_t retlen;
+        u16 del = const_cpu_to_le16(SECTOR_DELETED);
+
+        block = old_addr / part->block_size;
+        offset = (old_addr % part->block_size) / SECTOR_SIZE -
+                part->header_sectors_per_block;
+
+        addr = part->blocks[block].offset +
+                        (HEADER_MAP_OFFSET + offset) * sizeof(u16);
+        rc = part->mbd.mtd->write(part->mbd.mtd, addr,
+                sizeof(del), &retlen, (u_char*)&del);
+
+        if (!rc && retlen != sizeof(del))
+                rc = -EIO;
+
+        if (rc) {
+                printk(KERN_WARNING PREFIX "error writing '%s' at "
+                        "0x%lx\n", part->mbd.mtd->name, addr);
+                if (rc)
+                        goto err;
+        }
+        if (block == part->current_block)
+                part->header_cache[offset + HEADER_MAP_OFFSET] = del;
+
+        part->blocks[block].used_sectors--;
+
+        if (!part->blocks[block].used_sectors &&
+            !part->blocks[block].free_sectors)
+                rc = erase_block(part, block);
+
+err:
+        return rc;
+}
+
+static int find_free_sector(const struct partition *part, const struct block *block)
+{
+        int i, stop;
+
+        i = stop = part->data_sectors_per_block - block->free_sectors;
+
+        do {
+                if (le16_to_cpu(part->header_cache[HEADER_MAP_OFFSET + i])
+                                == SECTOR_FREE)
+                        return i;
+
+                if (++i == part->data_sectors_per_block)
+                        i = 0;
+        }
+        while(i != stop);
+
+        return -1;
+}
+
+static int do_writesect(struct mtd_blktrans_dev *dev, u_long sector, char *buf, ulong *old_addr)
+{
+        struct partition *part = (struct partition*)dev;
+        struct block *block;
+        u_long addr;
+        int i;
+        int rc;
+        size_t retlen;
+        u16 entry;
+
+        if (part->current_block == -1 ||
+                !part->blocks[part->current_block].free_sectors) {
+
+                rc = find_writeable_block(part, old_addr);
+                if (rc)
+                        goto err;
+        }
+
+        block = &part->blocks[part->current_block];
+
+        i = find_free_sector(part, block);
+
+        if (i < 0) {
+                rc = -ENOSPC;
+                goto err;
+        }
+
+        addr = (i + part->header_sectors_per_block) * SECTOR_SIZE +
+                block->offset;
+        rc = part->mbd.mtd->write(part->mbd.mtd,
+                addr, SECTOR_SIZE, &retlen, (u_char*)buf);
+
+        if (!rc && retlen != SECTOR_SIZE)
+                rc = -EIO;
+
+        if (rc) {
+                printk(KERN_WARNING PREFIX "error writing '%s' at 0x%lx\n",
+                                part->mbd.mtd->name, addr);
+                if (rc)
+                        goto err;
+        }
+
+        part->sector_map[sector] = addr;
+
+        entry = cpu_to_le16(sector == 0 ? SECTOR_ZERO : sector);
+
+        part->header_cache[i + HEADER_MAP_OFFSET] = entry;
+
+        addr = block->offset + (HEADER_MAP_OFFSET + i) * sizeof(u16);
+        rc = part->mbd.mtd->write(part->mbd.mtd, addr,
+                        sizeof(entry), &retlen, (u_char*)&entry);
+
+        if (!rc && retlen != sizeof(entry))
+                rc = -EIO;
+
+        if (rc) {
+                printk(KERN_WARNING PREFIX "error writing '%s' at 0x%lx\n",
+                                part->mbd.mtd->name, addr);
+                if (rc)
+                        goto err;
+        }
+        block->used_sectors++;
+        block->free_sectors--;
+
+err:
+        return rc;
+}
+
+static int rfd_ftl_writesect(struct mtd_blktrans_dev *dev, u_long sector, char *buf)
+{
+        struct partition *part = (struct partition*)dev;
+        u_long old_addr;
+        int i;
+        int rc = 0;
+
+        pr_debug("rfd_ftl_writesect(sector=0x%lx)\n", sector);
+
+        if (part->reserved_block == -1) {
+                rc = -EACCES;
+                goto err;
+        }
+
+        if (sector >= part->sector_count) {
+                rc = -EIO;
+                goto err;
+        }
+
+        old_addr = part->sector_map[sector];
+
+        for (i=0; i<SECTOR_SIZE; i++) {
+                if (!buf[i])
+                        continue;
+
+                rc = do_writesect(dev, sector, buf, &old_addr);
+                if (rc)
+                        goto err;
+                break;
+        }
+
+        if (i == SECTOR_SIZE)
+                part->sector_map[sector] = -1;
+
+        if (old_addr != -1)
+                rc = mark_sector_deleted(part, old_addr);
+
+err:
+        return rc;
+}
+
+static int rfd_ftl_getgeo(struct mtd_blktrans_dev *dev, struct hd_geometry *geo)
+{
+        struct partition *part = (struct partition*)dev;
+
+        geo->heads = 1;
+        geo->sectors = SECTORS_PER_TRACK;
+        geo->cylinders = part->cylinders;
+
+        return 0;
+}
+
+static void rfd_ftl_add_mtd(struct mtd_blktrans_ops *tr, struct mtd_info *mtd)
+{
+        struct partition *part;
+
+        if (mtd->type != MTD_NORFLASH)
+                return;
+
+        part = kcalloc(1, sizeof(struct partition), GFP_KERNEL);
+        if (!part)
+                return;
+
+        part->mbd.mtd = mtd;
+
+        if (block_size)
+                part->block_size = block_size;
+        else {
+                if (!mtd->erasesize) {
+                        printk(KERN_NOTICE PREFIX "please provide block_size");
+                        return;
+                }
+                else
+                        part->block_size = mtd->erasesize;
+        }
+
+        if (scan_header(part) == 0) {
+                part->mbd.size = part->sector_count;
+                part->mbd.blksize = SECTOR_SIZE;
+                part->mbd.tr = tr;
+                part->mbd.devnum = -1;
+                if (!(mtd->flags & MTD_WRITEABLE))
+                        part->mbd.readonly = 1;
+                else if (part->errors) {
+                        printk(KERN_NOTICE PREFIX "'%s': errors found, "
+                                        "setting read-only", mtd->name);
+                        part->mbd.readonly = 1;
+                }
+
+                printk(KERN_INFO PREFIX "name: '%s' type: %d flags %x\n",
+                                mtd->name, mtd->type, mtd->flags);
+
+                if (!add_mtd_blktrans_dev((void*)part))
+                        return;
+        }
+
+        kfree(part);
+}
+
+static void rfd_ftl_remove_dev(struct mtd_blktrans_dev *dev)
+{
+        struct partition *part = (struct partition*)dev;
+        int i;
+
+        for (i=0; i<part->total_blocks; i++) {
+                pr_debug("rfd_ftl_remove_dev:'%s': erase unit #%02d: %d erases\n",
+                        part->mbd.mtd->name, i, part->blocks[i].erases);
+        }
+
+        del_mtd_blktrans_dev(dev);
+        vfree(part->sector_map);
+        kfree(part->header_cache);
+        kfree(part->blocks);
+        kfree(part);
+}
+
+struct mtd_blktrans_ops rfd_ftl_tr = {
+        .name           = "rfd",
+        .major          = RFD_FTL_MAJOR,
+        .part_bits      = PART_BITS,
+        .readsect       = rfd_ftl_readsect,
+        .writesect      = rfd_ftl_writesect,
+        .getgeo         = rfd_ftl_getgeo,
+        .add_mtd        = rfd_ftl_add_mtd,
+        .remove_dev     = rfd_ftl_remove_dev,
+        .owner          = THIS_MODULE,
+};
+
+static int __init init_rfd_ftl(void)
+{
+        return register_mtd_blktrans(&rfd_ftl_tr);
+}
+
+static void __exit cleanup_rfd_ftl(void)
+{
+        deregister_mtd_blktrans(&rfd_ftl_tr);
+}
+
+module_init(init_rfd_ftl);
+module_exit(cleanup_rfd_ftl);
+
+MODULE_LICENSE("GPL");
+MODULE_AUTHOR("Sean Young <sean@mess.org>");
+MODULE_DESCRIPTION("Support code for RFD Flash Translation Layer, "
+                "used by General Software's Embedded BIOS");
+
diff --git a/drivers/net/3c59x.c b/drivers/net/3c59x.c
index 455ba915ede7..7488ee7f7caf 100644
--- a/drivers/net/3c59x.c
+++ b/drivers/net/3c59x.c
@@ -602,7 +602,7 @@ MODULE_DEVICE_TABLE(pci, vortex_pci_tbl);
    First the windows.  There are eight register windows, with the command
    and status registers available in each.
    */
-#define EL3WINDOW(win_num) outw(SelectWindow + (win_num), ioaddr + EL3_CMD)
+#define EL3WINDOW(win_num) iowrite16(SelectWindow + (win_num), ioaddr + EL3_CMD)
 #define EL3_CMD 0x0e
 #define EL3_STATUS 0x0e
 
@@ -776,7 +776,8 @@ struct vortex_private {
 
         /* PCI configuration space information. */
         struct device *gendev;
-        char __iomem *cb_fn_base;               /* CardBus function status addr space. */
+        void __iomem *ioaddr;                   /* IO address space */
+        void __iomem *cb_fn_base;               /* CardBus function status addr space. */
 
         /* Some values here only for performance evaluation and path-coverage */
         int rx_nocopy, rx_copy, queued_packet, rx_csumhits;
@@ -869,12 +870,12 @@ static struct {
 /* number of ETHTOOL_GSTATS u64's */
 #define VORTEX_NUM_STATS     3
 
-static int vortex_probe1(struct device *gendev, long ioaddr, int irq,
+static int vortex_probe1(struct device *gendev, void __iomem *ioaddr, int irq,
                                    int chip_idx, int card_idx);
 static void vortex_up(struct net_device *dev);
 static void vortex_down(struct net_device *dev, int final);
 static int vortex_open(struct net_device *dev);
-static void mdio_sync(long ioaddr, int bits);
+static void mdio_sync(void __iomem *ioaddr, int bits);
 static int mdio_read(struct net_device *dev, int phy_id, int location);
 static void mdio_write(struct net_device *vp, int phy_id, int location, int value);
 static void vortex_timer(unsigned long arg);
@@ -887,7 +888,7 @@ static irqreturn_t vortex_interrupt(int irq, void *dev_id, struct pt_regs *regs)
 static irqreturn_t boomerang_interrupt(int irq, void *dev_id, struct pt_regs *regs);
 static int vortex_close(struct net_device *dev);
 static void dump_tx_ring(struct net_device *dev);
-static void update_stats(long ioaddr, struct net_device *dev);
+static void update_stats(void __iomem *ioaddr, struct net_device *dev);
 static struct net_device_stats *vortex_get_stats(struct net_device *dev);
 static void set_rx_mode(struct net_device *dev);
 #ifdef CONFIG_PCI
@@ -902,14 +903,16 @@ static void set_8021q_mode(struct net_device *dev, int enable);
 /* This driver uses 'options' to pass the media type, full-duplex flag, etc. */
 /* Option count limit only -- unlimited interfaces are supported. */
 #define MAX_UNITS 8
-static int options[MAX_UNITS] = { -1, -1, -1, -1, -1, -1, -1, -1,};
-static int full_duplex[MAX_UNITS] = {-1, -1, -1, -1, -1, -1, -1, -1};
-static int hw_checksums[MAX_UNITS] = {-1, -1, -1, -1, -1, -1, -1, -1};
-static int flow_ctrl[MAX_UNITS] = {-1, -1, -1, -1, -1, -1, -1, -1};
-static int enable_wol[MAX_UNITS] = {-1, -1, -1, -1, -1, -1, -1, -1};
+static int options[MAX_UNITS] = { [0 ... MAX_UNITS-1] = -1 };
+static int full_duplex[MAX_UNITS] = {[0 ... MAX_UNITS-1] = -1 };
+static int hw_checksums[MAX_UNITS] = {[0 ... MAX_UNITS-1] = -1 };
+static int flow_ctrl[MAX_UNITS] = {[0 ... MAX_UNITS-1] = -1 };
+static int enable_wol[MAX_UNITS] = {[0 ... MAX_UNITS-1] = -1 };
+static int use_mmio[MAX_UNITS] = {[0 ... MAX_UNITS-1] = -1 };
 static int global_options = -1;
 static int global_full_duplex = -1;
 static int global_enable_wol = -1;
+static int global_use_mmio = -1;
 
 /* #define dev_alloc_skb dev_alloc_skb_debug */
 
@@ -934,21 +937,25 @@ module_param(compaq_ioaddr, int, 0);
 module_param(compaq_irq, int, 0);
 module_param(compaq_device_id, int, 0);
 module_param(watchdog, int, 0);
+module_param(global_use_mmio, int, 0);
+module_param_array(use_mmio, int, NULL, 0);
 MODULE_PARM_DESC(debug, "3c59x debug level (0-6)");
 MODULE_PARM_DESC(options, "3c59x: Bits 0-3: media type, bit 4: bus mastering, bit 9: full duplex");
 MODULE_PARM_DESC(global_options, "3c59x: same as options, but applies to all NICs if options is unset");
 MODULE_PARM_DESC(full_duplex, "3c59x full duplex setting(s) (1)");
-MODULE_PARM_DESC(global_full_duplex, "3c59x: same as full_duplex, but applies to all NICs if options is unset");
+MODULE_PARM_DESC(global_full_duplex, "3c59x: same as full_duplex, but applies to all NICs if full_duplex is unset");
 MODULE_PARM_DESC(hw_checksums, "3c59x Hardware checksum checking by adapter(s) (0-1)");
 MODULE_PARM_DESC(flow_ctrl, "3c59x 802.3x flow control usage (PAUSE only) (0-1)");
 MODULE_PARM_DESC(enable_wol, "3c59x: Turn on Wake-on-LAN for adapter(s) (0-1)");
-MODULE_PARM_DESC(global_enable_wol, "3c59x: same as enable_wol, but applies to all NICs if options is unset");
+MODULE_PARM_DESC(global_enable_wol, "3c59x: same as enable_wol, but applies to all NICs if enable_wol is unset");
 MODULE_PARM_DESC(rx_copybreak, "3c59x copy breakpoint for copy-only-tiny-frames");
 MODULE_PARM_DESC(max_interrupt_work, "3c59x maximum events handled per interrupt");
 MODULE_PARM_DESC(compaq_ioaddr, "3c59x PCI I/O base address (Compaq BIOS problem workaround)");
 MODULE_PARM_DESC(compaq_irq, "3c59x PCI IRQ number (Compaq BIOS problem workaround)");
 MODULE_PARM_DESC(compaq_device_id, "3c59x PCI device ID (Compaq BIOS problem workaround)");
 MODULE_PARM_DESC(watchdog, "3c59x transmit timeout in milliseconds");
+MODULE_PARM_DESC(global_use_mmio, "3c59x: same as use_mmio, but applies to all NICs if options is unset");
+MODULE_PARM_DESC(use_mmio, "3c59x: use memory-mapped PCI I/O resource (0-1)");
 
 #ifdef CONFIG_NET_POLL_CONTROLLER
 static void poll_vortex(struct net_device *dev)
@@ -1029,18 +1036,19 @@ static struct eisa_driver vortex_eisa_driver = {
 
 static int vortex_eisa_probe (struct device *device)
 {
-        long ioaddr;
+        void __iomem *ioaddr;
         struct eisa_device *edev;
 
         edev = to_eisa_device (device);
-        ioaddr = edev->base_addr;
 
-        if (!request_region(ioaddr, VORTEX_TOTAL_SIZE, DRV_NAME))
+        if (!request_region(edev->base_addr, VORTEX_TOTAL_SIZE, DRV_NAME))
                 return -EBUSY;
 
-        if (vortex_probe1(device, ioaddr, inw(ioaddr + 0xC88) >> 12,
+        ioaddr = ioport_map(edev->base_addr, VORTEX_TOTAL_SIZE);
+
+        if (vortex_probe1(device, ioaddr, ioread16(ioaddr + 0xC88) >> 12,
                                           edev->id.driver_data, vortex_cards_found)) {
-                release_region (ioaddr, VORTEX_TOTAL_SIZE);
+                release_region (edev->base_addr, VORTEX_TOTAL_SIZE);
                 return -ENODEV;
         }
 
@@ -1054,7 +1062,7 @@ static int vortex_eisa_remove (struct device *device)
         struct eisa_device *edev;
         struct net_device *dev;
         struct vortex_private *vp;
-        long ioaddr;
+        void __iomem *ioaddr;
 
         edev = to_eisa_device (device);
         dev = eisa_get_drvdata (edev);
@@ -1065,11 +1073,11 @@ static int vortex_eisa_remove (struct device *device)
         }
 
         vp = netdev_priv(dev);
-        ioaddr = dev->base_addr;
+        ioaddr = vp->ioaddr;
         
         unregister_netdev (dev);
-        outw (TotalReset|0x14, ioaddr + EL3_CMD);
-        release_region (ioaddr, VORTEX_TOTAL_SIZE);
+        iowrite16 (TotalReset|0x14, ioaddr + EL3_CMD);
+        release_region (dev->base_addr, VORTEX_TOTAL_SIZE);
 
         free_netdev (dev);
         return 0;
@@ -1096,8 +1104,8 @@ static int __init vortex_eisa_init (void)
         
         /* Special code to work-around the Compaq PCI BIOS32 problem. */
         if (compaq_ioaddr) {
-                vortex_probe1(NULL, compaq_ioaddr, compaq_irq,
-                                          compaq_device_id, vortex_cards_found++);
+                vortex_probe1(NULL, ioport_map(compaq_ioaddr, VORTEX_TOTAL_SIZE),
+                              compaq_irq, compaq_device_id, vortex_cards_found++);
         }
 
         return vortex_cards_found - orig_cards_found + eisa_found;
@@ -1107,15 +1115,32 @@ static int __init vortex_eisa_init (void)
 static int __devinit vortex_init_one (struct pci_dev *pdev,
                                       const struct pci_device_id *ent)
 {
-        int rc;
+        int rc, unit, pci_bar;
+        struct vortex_chip_info *vci;
+        void __iomem *ioaddr;
 
         /* wake up and enable device */         
         rc = pci_enable_device (pdev);
         if (rc < 0)
                 goto out;
 
-        rc = vortex_probe1 (&pdev->dev, pci_resource_start (pdev, 0),
-                                                pdev->irq, ent->driver_data, vortex_cards_found);
+        unit = vortex_cards_found;
+
+        if (global_use_mmio < 0 && (unit >= MAX_UNITS || use_mmio[unit] < 0)) {
+                /* Determine the default if the user didn't override us */
+                vci = &vortex_info_tbl[ent->driver_data];
+                pci_bar = vci->drv_flags & (IS_CYCLONE | IS_TORNADO) ? 1 : 0;
+        } else if (unit < MAX_UNITS && use_mmio[unit] >= 0)
+                pci_bar = use_mmio[unit] ? 1 : 0;
+        else
+                pci_bar = global_use_mmio ? 1 : 0;
+
+        ioaddr = pci_iomap(pdev, pci_bar, 0);
+        if (!ioaddr) /* If mapping fails, fall-back to BAR 0... */
+                ioaddr = pci_iomap(pdev, 0, 0);
+
+        rc = vortex_probe1(&pdev->dev, ioaddr, pdev->irq,
+                           ent->driver_data, unit);
         if (rc < 0) {
                 pci_disable_device (pdev);
                 goto out;
@@ -1134,7 +1159,7 @@ out:
  * NOTE: pdev can be NULL, for the case of a Compaq device
  */
 static int __devinit vortex_probe1(struct device *gendev,
-                                   long ioaddr, int irq,
+                                   void __iomem *ioaddr, int irq,
                                    int chip_idx, int card_idx)
 {
         struct vortex_private *vp;
@@ -1202,15 +1227,16 @@ static int __devinit vortex_probe1(struct device *gendev,
         if (print_info)
                 printk (KERN_INFO "See Documentation/networking/vortex.txt\n");
 
-        printk(KERN_INFO "%s: 3Com %s %s at 0x%lx. Vers " DRV_VERSION "\n",
+        printk(KERN_INFO "%s: 3Com %s %s at %p. Vers " DRV_VERSION "\n",
                print_name,
                pdev ? "PCI" : "EISA",
                vci->name,
                ioaddr);
 
-        dev->base_addr = ioaddr;
+        dev->base_addr = (unsigned long)ioaddr;
         dev->irq = irq;
         dev->mtu = mtu;
+        vp->ioaddr = ioaddr;
         vp->large_frames = mtu > 1500;
         vp->drv_flags = vci->drv_flags;
         vp->has_nway = (vci->drv_flags & HAS_NWAY) ? 1 : 0;
@@ -1226,7 +1252,7 @@ static int __devinit vortex_probe1(struct device *gendev,
         if (pdev) {
                 /* EISA resources already marked, so only PCI needs to do this here */
                 /* Ignore return value, because Cardbus drivers already allocate for us */
-                if (request_region(ioaddr, vci->io_size, print_name) != NULL)
+                if (request_region(dev->base_addr, vci->io_size, print_name) != NULL)
                         vp->must_free_region = 1;
 
                 /* enable bus-mastering if necessary */         
@@ -1316,14 +1342,14 @@ static int __devinit vortex_probe1(struct device *gendev,
 
                 for (i = 0; i < 0x40; i++) {
                         int timer;
-                        outw(base + i, ioaddr + Wn0EepromCmd);
+                        iowrite16(base + i, ioaddr + Wn0EepromCmd);
                         /* Pause for at least 162 us. for the read to take place. */
                         for (timer = 10; timer >= 0; timer--) {
                                 udelay(162);
-                                if ((inw(ioaddr + Wn0EepromCmd) & 0x8000) == 0)
+                                if ((ioread16(ioaddr + Wn0EepromCmd) & 0x8000) == 0)
                                         break;
                         }
-                        eeprom[i] = inw(ioaddr + Wn0EepromData);
+                        eeprom[i] = ioread16(ioaddr + Wn0EepromData);
                 }
         }
         for (i = 0; i < 0x18; i++)
@@ -1338,6 +1364,7 @@ static int __devinit vortex_probe1(struct device *gendev,
                 printk(" ***INVALID CHECKSUM %4.4x*** ", checksum);
         for (i = 0; i < 3; i++)
                 ((u16 *)dev->dev_addr)[i] = htons(eeprom[i + 10]);
+        memcpy(dev->perm_addr, dev->dev_addr, dev->addr_len);
         if (print_info) {
                 for (i = 0; i < 6; i++)
                         printk("%c%2.2x", i ? ':' : ' ', dev->dev_addr[i]);
@@ -1351,7 +1378,7 @@ static int __devinit vortex_probe1(struct device *gendev,
         }
         EL3WINDOW(2);
         for (i = 0; i < 6; i++)
-                outb(dev->dev_addr[i], ioaddr + i);
+                iowrite8(dev->dev_addr[i], ioaddr + i);
 
 #ifdef __sparc__
         if (print_info)
@@ -1366,7 +1393,7 @@ static int __devinit vortex_probe1(struct device *gendev,
 #endif
 
         EL3WINDOW(4);
-        step = (inb(ioaddr + Wn4_NetDiag) & 0x1e) >> 1;
+        step = (ioread8(ioaddr + Wn4_NetDiag) & 0x1e) >> 1;
         if (print_info) {
                 printk(KERN_INFO "  product code %02x%02x rev %02x.%d date %02d-"
                         "%02d-%02d\n", eeprom[6]&0xff, eeprom[6]>>8, eeprom[0x14],
@@ -1375,31 +1402,30 @@ static int __devinit vortex_probe1(struct device *gendev,
 
 
         if (pdev && vci->drv_flags & HAS_CB_FNS) {
-                unsigned long fn_st_addr;                       /* Cardbus function status space */
                 unsigned short n;
 
-                fn_st_addr = pci_resource_start (pdev, 2);
-                if (fn_st_addr) {
-                        vp->cb_fn_base = ioremap(fn_st_addr, 128);
+                vp->cb_fn_base = pci_iomap(pdev, 2, 0);
+                if (!vp->cb_fn_base) {
                         retval = -ENOMEM;
-                        if (!vp->cb_fn_base)
-                                goto free_ring;
+                        goto free_ring;
                 }
+
                 if (print_info) {
                         printk(KERN_INFO "%s: CardBus functions mapped %8.8lx->%p\n",
-                                print_name, fn_st_addr, vp->cb_fn_base);
+                                print_name, pci_resource_start(pdev, 2),
+                                vp->cb_fn_base);
                 }
                 EL3WINDOW(2);
 
-                n = inw(ioaddr + Wn2_ResetOptions) & ~0x4010;
+                n = ioread16(ioaddr + Wn2_ResetOptions) & ~0x4010;
                 if (vp->drv_flags & INVERT_LED_PWR)
                         n |= 0x10;
                 if (vp->drv_flags & INVERT_MII_PWR)
                         n |= 0x4000;
-                outw(n, ioaddr + Wn2_ResetOptions);
+                iowrite16(n, ioaddr + Wn2_ResetOptions);
                 if (vp->drv_flags & WNO_XCVR_PWR) {
                         EL3WINDOW(0);
-                        outw(0x0800, ioaddr);
+                        iowrite16(0x0800, ioaddr);
                 }
         }
 
@@ -1418,13 +1444,13 @@ static int __devinit vortex_probe1(struct device *gendev,
                 static const char * ram_split[] = {"5:3", "3:1", "1:1", "3:5"};
                 unsigned int config;
                 EL3WINDOW(3);
-                vp->available_media = inw(ioaddr + Wn3_Options);
+                vp->available_media = ioread16(ioaddr + Wn3_Options);
                 if ((vp->available_media & 0xff) == 0)          /* Broken 3c916 */
                         vp->available_media = 0x40;
-                config = inl(ioaddr + Wn3_Config);
+                config = ioread32(ioaddr + Wn3_Config);
                 if (print_info) {
                         printk(KERN_DEBUG "  Internal config register is %4.4x, "
-                                   "transceivers %#x.\n", config, inw(ioaddr + Wn3_Options));
+                                   "transceivers %#x.\n", config, ioread16(ioaddr + Wn3_Options));
                         printk(KERN_INFO "  %dK %s-wide RAM %s Rx:Tx split, %s%s interface.\n",
                                    8 << RAM_SIZE(config),
                                    RAM_WIDTH(config) ? "word" : "byte",
@@ -1455,7 +1481,7 @@ static int __devinit vortex_probe1(struct device *gendev,
                 if (vp->drv_flags & EXTRA_PREAMBLE)
                         mii_preamble_required++;
                 mdio_sync(ioaddr, 32);
-                mdio_read(dev, 24, 1);
+                mdio_read(dev, 24, MII_BMSR);
                 for (phy = 0; phy < 32 && phy_idx < 1; phy++) {
                         int mii_status, phyx;
 
@@ -1469,7 +1495,7 @@ static int __devinit vortex_probe1(struct device *gendev,
                                 phyx = phy - 1;
                         else
                                 phyx = phy;
-                        mii_status = mdio_read(dev, phyx, 1);
+                        mii_status = mdio_read(dev, phyx, MII_BMSR);
                         if (mii_status  &&  mii_status != 0xffff) {
                                 vp->phys[phy_idx++] = phyx;
                                 if (print_info) {
@@ -1485,7 +1511,7 @@ static int __devinit vortex_probe1(struct device *gendev,
                         printk(KERN_WARNING"  ***WARNING*** No MII transceivers found!\n");
                         vp->phys[0] = 24;
                 } else {
-                        vp->advertising = mdio_read(dev, vp->phys[0], 4);
+                        vp->advertising = mdio_read(dev, vp->phys[0], MII_ADVERTISE);
                         if (vp->full_duplex) {
                                 /* Only advertise the FD media types. */
                                 vp->advertising &= ~0x02A0;
@@ -1510,10 +1536,10 @@ static int __devinit vortex_probe1(struct device *gendev,
         if (vp->full_bus_master_tx) {
                 dev->hard_start_xmit = boomerang_start_xmit;
                 /* Actually, it still should work with iommu. */
-                dev->features |= NETIF_F_SG;
-                if (((hw_checksums[card_idx] == -1) && (vp->drv_flags & HAS_HWCKSM)) ||
-                                        (hw_checksums[card_idx] == 1)) {
-                                dev->features |= NETIF_F_IP_CSUM;
+                if (card_idx < MAX_UNITS &&
+                    ((hw_checksums[card_idx] == -1 && (vp->drv_flags & HAS_HWCKSM)) ||
+                                hw_checksums[card_idx] == 1)) {
+                        dev->features |= NETIF_F_IP_CSUM | NETIF_F_SG;
                 }
         } else {
                 dev->hard_start_xmit = vortex_start_xmit;
@@ -1555,7 +1581,7 @@ free_ring:
                                                 vp->rx_ring_dma);
 free_region:
         if (vp->must_free_region)
-                release_region(ioaddr, vci->io_size);
+                release_region(dev->base_addr, vci->io_size);
         free_netdev(dev);
         printk(KERN_ERR PFX "vortex_probe1 fails.  Returns %d\n", retval);
 out:
@@ -1565,17 +1591,19 @@ out:
 static void
 issue_and_wait(struct net_device *dev, int cmd)
 {
+        struct vortex_private *vp = netdev_priv(dev);
+        void __iomem *ioaddr = vp->ioaddr;
         int i;
 
-        outw(cmd, dev->base_addr + EL3_CMD);
+        iowrite16(cmd, ioaddr + EL3_CMD);
         for (i = 0; i < 2000; i++) {
-                if (!(inw(dev->base_addr + EL3_STATUS) & CmdInProgress))
+                if (!(ioread16(ioaddr + EL3_STATUS) & CmdInProgress))
                         return;
         }
 
         /* OK, that didn't work.  Do it the slow way.  One second */
         for (i = 0; i < 100000; i++) {
-                if (!(inw(dev->base_addr + EL3_STATUS) & CmdInProgress)) {
+                if (!(ioread16(ioaddr + EL3_STATUS) & CmdInProgress)) {
                         if (vortex_debug > 1)
                                 printk(KERN_INFO "%s: command 0x%04x took %d usecs\n",
                                            dev->name, cmd, i * 10);
@@ -1584,14 +1612,14 @@ issue_and_wait(struct net_device *dev, int cmd)
                 udelay(10);
         }
         printk(KERN_ERR "%s: command 0x%04x did not complete! Status=0x%x\n",
-                           dev->name, cmd, inw(dev->base_addr + EL3_STATUS));
+                           dev->name, cmd, ioread16(ioaddr + EL3_STATUS));
 }
 
 static void
 vortex_up(struct net_device *dev)
 {
-        long ioaddr = dev->base_addr;
         struct vortex_private *vp = netdev_priv(dev);
+        void __iomem *ioaddr = vp->ioaddr;
         unsigned int config;
         int i;
 
@@ -1604,7 +1632,7 @@ vortex_up(struct net_device *dev)
 
         /* Before initializing select the active media port. */
         EL3WINDOW(3);
-        config = inl(ioaddr + Wn3_Config);
+        config = ioread32(ioaddr + Wn3_Config);
 
         if (vp->media_override != 7) {
                 printk(KERN_INFO "%s: Media override to transceiver %d (%s).\n",
@@ -1651,14 +1679,14 @@ vortex_up(struct net_device *dev)
         config = BFINS(config, dev->if_port, 20, 4);
         if (vortex_debug > 6)
                 printk(KERN_DEBUG "vortex_up(): writing 0x%x to InternalConfig\n", config);
-        outl(config, ioaddr + Wn3_Config);
+        iowrite32(config, ioaddr + Wn3_Config);
 
         if (dev->if_port == XCVR_MII || dev->if_port == XCVR_NWAY) {
                 int mii_reg1, mii_reg5;
                 EL3WINDOW(4);
                 /* Read BMSR (reg1) only to clear old status. */
-                mii_reg1 = mdio_read(dev, vp->phys[0], 1);
-                mii_reg5 = mdio_read(dev, vp->phys[0], 5);
+                mii_reg1 = mdio_read(dev, vp->phys[0], MII_BMSR);
+                mii_reg5 = mdio_read(dev, vp->phys[0], MII_LPA);
                 if (mii_reg5 == 0xffff  ||  mii_reg5 == 0x0000) {
                         netif_carrier_off(dev); /* No MII device or no link partner report */
                 } else {
@@ -1679,7 +1707,7 @@ vortex_up(struct net_device *dev)
         }
 
         /* Set the full-duplex bit. */
-        outw(   ((vp->info1 & 0x8000) || vp->full_duplex ? 0x20 : 0) |
+        iowrite16(      ((vp->info1 & 0x8000) || vp->full_duplex ? 0x20 : 0) |
                         (vp->large_frames ? 0x40 : 0) |
                         ((vp->full_duplex && vp->flow_ctrl && vp->partner_flow_ctrl) ? 0x100 : 0),
                         ioaddr + Wn3_MAC_Ctrl);
@@ -1695,51 +1723,51 @@ vortex_up(struct net_device *dev)
          */
         issue_and_wait(dev, RxReset|0x04);
 
-        outw(SetStatusEnb | 0x00, ioaddr + EL3_CMD);
+        iowrite16(SetStatusEnb | 0x00, ioaddr + EL3_CMD);
 
         if (vortex_debug > 1) {
                 EL3WINDOW(4);
                 printk(KERN_DEBUG "%s: vortex_up() irq %d media status %4.4x.\n",
-                           dev->name, dev->irq, inw(ioaddr + Wn4_Media));
+                           dev->name, dev->irq, ioread16(ioaddr + Wn4_Media));
         }
 
         /* Set the station address and mask in window 2 each time opened. */
         EL3WINDOW(2);
         for (i = 0; i < 6; i++)
-                outb(dev->dev_addr[i], ioaddr + i);
+                iowrite8(dev->dev_addr[i], ioaddr + i);
         for (; i < 12; i+=2)
-                outw(0, ioaddr + i);
+                iowrite16(0, ioaddr + i);
 
         if (vp->cb_fn_base) {
-                unsigned short n = inw(ioaddr + Wn2_ResetOptions) & ~0x4010;
+                unsigned short n = ioread16(ioaddr + Wn2_ResetOptions) & ~0x4010;
                 if (vp->drv_flags & INVERT_LED_PWR)
                         n |= 0x10;
                 if (vp->drv_flags & INVERT_MII_PWR)
                         n |= 0x4000;
-                outw(n, ioaddr + Wn2_ResetOptions);
+                iowrite16(n, ioaddr + Wn2_ResetOptions);
         }
 
         if (dev->if_port == XCVR_10base2)
                 /* Start the thinnet transceiver. We should really wait 50ms...*/
-                outw(StartCoax, ioaddr + EL3_CMD);
+                iowrite16(StartCoax, ioaddr + EL3_CMD);
         if (dev->if_port != XCVR_NWAY) {
                 EL3WINDOW(4);
-                outw((inw(ioaddr + Wn4_Media) & ~(Media_10TP|Media_SQE)) |
+                iowrite16((ioread16(ioaddr + Wn4_Media) & ~(Media_10TP|Media_SQE)) |
                          media_tbl[dev->if_port].media_bits, ioaddr + Wn4_Media);
         }
 
         /* Switch to the stats window, and clear all stats by reading. */
-        outw(StatsDisable, ioaddr + EL3_CMD);
+        iowrite16(StatsDisable, ioaddr + EL3_CMD);
         EL3WINDOW(6);
         for (i = 0; i < 10; i++)
-                inb(ioaddr + i);
-        inw(ioaddr + 10);
-        inw(ioaddr + 12);
+                ioread8(ioaddr + i);
+        ioread16(ioaddr + 10);
+        ioread16(ioaddr + 12);
         /* New: On the Vortex we must also clear the BadSSD counter. */
         EL3WINDOW(4);
-        inb(ioaddr + 12);
+        ioread8(ioaddr + 12);
         /* ..and on the Boomerang we enable the extra statistics bits. */
-        outw(0x0040, ioaddr + Wn4_NetDiag);
+        iowrite16(0x0040, ioaddr + Wn4_NetDiag);
 
         /* Switch to register set 7 for normal use. */
         EL3WINDOW(7);
@@ -1747,30 +1775,30 @@ vortex_up(struct net_device *dev)
         if (vp->full_bus_master_rx) { /* Boomerang bus master. */
                 vp->cur_rx = vp->dirty_rx = 0;
                 /* Initialize the RxEarly register as recommended. */
-                outw(SetRxThreshold + (1536>>2), ioaddr + EL3_CMD);
-                outl(0x0020, ioaddr + PktStatus);
-                outl(vp->rx_ring_dma, ioaddr + UpListPtr);
+                iowrite16(SetRxThreshold + (1536>>2), ioaddr + EL3_CMD);
+                iowrite32(0x0020, ioaddr + PktStatus);
+                iowrite32(vp->rx_ring_dma, ioaddr + UpListPtr);
         }
         if (vp->full_bus_master_tx) {           /* Boomerang bus master Tx. */
                 vp->cur_tx = vp->dirty_tx = 0;
                 if (vp->drv_flags & IS_BOOMERANG)
-                        outb(PKT_BUF_SZ>>8, ioaddr + TxFreeThreshold); /* Room for a packet. */
+                        iowrite8(PKT_BUF_SZ>>8, ioaddr + TxFreeThreshold); /* Room for a packet. */
                 /* Clear the Rx, Tx rings. */
                 for (i = 0; i < RX_RING_SIZE; i++)      /* AKPM: this is done in vortex_open, too */
                         vp->rx_ring[i].status = 0;
                 for (i = 0; i < TX_RING_SIZE; i++)
                         vp->tx_skbuff[i] = NULL;
-                outl(0, ioaddr + DownListPtr);
+                iowrite32(0, ioaddr + DownListPtr);
         }
         /* Set receiver mode: presumably accept b-case and phys addr only. */
         set_rx_mode(dev);
         /* enable 802.1q tagged frames */
         set_8021q_mode(dev, 1);
-        outw(StatsEnable, ioaddr + EL3_CMD); /* Turn on statistics. */
+        iowrite16(StatsEnable, ioaddr + EL3_CMD); /* Turn on statistics. */
 
 //      issue_and_wait(dev, SetTxStart|0x07ff);
-        outw(RxEnable, ioaddr + EL3_CMD); /* Enable the receiver. */
-        outw(TxEnable, ioaddr + EL3_CMD); /* Enable transmitter. */
+        iowrite16(RxEnable, ioaddr + EL3_CMD); /* Enable the receiver. */
+        iowrite16(TxEnable, ioaddr + EL3_CMD); /* Enable transmitter. */
         /* Allow status bits to be seen. */
         vp->status_enable = SetStatusEnb | HostError|IntReq|StatsFull|TxComplete|
                 (vp->full_bus_master_tx ? DownComplete : TxAvailable) |
@@ -1780,13 +1808,13 @@ vortex_up(struct net_device *dev)
                 (vp->full_bus_master_rx ? 0 : RxComplete) |
                 StatsFull | HostError | TxComplete | IntReq
                 | (vp->bus_master ? DMADone : 0) | UpComplete | DownComplete;
-        outw(vp->status_enable, ioaddr + EL3_CMD);
+        iowrite16(vp->status_enable, ioaddr + EL3_CMD);
         /* Ack all pending events, and set active indicator mask. */
-        outw(AckIntr | IntLatch | TxAvailable | RxEarly | IntReq,
+        iowrite16(AckIntr | IntLatch | TxAvailable | RxEarly | IntReq,
                  ioaddr + EL3_CMD);
-        outw(vp->intr_enable, ioaddr + EL3_CMD);
+        iowrite16(vp->intr_enable, ioaddr + EL3_CMD);
         if (vp->cb_fn_base)                     /* The PCMCIA people are idiots.  */
-                writel(0x8000, vp->cb_fn_base + 4);
+                iowrite32(0x8000, vp->cb_fn_base + 4);
         netif_start_queue (dev);
 }
 
@@ -1852,7 +1880,7 @@ vortex_timer(unsigned long data)
 {
         struct net_device *dev = (struct net_device *)data;
         struct vortex_private *vp = netdev_priv(dev);
-        long ioaddr = dev->base_addr;
+        void __iomem *ioaddr = vp->ioaddr;
         int next_tick = 60*HZ;
         int ok = 0;
         int media_status, mii_status, old_window;
@@ -1866,9 +1894,9 @@ vortex_timer(unsigned long data)
         if (vp->medialock)
                 goto leave_media_alone;
         disable_irq(dev->irq);
-        old_window = inw(ioaddr + EL3_CMD) >> 13;
+        old_window = ioread16(ioaddr + EL3_CMD) >> 13;
         EL3WINDOW(4);
-        media_status = inw(ioaddr + Wn4_Media);
+        media_status = ioread16(ioaddr + Wn4_Media);
         switch (dev->if_port) {
         case XCVR_10baseT:  case XCVR_100baseTx:  case XCVR_100baseFx:
                 if (media_status & Media_LnkBeat) {
@@ -1888,14 +1916,17 @@ vortex_timer(unsigned long data)
         case XCVR_MII: case XCVR_NWAY:
                 {
                         spin_lock_bh(&vp->lock);
-                        mii_status = mdio_read(dev, vp->phys[0], 1);
-                        mii_status = mdio_read(dev, vp->phys[0], 1);
+                        mii_status = mdio_read(dev, vp->phys[0], MII_BMSR);
+                        if (!(mii_status & BMSR_LSTATUS)) {
+                                /* Re-read to get actual link status */
+                                mii_status = mdio_read(dev, vp->phys[0], MII_BMSR);
+                        }
                         ok = 1;
                         if (vortex_debug > 2)
                                 printk(KERN_DEBUG "%s: MII transceiver has status %4.4x.\n",
                                         dev->name, mii_status);
                         if (mii_status & BMSR_LSTATUS) {
-                                int mii_reg5 = mdio_read(dev, vp->phys[0], 5);
+                                int mii_reg5 = mdio_read(dev, vp->phys[0], MII_LPA);
                                 if (! vp->force_fd  &&  mii_reg5 != 0xffff) {
                                         int duplex;
 
@@ -1909,7 +1940,7 @@ vortex_timer(unsigned long data)
                                                         vp->phys[0], mii_reg5);
                                                 /* Set the full-duplex bit. */
                                                 EL3WINDOW(3);
-                                                outw(   (vp->full_duplex ? 0x20 : 0) |
+                                                iowrite16(      (vp->full_duplex ? 0x20 : 0) |
                                                                 (vp->large_frames ? 0x40 : 0) |
                                                                 ((vp->full_duplex && vp->flow_ctrl && vp->partner_flow_ctrl) ? 0x100 : 0),
                                                                 ioaddr + Wn3_MAC_Ctrl);
@@ -1950,15 +1981,15 @@ vortex_timer(unsigned long data)
                                            dev->name, media_tbl[dev->if_port].name);
                         next_tick = media_tbl[dev->if_port].wait;
                 }
-                outw((media_status & ~(Media_10TP|Media_SQE)) |
+                iowrite16((media_status & ~(Media_10TP|Media_SQE)) |
                          media_tbl[dev->if_port].media_bits, ioaddr + Wn4_Media);
 
                 EL3WINDOW(3);
-                config = inl(ioaddr + Wn3_Config);
+                config = ioread32(ioaddr + Wn3_Config);
                 config = BFINS(config, dev->if_port, 20, 4);
-                outl(config, ioaddr + Wn3_Config);
+                iowrite32(config, ioaddr + Wn3_Config);
 
-                outw(dev->if_port == XCVR_10base2 ? StartCoax : StopCoax,
+                iowrite16(dev->if_port == XCVR_10base2 ? StartCoax : StopCoax,
                          ioaddr + EL3_CMD);
                 if (vortex_debug > 1)
                         printk(KERN_DEBUG "wrote 0x%08x to Wn3_Config\n", config);
@@ -1974,29 +2005,29 @@ leave_media_alone:
 
         mod_timer(&vp->timer, RUN_AT(next_tick));
         if (vp->deferred)
-                outw(FakeIntr, ioaddr + EL3_CMD);
+                iowrite16(FakeIntr, ioaddr + EL3_CMD);
         return;
 }
 
 static void vortex_tx_timeout(struct net_device *dev)
 {
         struct vortex_private *vp = netdev_priv(dev);
-        long ioaddr = dev->base_addr;
+        void __iomem *ioaddr = vp->ioaddr;
 
         printk(KERN_ERR "%s: transmit timed out, tx_status %2.2x status %4.4x.\n",
-                   dev->name, inb(ioaddr + TxStatus),
-                   inw(ioaddr + EL3_STATUS));
+                   dev->name, ioread8(ioaddr + TxStatus),
+                   ioread16(ioaddr + EL3_STATUS));
         EL3WINDOW(4);
         printk(KERN_ERR "  diagnostics: net %04x media %04x dma %08x fifo %04x\n",
-                        inw(ioaddr + Wn4_NetDiag),
-                        inw(ioaddr + Wn4_Media),
-                        inl(ioaddr + PktStatus),
-                        inw(ioaddr + Wn4_FIFODiag));
+                        ioread16(ioaddr + Wn4_NetDiag),
+                        ioread16(ioaddr + Wn4_Media),
+                        ioread32(ioaddr + PktStatus),
+                        ioread16(ioaddr + Wn4_FIFODiag));
         /* Slight code bloat to be user friendly. */
-        if ((inb(ioaddr + TxStatus) & 0x88) == 0x88)
+        if ((ioread8(ioaddr + TxStatus) & 0x88) == 0x88)
                 printk(KERN_ERR "%s: Transmitter encountered 16 collisions --"
                            " network cable problem?\n", dev->name);
-        if (inw(ioaddr + EL3_STATUS) & IntLatch) {
+        if (ioread16(ioaddr + EL3_STATUS) & IntLatch) {
                 printk(KERN_ERR "%s: Interrupt posted but not delivered --"
                            " IRQ blocked by another device?\n", dev->name);
                 /* Bad idea here.. but we might as well handle a few events. */
@@ -2022,21 +2053,21 @@ static void vortex_tx_timeout(struct net_device *dev)
         vp->stats.tx_errors++;
         if (vp->full_bus_master_tx) {
                 printk(KERN_DEBUG "%s: Resetting the Tx ring pointer.\n", dev->name);
-                if (vp->cur_tx - vp->dirty_tx > 0  &&  inl(ioaddr + DownListPtr) == 0)
-                        outl(vp->tx_ring_dma + (vp->dirty_tx % TX_RING_SIZE) * sizeof(struct boom_tx_desc),
+                if (vp->cur_tx - vp->dirty_tx > 0  &&  ioread32(ioaddr + DownListPtr) == 0)
+                        iowrite32(vp->tx_ring_dma + (vp->dirty_tx % TX_RING_SIZE) * sizeof(struct boom_tx_desc),
                                  ioaddr + DownListPtr);
                 if (vp->cur_tx - vp->dirty_tx < TX_RING_SIZE)
                         netif_wake_queue (dev);
                 if (vp->drv_flags & IS_BOOMERANG)
-                        outb(PKT_BUF_SZ>>8, ioaddr + TxFreeThreshold);
-                outw(DownUnstall, ioaddr + EL3_CMD);
+                        iowrite8(PKT_BUF_SZ>>8, ioaddr + TxFreeThreshold);
+                iowrite16(DownUnstall, ioaddr + EL3_CMD);
         } else {
                 vp->stats.tx_dropped++;
                 netif_wake_queue(dev);
         }
         
         /* Issue Tx Enable */
-        outw(TxEnable, ioaddr + EL3_CMD);
+        iowrite16(TxEnable, ioaddr + EL3_CMD);
         dev->trans_start = jiffies;
         
         /* Switch to register set 7 for normal use. */
@@ -2051,7 +2082,7 @@ static void
 vortex_error(struct net_device *dev, int status)
 {
         struct vortex_private *vp = netdev_priv(dev);
-        long ioaddr = dev->base_addr;
+        void __iomem *ioaddr = vp->ioaddr;
         int do_tx_reset = 0, reset_mask = 0;
         unsigned char tx_status = 0;
 
@@ -2060,7 +2091,7 @@ vortex_error(struct net_device *dev, int status)
         }
 
         if (status & TxComplete) {                      /* Really "TxError" for us. */
-                tx_status = inb(ioaddr + TxStatus);
+                tx_status = ioread8(ioaddr + TxStatus);
                 /* Presumably a tx-timeout. We must merely re-enable. */
                 if (vortex_debug > 2
                         || (tx_status != 0x88 && vortex_debug > 0)) {
@@ -2074,20 +2105,20 @@ vortex_error(struct net_device *dev, int status)
                 }
                 if (tx_status & 0x14)  vp->stats.tx_fifo_errors++;
                 if (tx_status & 0x38)  vp->stats.tx_aborted_errors++;
-                outb(0, ioaddr + TxStatus);
+                iowrite8(0, ioaddr + TxStatus);
                 if (tx_status & 0x30) {                 /* txJabber or txUnderrun */
                         do_tx_reset = 1;
                 } else if ((tx_status & 0x08) && (vp->drv_flags & MAX_COLLISION_RESET)) {       /* maxCollisions */
                         do_tx_reset = 1;
                         reset_mask = 0x0108;            /* Reset interface logic, but not download logic */
                 } else {                                                /* Merely re-enable the transmitter. */
-                        outw(TxEnable, ioaddr + EL3_CMD);
+                        iowrite16(TxEnable, ioaddr + EL3_CMD);
                 }
         }
 
         if (status & RxEarly) {                         /* Rx early is unused. */
                 vortex_rx(dev);
-                outw(AckIntr | RxEarly, ioaddr + EL3_CMD);
+                iowrite16(AckIntr | RxEarly, ioaddr + EL3_CMD);
         }
         if (status & StatsFull) {                       /* Empty statistics. */
                 static int DoneDidThat;
@@ -2097,29 +2128,29 @@ vortex_error(struct net_device *dev, int status)
                 /* HACK: Disable statistics as an interrupt source. */
                 /* This occurs when we have the wrong media type! */
                 if (DoneDidThat == 0  &&
-                        inw(ioaddr + EL3_STATUS) & StatsFull) {
+                        ioread16(ioaddr + EL3_STATUS) & StatsFull) {
                         printk(KERN_WARNING "%s: Updating statistics failed, disabling "
                                    "stats as an interrupt source.\n", dev->name);
                         EL3WINDOW(5);
-                        outw(SetIntrEnb | (inw(ioaddr + 10) & ~StatsFull), ioaddr + EL3_CMD);
+                        iowrite16(SetIntrEnb | (ioread16(ioaddr + 10) & ~StatsFull), ioaddr + EL3_CMD);
                         vp->intr_enable &= ~StatsFull;
                         EL3WINDOW(7);
                         DoneDidThat++;
                 }
         }
         if (status & IntReq) {          /* Restore all interrupt sources.  */
-                outw(vp->status_enable, ioaddr + EL3_CMD);
-                outw(vp->intr_enable, ioaddr + EL3_CMD);
+                iowrite16(vp->status_enable, ioaddr + EL3_CMD);
+                iowrite16(vp->intr_enable, ioaddr + EL3_CMD);
         }
         if (status & HostError) {
                 u16 fifo_diag;
                 EL3WINDOW(4);
-                fifo_diag = inw(ioaddr + Wn4_FIFODiag);
+                fifo_diag = ioread16(ioaddr + Wn4_FIFODiag);
                 printk(KERN_ERR "%s: Host error, FIFO diagnostic register %4.4x.\n",
                            dev->name, fifo_diag);
                 /* Adapter failure requires Tx/Rx reset and reinit. */
                 if (vp->full_bus_master_tx) {
-                        int bus_status = inl(ioaddr + PktStatus);
+                        int bus_status = ioread32(ioaddr + PktStatus);
                         /* 0x80000000 PCI master abort. */
                         /* 0x40000000 PCI target abort. */
                         if (vortex_debug)
@@ -2139,14 +2170,14 @@ vortex_error(struct net_device *dev, int status)
                         set_rx_mode(dev);
                         /* enable 802.1q VLAN tagged frames */
                         set_8021q_mode(dev, 1);
-                        outw(RxEnable, ioaddr + EL3_CMD); /* Re-enable the receiver. */
-                        outw(AckIntr | HostError, ioaddr + EL3_CMD);
+                        iowrite16(RxEnable, ioaddr + EL3_CMD); /* Re-enable the receiver. */
+                        iowrite16(AckIntr | HostError, ioaddr + EL3_CMD);
                 }
         }
 
         if (do_tx_reset) {
                 issue_and_wait(dev, TxReset|reset_mask);
-                outw(TxEnable, ioaddr + EL3_CMD);
+                iowrite16(TxEnable, ioaddr + EL3_CMD);
                 if (!vp->full_bus_master_tx)
                         netif_wake_queue(dev);
         }
@@ -2156,29 +2187,29 @@ static int
 vortex_start_xmit(struct sk_buff *skb, struct net_device *dev)
 {
         struct vortex_private *vp = netdev_priv(dev);
-        long ioaddr = dev->base_addr;
+        void __iomem *ioaddr = vp->ioaddr;
 
         /* Put out the doubleword header... */
-        outl(skb->len, ioaddr + TX_FIFO);
+        iowrite32(skb->len, ioaddr + TX_FIFO);
         if (vp->bus_master) {
                 /* Set the bus-master controller to transfer the packet. */
                 int len = (skb->len + 3) & ~3;
-                outl(   vp->tx_skb_dma = pci_map_single(VORTEX_PCI(vp), skb->data, len, PCI_DMA_TODEVICE),
+                iowrite32(      vp->tx_skb_dma = pci_map_single(VORTEX_PCI(vp), skb->data, len, PCI_DMA_TODEVICE),
                                 ioaddr + Wn7_MasterAddr);
-                outw(len, ioaddr + Wn7_MasterLen);
+                iowrite16(len, ioaddr + Wn7_MasterLen);
                 vp->tx_skb = skb;
-                outw(StartDMADown, ioaddr + EL3_CMD);
+                iowrite16(StartDMADown, ioaddr + EL3_CMD);
                 /* netif_wake_queue() will be called at the DMADone interrupt. */
         } else {
                 /* ... and the packet rounded to a doubleword. */
-                outsl(ioaddr + TX_FIFO, skb->data, (skb->len + 3) >> 2);
+                iowrite32_rep(ioaddr + TX_FIFO, skb->data, (skb->len + 3) >> 2);
                 dev_kfree_skb (skb);
-                if (inw(ioaddr + TxFree) > 1536) {
+                if (ioread16(ioaddr + TxFree) > 1536) {
                         netif_start_queue (dev);        /* AKPM: redundant? */
                 } else {
                         /* Interrupt us when the FIFO has room for max-sized packet. */
                         netif_stop_queue(dev);
-                        outw(SetTxThreshold + (1536>>2), ioaddr + EL3_CMD);
+                        iowrite16(SetTxThreshold + (1536>>2), ioaddr + EL3_CMD);
                 }
         }
 
@@ -2189,7 +2220,7 @@ vortex_start_xmit(struct sk_buff *skb, struct net_device *dev)
                 int tx_status;
                 int i = 32;
 
-                while (--i > 0  &&      (tx_status = inb(ioaddr + TxStatus)) > 0) {
+                while (--i > 0  &&      (tx_status = ioread8(ioaddr + TxStatus)) > 0) {
                         if (tx_status & 0x3C) {         /* A Tx-disabling error occurred.  */
                                 if (vortex_debug > 2)
                                   printk(KERN_DEBUG "%s: Tx error, status %2.2x.\n",
@@ -2199,9 +2230,9 @@ vortex_start_xmit(struct sk_buff *skb, struct net_device *dev)
                                 if (tx_status & 0x30) {
                                         issue_and_wait(dev, TxReset);
                                 }
-                                outw(TxEnable, ioaddr + EL3_CMD);
+                                iowrite16(TxEnable, ioaddr + EL3_CMD);
                         }
-                        outb(0x00, ioaddr + TxStatus); /* Pop the status stack. */
+                        iowrite8(0x00, ioaddr + TxStatus); /* Pop the status stack. */
                 }
         }
         return 0;
@@ -2211,7 +2242,7 @@ static int
 boomerang_start_xmit(struct sk_buff *skb, struct net_device *dev)
 {
         struct vortex_private *vp = netdev_priv(dev);
-        long ioaddr = dev->base_addr;
+        void __iomem *ioaddr = vp->ioaddr;
         /* Calculate the next Tx descriptor entry. */
         int entry = vp->cur_tx % TX_RING_SIZE;
         struct boom_tx_desc *prev_entry = &vp->tx_ring[(vp->cur_tx-1) % TX_RING_SIZE];
@@ -2275,8 +2306,8 @@ boomerang_start_xmit(struct sk_buff *skb, struct net_device *dev)
         /* Wait for the stall to complete. */
         issue_and_wait(dev, DownStall);
         prev_entry->next = cpu_to_le32(vp->tx_ring_dma + entry * sizeof(struct boom_tx_desc));
-        if (inl(ioaddr + DownListPtr) == 0) {
-                outl(vp->tx_ring_dma + entry * sizeof(struct boom_tx_desc), ioaddr + DownListPtr);
+        if (ioread32(ioaddr + DownListPtr) == 0) {
+                iowrite32(vp->tx_ring_dma + entry * sizeof(struct boom_tx_desc), ioaddr + DownListPtr);
                 vp->queued_packet++;
         }
 
@@ -2291,7 +2322,7 @@ boomerang_start_xmit(struct sk_buff *skb, struct net_device *dev)
                 prev_entry->status &= cpu_to_le32(~TxIntrUploaded);
 #endif
         }
-        outw(DownUnstall, ioaddr + EL3_CMD);
+        iowrite16(DownUnstall, ioaddr + EL3_CMD);
         spin_unlock_irqrestore(&vp->lock, flags);
         dev->trans_start = jiffies;
         return 0;
@@ -2310,15 +2341,15 @@ vortex_interrupt(int irq, void *dev_id, struct pt_regs *regs)
 {
         struct net_device *dev = dev_id;
         struct vortex_private *vp = netdev_priv(dev);
-        long ioaddr;
+        void __iomem *ioaddr;
         int status;
         int work_done = max_interrupt_work;
         int handled = 0;
 
-        ioaddr = dev->base_addr;
+        ioaddr = vp->ioaddr;
         spin_lock(&vp->lock);
 
-        status = inw(ioaddr + EL3_STATUS);
+        status = ioread16(ioaddr + EL3_STATUS);
 
         if (vortex_debug > 6)
                 printk("vortex_interrupt(). status=0x%4x\n", status);
@@ -2337,7 +2368,7 @@ vortex_interrupt(int irq, void *dev_id, struct pt_regs *regs)
 
         if (vortex_debug > 4)
                 printk(KERN_DEBUG "%s: interrupt, status %4.4x, latency %d ticks.\n",
-                           dev->name, status, inb(ioaddr + Timer));
+                           dev->name, status, ioread8(ioaddr + Timer));
 
         do {
                 if (vortex_debug > 5)
@@ -2350,16 +2381,16 @@ vortex_interrupt(int irq, void *dev_id, struct pt_regs *regs)
                         if (vortex_debug > 5)
                                 printk(KERN_DEBUG "     TX room bit was handled.\n");
                         /* There's room in the FIFO for a full-sized packet. */
-                        outw(AckIntr | TxAvailable, ioaddr + EL3_CMD);
+                        iowrite16(AckIntr | TxAvailable, ioaddr + EL3_CMD);
                         netif_wake_queue (dev);
                 }
 
                 if (status & DMADone) {
-                        if (inw(ioaddr + Wn7_MasterStatus) & 0x1000) {
-                                outw(0x1000, ioaddr + Wn7_MasterStatus); /* Ack the event. */
+                        if (ioread16(ioaddr + Wn7_MasterStatus) & 0x1000) {
+                                iowrite16(0x1000, ioaddr + Wn7_MasterStatus); /* Ack the event. */
                                 pci_unmap_single(VORTEX_PCI(vp), vp->tx_skb_dma, (vp->tx_skb->len + 3) & ~3, PCI_DMA_TODEVICE);
                                 dev_kfree_skb_irq(vp->tx_skb); /* Release the transferred buffer */
-                                if (inw(ioaddr + TxFree) > 1536) {
+                                if (ioread16(ioaddr + TxFree) > 1536) {
                                         /*
                                          * AKPM: FIXME: I don't think we need this.  If the queue was stopped due to
                                          * insufficient FIFO room, the TxAvailable test will succeed and call
@@ -2367,7 +2398,7 @@ vortex_interrupt(int irq, void *dev_id, struct pt_regs *regs)
                                          */
                                         netif_wake_queue(dev);
                                 } else { /* Interrupt when FIFO has room for max-sized packet. */
-                                        outw(SetTxThreshold + (1536>>2), ioaddr + EL3_CMD);
+                                        iowrite16(SetTxThreshold + (1536>>2), ioaddr + EL3_CMD);
                                         netif_stop_queue(dev);
                                 }
                         }
@@ -2385,17 +2416,17 @@ vortex_interrupt(int irq, void *dev_id, struct pt_regs *regs)
                         /* Disable all pending interrupts. */
                         do {
                                 vp->deferred |= status;
-                                outw(SetStatusEnb | (~vp->deferred & vp->status_enable),
+                                iowrite16(SetStatusEnb | (~vp->deferred & vp->status_enable),
                                          ioaddr + EL3_CMD);
-                                outw(AckIntr | (vp->deferred & 0x7ff), ioaddr + EL3_CMD);
-                        } while ((status = inw(ioaddr + EL3_CMD)) & IntLatch);
+                                iowrite16(AckIntr | (vp->deferred & 0x7ff), ioaddr + EL3_CMD);
+                        } while ((status = ioread16(ioaddr + EL3_CMD)) & IntLatch);
                         /* The timer will reenable interrupts. */
                         mod_timer(&vp->timer, jiffies + 1*HZ);
                         break;
                 }
                 /* Acknowledge the IRQ. */
-                outw(AckIntr | IntReq | IntLatch, ioaddr + EL3_CMD);
-        } while ((status = inw(ioaddr + EL3_STATUS)) & (IntLatch | RxComplete));
+                iowrite16(AckIntr | IntReq | IntLatch, ioaddr + EL3_CMD);
+        } while ((status = ioread16(ioaddr + EL3_STATUS)) & (IntLatch | RxComplete));
 
         if (vortex_debug > 4)
                 printk(KERN_DEBUG "%s: exiting interrupt, status %4.4x.\n",
@@ -2415,11 +2446,11 @@ boomerang_interrupt(int irq, void *dev_id, struct pt_regs *regs)
 {
         struct net_device *dev = dev_id;
         struct vortex_private *vp = netdev_priv(dev);
-        long ioaddr;
+        void __iomem *ioaddr;
         int status;
         int work_done = max_interrupt_work;
 
-        ioaddr = dev->base_addr;
+        ioaddr = vp->ioaddr;
 
         /*
          * It seems dopey to put the spinlock this early, but we could race against vortex_tx_timeout
@@ -2427,7 +2458,7 @@ boomerang_interrupt(int irq, void *dev_id, struct pt_regs *regs)
          */
         spin_lock(&vp->lock);
 
-        status = inw(ioaddr + EL3_STATUS);
+        status = ioread16(ioaddr + EL3_STATUS);
 
         if (vortex_debug > 6)
                 printk(KERN_DEBUG "boomerang_interrupt. status=0x%4x\n", status);
@@ -2448,13 +2479,13 @@ boomerang_interrupt(int irq, void *dev_id, struct pt_regs *regs)
 
         if (vortex_debug > 4)
                 printk(KERN_DEBUG "%s: interrupt, status %4.4x, latency %d ticks.\n",
-                           dev->name, status, inb(ioaddr + Timer));
+                           dev->name, status, ioread8(ioaddr + Timer));
         do {
                 if (vortex_debug > 5)
                                 printk(KERN_DEBUG "%s: In interrupt loop, status %4.4x.\n",
                                            dev->name, status);
                 if (status & UpComplete) {
-                        outw(AckIntr | UpComplete, ioaddr + EL3_CMD);
+                        iowrite16(AckIntr | UpComplete, ioaddr + EL3_CMD);
                         if (vortex_debug > 5)
                                 printk(KERN_DEBUG "boomerang_interrupt->boomerang_rx\n");
                         boomerang_rx(dev);
@@ -2463,11 +2494,11 @@ boomerang_interrupt(int irq, void *dev_id, struct pt_regs *regs)
                 if (status & DownComplete) {
                         unsigned int dirty_tx = vp->dirty_tx;
 
-                        outw(AckIntr | DownComplete, ioaddr + EL3_CMD);
+                        iowrite16(AckIntr | DownComplete, ioaddr + EL3_CMD);
                         while (vp->cur_tx - dirty_tx > 0) {
                                 int entry = dirty_tx % TX_RING_SIZE;
 #if 1   /* AKPM: the latter is faster, but cyclone-only */
-                                if (inl(ioaddr + DownListPtr) ==
+                                if (ioread32(ioaddr + DownListPtr) ==
                                         vp->tx_ring_dma + entry * sizeof(struct boom_tx_desc))
                                         break;                  /* It still hasn't been processed. */
 #else
@@ -2514,20 +2545,20 @@ boomerang_interrupt(int irq, void *dev_id, struct pt_regs *regs)
                         /* Disable all pending interrupts. */
                         do {
                                 vp->deferred |= status;
-                                outw(SetStatusEnb | (~vp->deferred & vp->status_enable),
+                                iowrite16(SetStatusEnb | (~vp->deferred & vp->status_enable),
                                          ioaddr + EL3_CMD);
-                                outw(AckIntr | (vp->deferred & 0x7ff), ioaddr + EL3_CMD);
-                        } while ((status = inw(ioaddr + EL3_CMD)) & IntLatch);
+                                iowrite16(AckIntr | (vp->deferred & 0x7ff), ioaddr + EL3_CMD);
+                        } while ((status = ioread16(ioaddr + EL3_CMD)) & IntLatch);
                         /* The timer will reenable interrupts. */
                         mod_timer(&vp->timer, jiffies + 1*HZ);
                         break;
                 }
                 /* Acknowledge the IRQ. */
-                outw(AckIntr | IntReq | IntLatch, ioaddr + EL3_CMD);
+                iowrite16(AckIntr | IntReq | IntLatch, ioaddr + EL3_CMD);
                 if (vp->cb_fn_base)                     /* The PCMCIA people are idiots.  */
-                        writel(0x8000, vp->cb_fn_base + 4);
+                        iowrite32(0x8000, vp->cb_fn_base + 4);
 
-        } while ((status = inw(ioaddr + EL3_STATUS)) & IntLatch);
+        } while ((status = ioread16(ioaddr + EL3_STATUS)) & IntLatch);
 
         if (vortex_debug > 4)
                 printk(KERN_DEBUG "%s: exiting interrupt, status %4.4x.\n",
@@ -2540,16 +2571,16 @@ handler_exit:
 static int vortex_rx(struct net_device *dev)
 {
         struct vortex_private *vp = netdev_priv(dev);
-        long ioaddr = dev->base_addr;
+        void __iomem *ioaddr = vp->ioaddr;
         int i;
         short rx_status;
 
         if (vortex_debug > 5)
                 printk(KERN_DEBUG "vortex_rx(): status %4.4x, rx_status %4.4x.\n",
-                           inw(ioaddr+EL3_STATUS), inw(ioaddr+RxStatus));
-        while ((rx_status = inw(ioaddr + RxStatus)) > 0) {
+                           ioread16(ioaddr+EL3_STATUS), ioread16(ioaddr+RxStatus));
+        while ((rx_status = ioread16(ioaddr + RxStatus)) > 0) {
                 if (rx_status & 0x4000) { /* Error, update stats. */
-                        unsigned char rx_error = inb(ioaddr + RxErrors);
+                        unsigned char rx_error = ioread8(ioaddr + RxErrors);
                         if (vortex_debug > 2)
                                 printk(KERN_DEBUG " Rx error: status %2.2x.\n", rx_error);
                         vp->stats.rx_errors++;
@@ -2572,34 +2603,35 @@ static int vortex_rx(struct net_device *dev)
                                 skb_reserve(skb, 2);    /* Align IP on 16 byte boundaries */
                                 /* 'skb_put()' points to the start of sk_buff data area. */
                                 if (vp->bus_master &&
-                                        ! (inw(ioaddr + Wn7_MasterStatus) & 0x8000)) {
+                                        ! (ioread16(ioaddr + Wn7_MasterStatus) & 0x8000)) {
                                         dma_addr_t dma = pci_map_single(VORTEX_PCI(vp), skb_put(skb, pkt_len),
                                                                            pkt_len, PCI_DMA_FROMDEVICE);
-                                        outl(dma, ioaddr + Wn7_MasterAddr);
-                                        outw((skb->len + 3) & ~3, ioaddr + Wn7_MasterLen);
-                                        outw(StartDMAUp, ioaddr + EL3_CMD);
-                                        while (inw(ioaddr + Wn7_MasterStatus) & 0x8000)
+                                        iowrite32(dma, ioaddr + Wn7_MasterAddr);
+                                        iowrite16((skb->len + 3) & ~3, ioaddr + Wn7_MasterLen);
+                                        iowrite16(StartDMAUp, ioaddr + EL3_CMD);
+                                        while (ioread16(ioaddr + Wn7_MasterStatus) & 0x8000)
                                                 ;
                                         pci_unmap_single(VORTEX_PCI(vp), dma, pkt_len, PCI_DMA_FROMDEVICE);
                                 } else {
-                                        insl(ioaddr + RX_FIFO, skb_put(skb, pkt_len),
-                                                 (pkt_len + 3) >> 2);
+                                        ioread32_rep(ioaddr + RX_FIFO,
+                                                     skb_put(skb, pkt_len),
+                                                     (pkt_len + 3) >> 2);
                                 }
-                                outw(RxDiscard, ioaddr + EL3_CMD); /* Pop top Rx packet. */
+                                iowrite16(RxDiscard, ioaddr + EL3_CMD); /* Pop top Rx packet. */
                                 skb->protocol = eth_type_trans(skb, dev);
                                 netif_rx(skb);
                                 dev->last_rx = jiffies;
                                 vp->stats.rx_packets++;
                                 /* Wait a limited time to go to next packet. */
                                 for (i = 200; i >= 0; i--)
-                                        if ( ! (inw(ioaddr + EL3_STATUS) & CmdInProgress))
+                                        if ( ! (ioread16(ioaddr + EL3_STATUS) & CmdInProgress))
                                                 break;
                                 continue;
                         } else if (vortex_debug > 0)
                                 printk(KERN_NOTICE "%s: No memory to allocate a sk_buff of "
                                            "size %d.\n", dev->name, pkt_len);
+                        vp->stats.rx_dropped++;
                 }
-                vp->stats.rx_dropped++;
                 issue_and_wait(dev, RxDiscard);
         }
 
@@ -2611,12 +2643,12 @@ boomerang_rx(struct net_device *dev)
 {
         struct vortex_private *vp = netdev_priv(dev);
         int entry = vp->cur_rx % RX_RING_SIZE;
-        long ioaddr = dev->base_addr;
+        void __iomem *ioaddr = vp->ioaddr;
         int rx_status;
         int rx_work_limit = vp->dirty_rx + RX_RING_SIZE - vp->cur_rx;
 
         if (vortex_debug > 5)
-                printk(KERN_DEBUG "boomerang_rx(): status %4.4x\n", inw(ioaddr+EL3_STATUS));
+                printk(KERN_DEBUG "boomerang_rx(): status %4.4x\n", ioread16(ioaddr+EL3_STATUS));
 
         while ((rx_status = le32_to_cpu(vp->rx_ring[entry].status)) & RxDComplete){
                 if (--rx_work_limit < 0)
@@ -2699,7 +2731,7 @@ boomerang_rx(struct net_device *dev)
                         vp->rx_skbuff[entry] = skb;
                 }
                 vp->rx_ring[entry].status = 0;  /* Clear complete bit. */
-                outw(UpUnstall, ioaddr + EL3_CMD);
+                iowrite16(UpUnstall, ioaddr + EL3_CMD);
         }
         return 0;
 }
@@ -2728,7 +2760,7 @@ static void
 vortex_down(struct net_device *dev, int final_down)
 {
         struct vortex_private *vp = netdev_priv(dev);
-        long ioaddr = dev->base_addr;
+        void __iomem *ioaddr = vp->ioaddr;
 
         netif_stop_queue (dev);
 
@@ -2736,26 +2768,26 @@ vortex_down(struct net_device *dev, int final_down)
         del_timer_sync(&vp->timer);
 
         /* Turn off statistics ASAP.  We update vp->stats below. */
-        outw(StatsDisable, ioaddr + EL3_CMD);
+        iowrite16(StatsDisable, ioaddr + EL3_CMD);
 
         /* Disable the receiver and transmitter. */
-        outw(RxDisable, ioaddr + EL3_CMD);
-        outw(TxDisable, ioaddr + EL3_CMD);
+        iowrite16(RxDisable, ioaddr + EL3_CMD);
+        iowrite16(TxDisable, ioaddr + EL3_CMD);
 
         /* Disable receiving 802.1q tagged frames */
         set_8021q_mode(dev, 0);
 
         if (dev->if_port == XCVR_10base2)
                 /* Turn off thinnet power.  Green! */
-                outw(StopCoax, ioaddr + EL3_CMD);
+                iowrite16(StopCoax, ioaddr + EL3_CMD);
 
-        outw(SetIntrEnb | 0x0000, ioaddr + EL3_CMD);
+        iowrite16(SetIntrEnb | 0x0000, ioaddr + EL3_CMD);
 
         update_stats(ioaddr, dev);
         if (vp->full_bus_master_rx)
-                outl(0, ioaddr + UpListPtr);
+                iowrite32(0, ioaddr + UpListPtr);
         if (vp->full_bus_master_tx)
-                outl(0, ioaddr + DownListPtr);
+                iowrite32(0, ioaddr + DownListPtr);
 
         if (final_down && VORTEX_PCI(vp)) {
                 vp->pm_state_valid = 1;
@@ -2768,7 +2800,7 @@ static int
 vortex_close(struct net_device *dev)
 {
         struct vortex_private *vp = netdev_priv(dev);
-        long ioaddr = dev->base_addr;
+        void __iomem *ioaddr = vp->ioaddr;
         int i;
 
         if (netif_device_present(dev))
@@ -2776,17 +2808,18 @@ vortex_close(struct net_device *dev)
 
         if (vortex_debug > 1) {
                 printk(KERN_DEBUG"%s: vortex_close() status %4.4x, Tx status %2.2x.\n",
-                           dev->name, inw(ioaddr + EL3_STATUS), inb(ioaddr + TxStatus));
+                           dev->name, ioread16(ioaddr + EL3_STATUS), ioread8(ioaddr + TxStatus));
                 printk(KERN_DEBUG "%s: vortex close stats: rx_nocopy %d rx_copy %d"
                            " tx_queued %d Rx pre-checksummed %d.\n",
                            dev->name, vp->rx_nocopy, vp->rx_copy, vp->queued_packet, vp->rx_csumhits);
         }
 
 #if DO_ZEROCOPY
-        if (    vp->rx_csumhits &&
-                        ((vp->drv_flags & HAS_HWCKSM) == 0) &&
-                        (hw_checksums[vp->card_idx] == -1)) {
-                printk(KERN_WARNING "%s supports hardware checksums, and we're not using them!\n", dev->name);
+        if (vp->rx_csumhits &&
+            (vp->drv_flags & HAS_HWCKSM) == 0 &&
+            (vp->card_idx >= MAX_UNITS || hw_checksums[vp->card_idx] == -1)) {
+                        printk(KERN_WARNING "%s supports hardware checksums, and we're "
+                                                "not using them!\n", dev->name);
         }
 #endif
                 
@@ -2830,18 +2863,18 @@ dump_tx_ring(struct net_device *dev)
 {
         if (vortex_debug > 0) {
         struct vortex_private *vp = netdev_priv(dev);
-                long ioaddr = dev->base_addr;
+                void __iomem *ioaddr = vp->ioaddr;
                 
                 if (vp->full_bus_master_tx) {
                         int i;
-                        int stalled = inl(ioaddr + PktStatus) & 0x04;   /* Possible racy. But it's only debug stuff */
+                        int stalled = ioread32(ioaddr + PktStatus) & 0x04;      /* Possible racy. But it's only debug stuff */
 
                         printk(KERN_ERR "  Flags; bus-master %d, dirty %d(%d) current %d(%d)\n",
                                         vp->full_bus_master_tx,
                                         vp->dirty_tx, vp->dirty_tx % TX_RING_SIZE,
                                         vp->cur_tx, vp->cur_tx % TX_RING_SIZE);
                         printk(KERN_ERR "  Transmit list %8.8x vs. %p.\n",
-                                   inl(ioaddr + DownListPtr),
+                                   ioread32(ioaddr + DownListPtr),
                                    &vp->tx_ring[vp->dirty_tx % TX_RING_SIZE]);
                         issue_and_wait(dev, DownStall);
                         for (i = 0; i < TX_RING_SIZE; i++) {
@@ -2855,7 +2888,7 @@ dump_tx_ring(struct net_device *dev)
                                            le32_to_cpu(vp->tx_ring[i].status));
                         }
                         if (!stalled)
-                                outw(DownUnstall, ioaddr + EL3_CMD);
+                                iowrite16(DownUnstall, ioaddr + EL3_CMD);
                 }
         }
 }
@@ -2863,11 +2896,12 @@ dump_tx_ring(struct net_device *dev)
 static struct net_device_stats *vortex_get_stats(struct net_device *dev)
 {
         struct vortex_private *vp = netdev_priv(dev);
+        void __iomem *ioaddr = vp->ioaddr;
         unsigned long flags;
 
         if (netif_device_present(dev)) {        /* AKPM: Used to be netif_running */
                 spin_lock_irqsave (&vp->lock, flags);
-                update_stats(dev->base_addr, dev);
+                update_stats(ioaddr, dev);
                 spin_unlock_irqrestore (&vp->lock, flags);
         }
         return &vp->stats;
@@ -2880,37 +2914,37 @@ static struct net_device_stats *vortex_get_stats(struct net_device *dev)
         table.  This is done by checking that the ASM (!) code generated uses
         atomic updates with '+='.
         */
-static void update_stats(long ioaddr, struct net_device *dev)
+static void update_stats(void __iomem *ioaddr, struct net_device *dev)
 {
         struct vortex_private *vp = netdev_priv(dev);
-        int old_window = inw(ioaddr + EL3_CMD);
+        int old_window = ioread16(ioaddr + EL3_CMD);
 
         if (old_window == 0xffff)       /* Chip suspended or ejected. */
                 return;
         /* Unlike the 3c5x9 we need not turn off stats updates while reading. */
         /* Switch to the stats window, and read everything. */
         EL3WINDOW(6);
-        vp->stats.tx_carrier_errors             += inb(ioaddr + 0);
-        vp->stats.tx_heartbeat_errors           += inb(ioaddr + 1);
-        vp->stats.collisions                    += inb(ioaddr + 3);
-        vp->stats.tx_window_errors              += inb(ioaddr + 4);
-        vp->stats.rx_fifo_errors                += inb(ioaddr + 5);
-        vp->stats.tx_packets                    += inb(ioaddr + 6);
-        vp->stats.tx_packets                    += (inb(ioaddr + 9)&0x30) << 4;
-        /* Rx packets   */                      inb(ioaddr + 7);   /* Must read to clear */
+        vp->stats.tx_carrier_errors             += ioread8(ioaddr + 0);
+        vp->stats.tx_heartbeat_errors           += ioread8(ioaddr + 1);
+        vp->stats.collisions                    += ioread8(ioaddr + 3);
+        vp->stats.tx_window_errors              += ioread8(ioaddr + 4);
+        vp->stats.rx_fifo_errors                += ioread8(ioaddr + 5);
+        vp->stats.tx_packets                    += ioread8(ioaddr + 6);
+        vp->stats.tx_packets                    += (ioread8(ioaddr + 9)&0x30) << 4;
+        /* Rx packets   */                      ioread8(ioaddr + 7);   /* Must read to clear */
         /* Don't bother with register 9, an extension of registers 6&7.
            If we do use the 6&7 values the atomic update assumption above
            is invalid. */
-        vp->stats.rx_bytes                      += inw(ioaddr + 10);
-        vp->stats.tx_bytes                      += inw(ioaddr + 12);
+        vp->stats.rx_bytes                      += ioread16(ioaddr + 10);
+        vp->stats.tx_bytes                      += ioread16(ioaddr + 12);
         /* Extra stats for get_ethtool_stats() */
-        vp->xstats.tx_multiple_collisions       += inb(ioaddr + 2);
-        vp->xstats.tx_deferred                  += inb(ioaddr + 8);
+        vp->xstats.tx_multiple_collisions       += ioread8(ioaddr + 2);
+        vp->xstats.tx_deferred                  += ioread8(ioaddr + 8);
         EL3WINDOW(4);
-        vp->xstats.rx_bad_ssd                   += inb(ioaddr + 12);
+        vp->xstats.rx_bad_ssd                   += ioread8(ioaddr + 12);
 
         {
-                u8 up = inb(ioaddr + 13);
+                u8 up = ioread8(ioaddr + 13);
                 vp->stats.rx_bytes += (up & 0x0f) << 16;
                 vp->stats.tx_bytes += (up & 0xf0) << 12;
         }
@@ -2922,7 +2956,7 @@ static void update_stats(long ioaddr, struct net_device *dev)
 static int vortex_nway_reset(struct net_device *dev)
 {
         struct vortex_private *vp = netdev_priv(dev);
-        long ioaddr = dev->base_addr;
+        void __iomem *ioaddr = vp->ioaddr;
         unsigned long flags;
         int rc;
 
@@ -2936,7 +2970,7 @@ static int vortex_nway_reset(struct net_device *dev)
 static u32 vortex_get_link(struct net_device *dev)
 {
         struct vortex_private *vp = netdev_priv(dev);
-        long ioaddr = dev->base_addr;
+        void __iomem *ioaddr = vp->ioaddr;
         unsigned long flags;
         int rc;
 
@@ -2950,7 +2984,7 @@ static u32 vortex_get_link(struct net_device *dev)
 static int vortex_get_settings(struct net_device *dev, struct ethtool_cmd *cmd)
 {
         struct vortex_private *vp = netdev_priv(dev);
-        long ioaddr = dev->base_addr;
+        void __iomem *ioaddr = vp->ioaddr;
         unsigned long flags;
         int rc;
 
@@ -2964,7 +2998,7 @@ static int vortex_get_settings(struct net_device *dev, struct ethtool_cmd *cmd)
 static int vortex_set_settings(struct net_device *dev, struct ethtool_cmd *cmd)
 {
         struct vortex_private *vp = netdev_priv(dev);
-        long ioaddr = dev->base_addr;
+        void __iomem *ioaddr = vp->ioaddr;
         unsigned long flags;
         int rc;
 
@@ -2994,10 +3028,11 @@ static void vortex_get_ethtool_stats(struct net_device *dev,
         struct ethtool_stats *stats, u64 *data)
 {
         struct vortex_private *vp = netdev_priv(dev);
+        void __iomem *ioaddr = vp->ioaddr;
         unsigned long flags;
 
         spin_lock_irqsave(&vp->lock, flags);
-        update_stats(dev->base_addr, dev);
+        update_stats(ioaddr, dev);
         spin_unlock_irqrestore(&vp->lock, flags);
 
         data[0] = vp->xstats.tx_deferred;
@@ -3047,6 +3082,7 @@ static struct ethtool_ops vortex_ethtool_ops = {
         .set_settings           = vortex_set_settings,
         .get_link               = vortex_get_link,
         .nway_reset             = vortex_nway_reset,
+        .get_perm_addr                  = ethtool_op_get_perm_addr,
 };
 
 #ifdef CONFIG_PCI
@@ -3057,7 +3093,7 @@ static int vortex_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
 {
         int err;
         struct vortex_private *vp = netdev_priv(dev);
-        long ioaddr = dev->base_addr;
+        void __iomem *ioaddr = vp->ioaddr;
         unsigned long flags;
         int state = 0;
 
@@ -3085,7 +3121,8 @@ static int vortex_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
    the chip has a very clean way to set the mode, unlike many others. */
 static void set_rx_mode(struct net_device *dev)
 {
-        long ioaddr = dev->base_addr;
+        struct vortex_private *vp = netdev_priv(dev);
+        void __iomem *ioaddr = vp->ioaddr;
         int new_mode;
 
         if (dev->flags & IFF_PROMISC) {
@@ -3097,7 +3134,7 @@ static void set_rx_mode(struct net_device *dev)
         } else
                 new_mode = SetRxFilter | RxStation | RxBroadcast;
 
-        outw(new_mode, ioaddr + EL3_CMD);
+        iowrite16(new_mode, ioaddr + EL3_CMD);
 }
 
 #if defined(CONFIG_VLAN_8021Q) || defined(CONFIG_VLAN_8021Q_MODULE)
@@ -3111,8 +3148,8 @@ static void set_rx_mode(struct net_device *dev)
 static void set_8021q_mode(struct net_device *dev, int enable)
 {
         struct vortex_private *vp = netdev_priv(dev);
-        long ioaddr = dev->base_addr;
-        int old_window = inw(ioaddr + EL3_CMD);
+        void __iomem *ioaddr = vp->ioaddr;
+        int old_window = ioread16(ioaddr + EL3_CMD);
         int mac_ctrl;
 
         if ((vp->drv_flags&IS_CYCLONE) || (vp->drv_flags&IS_TORNADO)) {
@@ -3124,24 +3161,24 @@ static void set_8021q_mode(struct net_device *dev, int enable)
                         max_pkt_size += 4;      /* 802.1Q VLAN tag */
 
                 EL3WINDOW(3);
-                outw(max_pkt_size, ioaddr+Wn3_MaxPktSize);
+                iowrite16(max_pkt_size, ioaddr+Wn3_MaxPktSize);
 
                 /* set VlanEtherType to let the hardware checksumming
                    treat tagged frames correctly */
                 EL3WINDOW(7);
-                outw(VLAN_ETHER_TYPE, ioaddr+Wn7_VlanEtherType);
+                iowrite16(VLAN_ETHER_TYPE, ioaddr+Wn7_VlanEtherType);
         } else {
                 /* on older cards we have to enable large frames */
 
                 vp->large_frames = dev->mtu > 1500 || enable;
 
                 EL3WINDOW(3);
-                mac_ctrl = inw(ioaddr+Wn3_MAC_Ctrl);
+                mac_ctrl = ioread16(ioaddr+Wn3_MAC_Ctrl);
                 if (vp->large_frames)
                         mac_ctrl |= 0x40;
                 else
                         mac_ctrl &= ~0x40;
-                outw(mac_ctrl, ioaddr+Wn3_MAC_Ctrl);
+                iowrite16(mac_ctrl, ioaddr+Wn3_MAC_Ctrl);
         }
 
         EL3WINDOW(old_window);
@@ -3163,7 +3200,7 @@ static void set_8021q_mode(struct net_device *dev, int enable)
 /* The maximum data clock rate is 2.5 Mhz.  The minimum timing is usually
    met by back-to-back PCI I/O cycles, but we insert a delay to avoid
    "overclocking" issues. */
-#define mdio_delay() inl(mdio_addr)
+#define mdio_delay() ioread32(mdio_addr)
 
 #define MDIO_SHIFT_CLK  0x01
 #define MDIO_DIR_WRITE  0x04
@@ -3174,15 +3211,15 @@ static void set_8021q_mode(struct net_device *dev, int enable)
 
 /* Generate the preamble required for initial synchronization and
    a few older transceivers. */
-static void mdio_sync(long ioaddr, int bits)
+static void mdio_sync(void __iomem *ioaddr, int bits)
 {
-        long mdio_addr = ioaddr + Wn4_PhysicalMgmt;
+        void __iomem *mdio_addr = ioaddr + Wn4_PhysicalMgmt;
 
         /* Establish sync by sending at least 32 logic ones. */
         while (-- bits >= 0) {
-                outw(MDIO_DATA_WRITE1, mdio_addr);
+                iowrite16(MDIO_DATA_WRITE1, mdio_addr);
                 mdio_delay();
-                outw(MDIO_DATA_WRITE1 | MDIO_SHIFT_CLK, mdio_addr);
+                iowrite16(MDIO_DATA_WRITE1 | MDIO_SHIFT_CLK, mdio_addr);
                 mdio_delay();
         }
 }
@@ -3190,10 +3227,11 @@ static void mdio_sync(long ioaddr, int bits)
 static int mdio_read(struct net_device *dev, int phy_id, int location)
 {
         int i;
-        long ioaddr = dev->base_addr;
+        struct vortex_private *vp = netdev_priv(dev);
+        void __iomem *ioaddr = vp->ioaddr;
         int read_cmd = (0xf6 << 10) | (phy_id << 5) | location;
         unsigned int retval = 0;
-        long mdio_addr = ioaddr + Wn4_PhysicalMgmt;
+        void __iomem *mdio_addr = ioaddr + Wn4_PhysicalMgmt;
 
         if (mii_preamble_required)
                 mdio_sync(ioaddr, 32);
@@ -3201,17 +3239,17 @@ static int mdio_read(struct net_device *dev, int phy_id, int location)
         /* Shift the read command bits out. */
         for (i = 14; i >= 0; i--) {
                 int dataval = (read_cmd&(1<<i)) ? MDIO_DATA_WRITE1 : MDIO_DATA_WRITE0;
-                outw(dataval, mdio_addr);
+                iowrite16(dataval, mdio_addr);
                 mdio_delay();
-                outw(dataval | MDIO_SHIFT_CLK, mdio_addr);
+                iowrite16(dataval | MDIO_SHIFT_CLK, mdio_addr);
                 mdio_delay();
         }
         /* Read the two transition, 16 data, and wire-idle bits. */
         for (i = 19; i > 0; i--) {
-                outw(MDIO_ENB_IN, mdio_addr);
+                iowrite16(MDIO_ENB_IN, mdio_addr);
                 mdio_delay();
-                retval = (retval << 1) | ((inw(mdio_addr) & MDIO_DATA_READ) ? 1 : 0);
-                outw(MDIO_ENB_IN | MDIO_SHIFT_CLK, mdio_addr);
+                retval = (retval << 1) | ((ioread16(mdio_addr) & MDIO_DATA_READ) ? 1 : 0);
+                iowrite16(MDIO_ENB_IN | MDIO_SHIFT_CLK, mdio_addr);
                 mdio_delay();
         }
         return retval & 0x20000 ? 0xffff : retval>>1 & 0xffff;
@@ -3219,9 +3257,10 @@ static int mdio_read(struct net_device *dev, int phy_id, int location)
 
 static void mdio_write(struct net_device *dev, int phy_id, int location, int value)
 {
-        long ioaddr = dev->base_addr;
+        struct vortex_private *vp = netdev_priv(dev);
+        void __iomem *ioaddr = vp->ioaddr;
         int write_cmd = 0x50020000 | (phy_id << 23) | (location << 18) | value;
-        long mdio_addr = ioaddr + Wn4_PhysicalMgmt;
+        void __iomem *mdio_addr = ioaddr + Wn4_PhysicalMgmt;
         int i;
 
         if (mii_preamble_required)
@@ -3230,16 +3269,16 @@ static void mdio_write(struct net_device *dev, int phy_id, int location, int val
         /* Shift the command bits out. */
         for (i = 31; i >= 0; i--) {
                 int dataval = (write_cmd&(1<<i)) ? MDIO_DATA_WRITE1 : MDIO_DATA_WRITE0;
-                outw(dataval, mdio_addr);
+                iowrite16(dataval, mdio_addr);
                 mdio_delay();
-                outw(dataval | MDIO_SHIFT_CLK, mdio_addr);
+                iowrite16(dataval | MDIO_SHIFT_CLK, mdio_addr);
                 mdio_delay();
         }
         /* Leave the interface idle. */
         for (i = 1; i >= 0; i--) {
-                outw(MDIO_ENB_IN, mdio_addr);
+                iowrite16(MDIO_ENB_IN, mdio_addr);
                 mdio_delay();
-                outw(MDIO_ENB_IN | MDIO_SHIFT_CLK, mdio_addr);
+                iowrite16(MDIO_ENB_IN | MDIO_SHIFT_CLK, mdio_addr);
                 mdio_delay();
         }
         return;
@@ -3250,15 +3289,15 @@ static void mdio_write(struct net_device *dev, int phy_id, int location, int val
 static void acpi_set_WOL(struct net_device *dev)
 {
         struct vortex_private *vp = netdev_priv(dev);
-        long ioaddr = dev->base_addr;
+        void __iomem *ioaddr = vp->ioaddr;
 
         if (vp->enable_wol) {
                 /* Power up on: 1==Downloaded Filter, 2==Magic Packets, 4==Link Status. */
                 EL3WINDOW(7);
-                outw(2, ioaddr + 0x0c);
+                iowrite16(2, ioaddr + 0x0c);
                 /* The RxFilter must accept the WOL frames. */
-                outw(SetRxFilter|RxStation|RxMulticast|RxBroadcast, ioaddr + EL3_CMD);
-                outw(RxEnable, ioaddr + EL3_CMD);
+                iowrite16(SetRxFilter|RxStation|RxMulticast|RxBroadcast, ioaddr + EL3_CMD);
+                iowrite16(RxEnable, ioaddr + EL3_CMD);
 
                 pci_enable_wake(VORTEX_PCI(vp), 0, 1);
 
@@ -3280,10 +3319,9 @@ static void __devexit vortex_remove_one (struct pci_dev *pdev)
 
         vp = netdev_priv(dev);
 
-        /* AKPM: FIXME: we should have
-         *      if (vp->cb_fn_base) iounmap(vp->cb_fn_base);
-         * here
-         */
+        if (vp->cb_fn_base)
+                pci_iounmap(VORTEX_PCI(vp), vp->cb_fn_base);
+
         unregister_netdev(dev);
 
         if (VORTEX_PCI(vp)) {
@@ -3293,8 +3331,10 @@ static void __devexit vortex_remove_one (struct pci_dev *pdev)
                 pci_disable_device(VORTEX_PCI(vp));
         }
         /* Should really use issue_and_wait() here */
-        outw(TotalReset | ((vp->drv_flags & EEPROM_RESET) ? 0x04 : 0x14),
-             dev->base_addr + EL3_CMD);
+        iowrite16(TotalReset | ((vp->drv_flags & EEPROM_RESET) ? 0x04 : 0x14),
+             vp->ioaddr + EL3_CMD);
+
+        pci_iounmap(VORTEX_PCI(vp), vp->ioaddr);
 
         pci_free_consistent(pdev,
                                                 sizeof(struct boom_rx_desc) * RX_RING_SIZE
@@ -3342,7 +3382,7 @@ static int __init vortex_init (void)
 static void __exit vortex_eisa_cleanup (void)
 {
         struct vortex_private *vp;
-        long ioaddr;
+        void __iomem *ioaddr;
 
 #ifdef CONFIG_EISA
         /* Take care of the EISA devices */
@@ -3351,11 +3391,13 @@ static void __exit vortex_eisa_cleanup (void)
         
         if (compaq_net_device) {
                 vp = compaq_net_device->priv;
-                ioaddr = compaq_net_device->base_addr;
+                ioaddr = ioport_map(compaq_net_device->base_addr,
+                                    VORTEX_TOTAL_SIZE);
 
                 unregister_netdev (compaq_net_device);
-                outw (TotalReset, ioaddr + EL3_CMD);
-                release_region (ioaddr, VORTEX_TOTAL_SIZE);
+                iowrite16 (TotalReset, ioaddr + EL3_CMD);
+                release_region(compaq_net_device->base_addr,
+                               VORTEX_TOTAL_SIZE);
 
                 free_netdev (compaq_net_device);
         }
diff --git a/drivers/net/bnx2.c b/drivers/net/bnx2.c
index 11d252318221..8f464271664d 100644
--- a/drivers/net/bnx2.c
+++ b/drivers/net/bnx2.c
@@ -14,8 +14,8 @@
 
 #define DRV_MODULE_NAME         "bnx2"
 #define PFX DRV_MODULE_NAME     ": "
-#define DRV_MODULE_VERSION      "1.2.21"
-#define DRV_MODULE_RELDATE      "September 7, 2005"
+#define DRV_MODULE_VERSION      "1.4.30"
+#define DRV_MODULE_RELDATE      "October 11, 2005"
 
 #define RUN_AT(x) (jiffies + (x))
 
@@ -26,7 +26,7 @@ static char version[] __devinitdata =
         "Broadcom NetXtreme II Gigabit Ethernet Driver " DRV_MODULE_NAME " v" DRV_MODULE_VERSION " (" DRV_MODULE_RELDATE ")\n";
 
 MODULE_AUTHOR("Michael Chan <mchan@broadcom.com>");
-MODULE_DESCRIPTION("Broadcom NetXtreme II BCM5706 Driver");
+MODULE_DESCRIPTION("Broadcom NetXtreme II BCM5706/5708 Driver");
 MODULE_LICENSE("GPL");
 MODULE_VERSION(DRV_MODULE_VERSION);
 
@@ -41,6 +41,8 @@ typedef enum {
         NC370I,
         BCM5706S,
         NC370F,
+        BCM5708,
+        BCM5708S,
 } board_t;
 
 /* indexed by board_t, above */
@@ -52,6 +54,8 @@ static struct {
         { "HP NC370i Multifunction Gigabit Server Adapter" },
         { "Broadcom NetXtreme II BCM5706 1000Base-SX" },
         { "HP NC370F Multifunction Gigabit Server Adapter" },
+        { "Broadcom NetXtreme II BCM5708 1000Base-T" },
+        { "Broadcom NetXtreme II BCM5708 1000Base-SX" },
         };
 
 static struct pci_device_id bnx2_pci_tbl[] = {
@@ -61,48 +65,102 @@ static struct pci_device_id bnx2_pci_tbl[] = {
           PCI_VENDOR_ID_HP, 0x3106, 0, 0, NC370I },
         { PCI_VENDOR_ID_BROADCOM, PCI_DEVICE_ID_NX2_5706,
           PCI_ANY_ID, PCI_ANY_ID, 0, 0, BCM5706 },
+        { PCI_VENDOR_ID_BROADCOM, PCI_DEVICE_ID_NX2_5708,
+          PCI_ANY_ID, PCI_ANY_ID, 0, 0, BCM5708 },
         { PCI_VENDOR_ID_BROADCOM, PCI_DEVICE_ID_NX2_5706S,
           PCI_VENDOR_ID_HP, 0x3102, 0, 0, NC370F },
         { PCI_VENDOR_ID_BROADCOM, PCI_DEVICE_ID_NX2_5706S,
           PCI_ANY_ID, PCI_ANY_ID, 0, 0, BCM5706S },
+        { PCI_VENDOR_ID_BROADCOM, PCI_DEVICE_ID_NX2_5708S,
+          PCI_ANY_ID, PCI_ANY_ID, 0, 0, BCM5708S },
         { 0, }
 };
 
 static struct flash_spec flash_table[] =
 {
         /* Slow EEPROM */
-        {0x00000000, 0x40030380, 0x009f0081, 0xa184a053, 0xaf000400,
+        {0x00000000, 0x40830380, 0x009f0081, 0xa184a053, 0xaf000400,
          1, SEEPROM_PAGE_BITS, SEEPROM_PAGE_SIZE,
          SEEPROM_BYTE_ADDR_MASK, SEEPROM_TOTAL_SIZE,
          "EEPROM - slow"},
-        /* Fast EEPROM */
-        {0x02000000, 0x62008380, 0x009f0081, 0xa184a053, 0xaf000400,
-         1, SEEPROM_PAGE_BITS, SEEPROM_PAGE_SIZE,
-         SEEPROM_BYTE_ADDR_MASK, SEEPROM_TOTAL_SIZE,
-         "EEPROM - fast"},
-        /* ATMEL AT45DB011B (buffered flash) */
-        {0x02000003, 0x6e008173, 0x00570081, 0x68848353, 0xaf000400,
-         1, BUFFERED_FLASH_PAGE_BITS, BUFFERED_FLASH_PAGE_SIZE,
-         BUFFERED_FLASH_BYTE_ADDR_MASK, BUFFERED_FLASH_TOTAL_SIZE,
-         "Buffered flash"},
-        /* Saifun SA25F005 (non-buffered flash) */
-        /* strap, cfg1, & write1 need updates */
-        {0x01000003, 0x5f008081, 0x00050081, 0x03840253, 0xaf020406,
+        /* Expansion entry 0001 */
+        {0x08000002, 0x4b808201, 0x00050081, 0x03840253, 0xaf020406,
          0, SAIFUN_FLASH_PAGE_BITS, SAIFUN_FLASH_PAGE_SIZE,
-         SAIFUN_FLASH_BYTE_ADDR_MASK, SAIFUN_FLASH_BASE_TOTAL_SIZE,
-         "Non-buffered flash (64kB)"},
+         SAIFUN_FLASH_BYTE_ADDR_MASK, 0,
+         "Entry 0001"},
         /* Saifun SA25F010 (non-buffered flash) */
         /* strap, cfg1, & write1 need updates */
-        {0x00000001, 0x47008081, 0x00050081, 0x03840253, 0xaf020406,
+        {0x04000001, 0x47808201, 0x00050081, 0x03840253, 0xaf020406,
          0, SAIFUN_FLASH_PAGE_BITS, SAIFUN_FLASH_PAGE_SIZE,
          SAIFUN_FLASH_BYTE_ADDR_MASK, SAIFUN_FLASH_BASE_TOTAL_SIZE*2,
          "Non-buffered flash (128kB)"},
         /* Saifun SA25F020 (non-buffered flash) */
         /* strap, cfg1, & write1 need updates */
-        {0x00000003, 0x4f008081, 0x00050081, 0x03840253, 0xaf020406,
+        {0x0c000003, 0x4f808201, 0x00050081, 0x03840253, 0xaf020406,
          0, SAIFUN_FLASH_PAGE_BITS, SAIFUN_FLASH_PAGE_SIZE,
          SAIFUN_FLASH_BYTE_ADDR_MASK, SAIFUN_FLASH_BASE_TOTAL_SIZE*4,
          "Non-buffered flash (256kB)"},
+        /* Expansion entry 0100 */
+        {0x11000000, 0x53808201, 0x00050081, 0x03840253, 0xaf020406,
+         0, SAIFUN_FLASH_PAGE_BITS, SAIFUN_FLASH_PAGE_SIZE,
+         SAIFUN_FLASH_BYTE_ADDR_MASK, 0,
+         "Entry 0100"},
+        /* Entry 0101: ST M45PE10 (non-buffered flash, TetonII B0) */
+        {0x19000002, 0x5b808201, 0x000500db, 0x03840253, 0xaf020406,        
+         0, ST_MICRO_FLASH_PAGE_BITS, ST_MICRO_FLASH_PAGE_SIZE,
+         ST_MICRO_FLASH_BYTE_ADDR_MASK, ST_MICRO_FLASH_BASE_TOTAL_SIZE*2,
+         "Entry 0101: ST M45PE10 (128kB non-bufferred)"},
+        /* Entry 0110: ST M45PE20 (non-buffered flash)*/
+        {0x15000001, 0x57808201, 0x000500db, 0x03840253, 0xaf020406,
+         0, ST_MICRO_FLASH_PAGE_BITS, ST_MICRO_FLASH_PAGE_SIZE,
+         ST_MICRO_FLASH_BYTE_ADDR_MASK, ST_MICRO_FLASH_BASE_TOTAL_SIZE*4,
+         "Entry 0110: ST M45PE20 (256kB non-bufferred)"},
+        /* Saifun SA25F005 (non-buffered flash) */
+        /* strap, cfg1, & write1 need updates */
+        {0x1d000003, 0x5f808201, 0x00050081, 0x03840253, 0xaf020406,
+         0, SAIFUN_FLASH_PAGE_BITS, SAIFUN_FLASH_PAGE_SIZE,
+         SAIFUN_FLASH_BYTE_ADDR_MASK, SAIFUN_FLASH_BASE_TOTAL_SIZE,
+         "Non-buffered flash (64kB)"},
+        /* Fast EEPROM */
+        {0x22000000, 0x62808380, 0x009f0081, 0xa184a053, 0xaf000400,
+         1, SEEPROM_PAGE_BITS, SEEPROM_PAGE_SIZE,
+         SEEPROM_BYTE_ADDR_MASK, SEEPROM_TOTAL_SIZE,
+         "EEPROM - fast"},
+        /* Expansion entry 1001 */
+        {0x2a000002, 0x6b808201, 0x00050081, 0x03840253, 0xaf020406,
+         0, SAIFUN_FLASH_PAGE_BITS, SAIFUN_FLASH_PAGE_SIZE,
+         SAIFUN_FLASH_BYTE_ADDR_MASK, 0,
+         "Entry 1001"},
+        /* Expansion entry 1010 */
+        {0x26000001, 0x67808201, 0x00050081, 0x03840253, 0xaf020406,
+         0, SAIFUN_FLASH_PAGE_BITS, SAIFUN_FLASH_PAGE_SIZE,
+         SAIFUN_FLASH_BYTE_ADDR_MASK, 0,
+         "Entry 1010"},
+        /* ATMEL AT45DB011B (buffered flash) */
+        {0x2e000003, 0x6e808273, 0x00570081, 0x68848353, 0xaf000400,
+         1, BUFFERED_FLASH_PAGE_BITS, BUFFERED_FLASH_PAGE_SIZE,
+         BUFFERED_FLASH_BYTE_ADDR_MASK, BUFFERED_FLASH_TOTAL_SIZE,
+         "Buffered flash (128kB)"},
+        /* Expansion entry 1100 */
+        {0x33000000, 0x73808201, 0x00050081, 0x03840253, 0xaf020406,
+         0, SAIFUN_FLASH_PAGE_BITS, SAIFUN_FLASH_PAGE_SIZE,
+         SAIFUN_FLASH_BYTE_ADDR_MASK, 0,
+         "Entry 1100"},
+        /* Expansion entry 1101 */
+        {0x3b000002, 0x7b808201, 0x00050081, 0x03840253, 0xaf020406,
+         0, SAIFUN_FLASH_PAGE_BITS, SAIFUN_FLASH_PAGE_SIZE,
+         SAIFUN_FLASH_BYTE_ADDR_MASK, 0,
+         "Entry 1101"},
+        /* Ateml Expansion entry 1110 */
+        {0x37000001, 0x76808273, 0x00570081, 0x68848353, 0xaf000400,
+         1, BUFFERED_FLASH_PAGE_BITS, BUFFERED_FLASH_PAGE_SIZE,
+         BUFFERED_FLASH_BYTE_ADDR_MASK, 0,
+         "Entry 1110 (Atmel)"},
+        /* ATMEL AT45DB021B (buffered flash) */
+        {0x3f000003, 0x7e808273, 0x00570081, 0x68848353, 0xaf000400,
+         1, BUFFERED_FLASH_PAGE_BITS, BUFFERED_FLASH_PAGE_SIZE,
+         BUFFERED_FLASH_BYTE_ADDR_MASK, BUFFERED_FLASH_TOTAL_SIZE*2,
+         "Buffered flash (256kB)"},
 };
 
 MODULE_DEVICE_TABLE(pci, bnx2_pci_tbl);
@@ -379,6 +437,62 @@ alloc_mem_err:
 }
 
 static void
+bnx2_report_fw_link(struct bnx2 *bp)
+{
+        u32 fw_link_status = 0;
+
+        if (bp->link_up) {
+                u32 bmsr;
+
+                switch (bp->line_speed) {
+                case SPEED_10:
+                        if (bp->duplex == DUPLEX_HALF)
+                                fw_link_status = BNX2_LINK_STATUS_10HALF;
+                        else
+                                fw_link_status = BNX2_LINK_STATUS_10FULL;
+                        break;
+                case SPEED_100:
+                        if (bp->duplex == DUPLEX_HALF)
+                                fw_link_status = BNX2_LINK_STATUS_100HALF;
+                        else
+                                fw_link_status = BNX2_LINK_STATUS_100FULL;
+                        break;
+                case SPEED_1000:
+                        if (bp->duplex == DUPLEX_HALF)
+                                fw_link_status = BNX2_LINK_STATUS_1000HALF;
+                        else
+                                fw_link_status = BNX2_LINK_STATUS_1000FULL;
+                        break;
+                case SPEED_2500:
+                        if (bp->duplex == DUPLEX_HALF)
+                                fw_link_status = BNX2_LINK_STATUS_2500HALF;
+                        else
+                                fw_link_status = BNX2_LINK_STATUS_2500FULL;
+                        break;
+                }
+
+                fw_link_status |= BNX2_LINK_STATUS_LINK_UP;
+
+                if (bp->autoneg) {
+                        fw_link_status |= BNX2_LINK_STATUS_AN_ENABLED;
+
+                        bnx2_read_phy(bp, MII_BMSR, &bmsr);
+                        bnx2_read_phy(bp, MII_BMSR, &bmsr);
+
+                        if (!(bmsr & BMSR_ANEGCOMPLETE) ||
+                            bp->phy_flags & PHY_PARALLEL_DETECT_FLAG)
+                                fw_link_status |= BNX2_LINK_STATUS_PARALLEL_DET;
+                        else
+                                fw_link_status |= BNX2_LINK_STATUS_AN_COMPLETE;
+                }
+        }
+        else
+                fw_link_status = BNX2_LINK_STATUS_LINK_DOWN;
+
+        REG_WR_IND(bp, bp->shmem_base + BNX2_LINK_STATUS, fw_link_status);
+}
+
+static void
 bnx2_report_link(struct bnx2 *bp)
 {
         if (bp->link_up) {
@@ -409,6 +523,8 @@ bnx2_report_link(struct bnx2 *bp)
                 netif_carrier_off(bp->dev);
                 printk(KERN_ERR PFX "%s NIC Link is Down\n", bp->dev->name);
         }
+
+        bnx2_report_fw_link(bp);
 }
 
 static void
@@ -430,6 +546,18 @@ bnx2_resolve_flow_ctrl(struct bnx2 *bp)
                 return;
         }
 
+        if ((bp->phy_flags & PHY_SERDES_FLAG) &&
+            (CHIP_NUM(bp) == CHIP_NUM_5708)) {
+                u32 val;
+
+                bnx2_read_phy(bp, BCM5708S_1000X_STAT1, &val);
+                if (val & BCM5708S_1000X_STAT1_TX_PAUSE)
+                        bp->flow_ctrl |= FLOW_CTRL_TX;
+                if (val & BCM5708S_1000X_STAT1_RX_PAUSE)
+                        bp->flow_ctrl |= FLOW_CTRL_RX;
+                return;
+        }
+
         bnx2_read_phy(bp, MII_ADVERTISE, &local_adv);
         bnx2_read_phy(bp, MII_LPA, &remote_adv);
 
@@ -476,7 +604,36 @@ bnx2_resolve_flow_ctrl(struct bnx2 *bp)
 }
 
 static int
-bnx2_serdes_linkup(struct bnx2 *bp)
+bnx2_5708s_linkup(struct bnx2 *bp)
+{
+        u32 val;
+
+        bp->link_up = 1;
+        bnx2_read_phy(bp, BCM5708S_1000X_STAT1, &val);
+        switch (val & BCM5708S_1000X_STAT1_SPEED_MASK) {
+                case BCM5708S_1000X_STAT1_SPEED_10:
+                        bp->line_speed = SPEED_10;
+                        break;
+                case BCM5708S_1000X_STAT1_SPEED_100:
+                        bp->line_speed = SPEED_100;
+                        break;
+                case BCM5708S_1000X_STAT1_SPEED_1G:
+                        bp->line_speed = SPEED_1000;
+                        break;
+                case BCM5708S_1000X_STAT1_SPEED_2G5:
+                        bp->line_speed = SPEED_2500;
+                        break;
+        }
+        if (val & BCM5708S_1000X_STAT1_FD)
+                bp->duplex = DUPLEX_FULL;
+        else
+                bp->duplex = DUPLEX_HALF;
+
+        return 0;
+}
+
+static int
+bnx2_5706s_linkup(struct bnx2 *bp)
 {
         u32 bmcr, local_adv, remote_adv, common;
 
@@ -593,13 +750,27 @@ bnx2_set_mac_link(struct bnx2 *bp)
         val = REG_RD(bp, BNX2_EMAC_MODE);
 
         val &= ~(BNX2_EMAC_MODE_PORT | BNX2_EMAC_MODE_HALF_DUPLEX |
-                BNX2_EMAC_MODE_MAC_LOOP | BNX2_EMAC_MODE_FORCE_LINK);
+                BNX2_EMAC_MODE_MAC_LOOP | BNX2_EMAC_MODE_FORCE_LINK |
+                BNX2_EMAC_MODE_25G);
 
         if (bp->link_up) {
-                if (bp->line_speed != SPEED_1000)
-                        val |= BNX2_EMAC_MODE_PORT_MII;
-                else
-                        val |= BNX2_EMAC_MODE_PORT_GMII;
+                switch (bp->line_speed) {
+                        case SPEED_10:
+                                if (CHIP_NUM(bp) == CHIP_NUM_5708) {
+                                        val |= BNX2_EMAC_MODE_PORT_MII_10;
+                                        break;
+                                }
+                                /* fall through */
+                        case SPEED_100:
+                                val |= BNX2_EMAC_MODE_PORT_MII;
+                                break;
+                        case SPEED_2500:
+                                val |= BNX2_EMAC_MODE_25G;
+                                /* fall through */
+                        case SPEED_1000:
+                                val |= BNX2_EMAC_MODE_PORT_GMII;
+                                break;
+                }
         }
         else {
                 val |= BNX2_EMAC_MODE_PORT_GMII;
@@ -662,7 +833,10 @@ bnx2_set_link(struct bnx2 *bp)
                 bp->link_up = 1;
 
                 if (bp->phy_flags & PHY_SERDES_FLAG) {
-                        bnx2_serdes_linkup(bp);
+                        if (CHIP_NUM(bp) == CHIP_NUM_5706)
+                                bnx2_5706s_linkup(bp);
+                        else if (CHIP_NUM(bp) == CHIP_NUM_5708)
+                                bnx2_5708s_linkup(bp);
                 }
                 else {
                         bnx2_copper_linkup(bp);
@@ -755,39 +929,61 @@ bnx2_phy_get_pause_adv(struct bnx2 *bp)
 static int
 bnx2_setup_serdes_phy(struct bnx2 *bp)
 {
-        u32 adv, bmcr;
+        u32 adv, bmcr, up1;
         u32 new_adv = 0;
 
         if (!(bp->autoneg & AUTONEG_SPEED)) {
                 u32 new_bmcr;
+                int force_link_down = 0;
+
+                if (CHIP_NUM(bp) == CHIP_NUM_5708) {
+                        bnx2_read_phy(bp, BCM5708S_UP1, &up1);
+                        if (up1 & BCM5708S_UP1_2G5) {
+                                up1 &= ~BCM5708S_UP1_2G5;
+                                bnx2_write_phy(bp, BCM5708S_UP1, up1);
+                                force_link_down = 1;
+                        }
+                }
+
+                bnx2_read_phy(bp, MII_ADVERTISE, &adv);
+                adv &= ~(ADVERTISE_1000XFULL | ADVERTISE_1000XHALF);
 
                 bnx2_read_phy(bp, MII_BMCR, &bmcr);
                 new_bmcr = bmcr & ~BMCR_ANENABLE;
                 new_bmcr |= BMCR_SPEED1000;
                 if (bp->req_duplex == DUPLEX_FULL) {
+                        adv |= ADVERTISE_1000XFULL;
                         new_bmcr |= BMCR_FULLDPLX;
                 }
                 else {
+                        adv |= ADVERTISE_1000XHALF;
                         new_bmcr &= ~BMCR_FULLDPLX;
                 }
-                if (new_bmcr != bmcr) {
+                if ((new_bmcr != bmcr) || (force_link_down)) {
                         /* Force a link down visible on the other side */
                         if (bp->link_up) {
-                                bnx2_read_phy(bp, MII_ADVERTISE, &adv);
-                                adv &= ~(ADVERTISE_1000XFULL |
-                                        ADVERTISE_1000XHALF);
-                                bnx2_write_phy(bp, MII_ADVERTISE, adv);
+                                bnx2_write_phy(bp, MII_ADVERTISE, adv &
+                                               ~(ADVERTISE_1000XFULL |
+                                                 ADVERTISE_1000XHALF));
                                 bnx2_write_phy(bp, MII_BMCR, bmcr |
                                         BMCR_ANRESTART | BMCR_ANENABLE);
 
                                 bp->link_up = 0;
                                 netif_carrier_off(bp->dev);
+                                bnx2_write_phy(bp, MII_BMCR, new_bmcr);
                         }
+                        bnx2_write_phy(bp, MII_ADVERTISE, adv);
                         bnx2_write_phy(bp, MII_BMCR, new_bmcr);
                 }
                 return 0;
         }
 
+        if (bp->phy_flags & PHY_2_5G_CAPABLE_FLAG) {
+                bnx2_read_phy(bp, BCM5708S_UP1, &up1);
+                up1 |= BCM5708S_UP1_2G5;
+                bnx2_write_phy(bp, BCM5708S_UP1, up1);
+        }
+
         if (bp->advertising & ADVERTISED_1000baseT_Full)
                 new_adv |= ADVERTISE_1000XFULL;
 
@@ -952,7 +1148,60 @@ bnx2_setup_phy(struct bnx2 *bp)
 }
 
 static int
-bnx2_init_serdes_phy(struct bnx2 *bp)
+bnx2_init_5708s_phy(struct bnx2 *bp)
+{
+        u32 val;
+
+        bnx2_write_phy(bp, BCM5708S_BLK_ADDR, BCM5708S_BLK_ADDR_DIG3);
+        bnx2_write_phy(bp, BCM5708S_DIG_3_0, BCM5708S_DIG_3_0_USE_IEEE);
+        bnx2_write_phy(bp, BCM5708S_BLK_ADDR, BCM5708S_BLK_ADDR_DIG);
+
+        bnx2_read_phy(bp, BCM5708S_1000X_CTL1, &val);
+        val |= BCM5708S_1000X_CTL1_FIBER_MODE | BCM5708S_1000X_CTL1_AUTODET_EN;
+        bnx2_write_phy(bp, BCM5708S_1000X_CTL1, val);
+
+        bnx2_read_phy(bp, BCM5708S_1000X_CTL2, &val);
+        val |= BCM5708S_1000X_CTL2_PLLEL_DET_EN;
+        bnx2_write_phy(bp, BCM5708S_1000X_CTL2, val);
+
+        if (bp->phy_flags & PHY_2_5G_CAPABLE_FLAG) {
+                bnx2_read_phy(bp, BCM5708S_UP1, &val);
+                val |= BCM5708S_UP1_2G5;
+                bnx2_write_phy(bp, BCM5708S_UP1, val);
+        }
+
+        if ((CHIP_ID(bp) == CHIP_ID_5708_A0) ||
+            (CHIP_ID(bp) == CHIP_ID_5708_B0)) {
+                /* increase tx signal amplitude */
+                bnx2_write_phy(bp, BCM5708S_BLK_ADDR,
+                               BCM5708S_BLK_ADDR_TX_MISC);
+                bnx2_read_phy(bp, BCM5708S_TX_ACTL1, &val);
+                val &= ~BCM5708S_TX_ACTL1_DRIVER_VCM;
+                bnx2_write_phy(bp, BCM5708S_TX_ACTL1, val);
+                bnx2_write_phy(bp, BCM5708S_BLK_ADDR, BCM5708S_BLK_ADDR_DIG);
+        }
+
+        val = REG_RD_IND(bp, bp->shmem_base + BNX2_PORT_HW_CFG_CONFIG) &
+              BNX2_PORT_HW_CFG_CFG_TXCTL3_MASK;
+
+        if (val) {
+                u32 is_backplane;
+
+                is_backplane = REG_RD_IND(bp, bp->shmem_base +
+                                          BNX2_SHARED_HW_CFG_CONFIG);
+                if (is_backplane & BNX2_SHARED_HW_CFG_PHY_BACKPLANE) {
+                        bnx2_write_phy(bp, BCM5708S_BLK_ADDR,
+                                       BCM5708S_BLK_ADDR_TX_MISC);
+                        bnx2_write_phy(bp, BCM5708S_TX_ACTL3, val);
+                        bnx2_write_phy(bp, BCM5708S_BLK_ADDR,
+                                       BCM5708S_BLK_ADDR_DIG);
+                }
+        }
+        return 0;
+}
+
+static int
+bnx2_init_5706s_phy(struct bnx2 *bp)
 {
         bp->phy_flags &= ~PHY_PARALLEL_DETECT_FLAG;
 
@@ -990,6 +1239,8 @@ bnx2_init_serdes_phy(struct bnx2 *bp)
 static int
 bnx2_init_copper_phy(struct bnx2 *bp)
 {
+        u32 val;
+
         bp->phy_flags |= PHY_CRC_FIX_FLAG;
 
         if (bp->phy_flags & PHY_CRC_FIX_FLAG) {
@@ -1004,8 +1255,6 @@ bnx2_init_copper_phy(struct bnx2 *bp)
         }
 
         if (bp->dev->mtu > 1500) {
-                u32 val;
-
                 /* Set extended packet length bit */
                 bnx2_write_phy(bp, 0x18, 0x7);
                 bnx2_read_phy(bp, 0x18, &val);
@@ -1015,8 +1264,6 @@ bnx2_init_copper_phy(struct bnx2 *bp)
                 bnx2_write_phy(bp, 0x10, val | 0x1);
         }
         else {
-                u32 val;
-
                 bnx2_write_phy(bp, 0x18, 0x7);
                 bnx2_read_phy(bp, 0x18, &val);
                 bnx2_write_phy(bp, 0x18, val & ~0x4007);
@@ -1025,6 +1272,10 @@ bnx2_init_copper_phy(struct bnx2 *bp)
                 bnx2_write_phy(bp, 0x10, val & ~0x1);
         }
 
+        /* ethernet@wirespeed */
+        bnx2_write_phy(bp, 0x18, 0x7007);
+        bnx2_read_phy(bp, 0x18, &val);
+        bnx2_write_phy(bp, 0x18, val | (1 << 15) | (1 << 4));
         return 0;
 }
 
@@ -1048,7 +1299,10 @@ bnx2_init_phy(struct bnx2 *bp)
         bp->phy_id |= val & 0xffff;
 
         if (bp->phy_flags & PHY_SERDES_FLAG) {
-                rc = bnx2_init_serdes_phy(bp);
+                if (CHIP_NUM(bp) == CHIP_NUM_5706)
+                        rc = bnx2_init_5706s_phy(bp);
+                else if (CHIP_NUM(bp) == CHIP_NUM_5708)
+                        rc = bnx2_init_5708s_phy(bp);
         }
         else {
                 rc = bnx2_init_copper_phy(bp);
@@ -1084,13 +1338,13 @@ bnx2_fw_sync(struct bnx2 *bp, u32 msg_data)
         bp->fw_wr_seq++;
         msg_data |= bp->fw_wr_seq;
 
-        REG_WR_IND(bp, HOST_VIEW_SHMEM_BASE + BNX2_DRV_MB, msg_data);
+        REG_WR_IND(bp, bp->shmem_base + BNX2_DRV_MB, msg_data);
 
         /* wait for an acknowledgement. */
         for (i = 0; i < (FW_ACK_TIME_OUT_MS * 1000)/5; i++) {
                 udelay(5);
 
-                val = REG_RD_IND(bp, HOST_VIEW_SHMEM_BASE + BNX2_FW_MB);
+                val = REG_RD_IND(bp, bp->shmem_base + BNX2_FW_MB);
 
                 if ((val & BNX2_FW_MSG_ACK) == (msg_data & BNX2_DRV_MSG_SEQ))
                         break;
@@ -1103,7 +1357,7 @@ bnx2_fw_sync(struct bnx2 *bp, u32 msg_data)
                 msg_data &= ~BNX2_DRV_MSG_CODE;
                 msg_data |= BNX2_DRV_MSG_CODE_FW_TIMEOUT;
 
-                REG_WR_IND(bp, HOST_VIEW_SHMEM_BASE + BNX2_DRV_MB, msg_data);
+                REG_WR_IND(bp, bp->shmem_base + BNX2_DRV_MB, msg_data);
 
                 bp->fw_timed_out = 1;
 
@@ -1279,10 +1533,11 @@ bnx2_phy_int(struct bnx2 *bp)
 static void
 bnx2_tx_int(struct bnx2 *bp)
 {
+        struct status_block *sblk = bp->status_blk;
         u16 hw_cons, sw_cons, sw_ring_cons;
         int tx_free_bd = 0;
 
-        hw_cons = bp->status_blk->status_tx_quick_consumer_index0;
+        hw_cons = bp->hw_tx_cons = sblk->status_tx_quick_consumer_index0;
         if ((hw_cons & MAX_TX_DESC_CNT) == MAX_TX_DESC_CNT) {
                 hw_cons++;
         }
@@ -1337,7 +1592,9 @@ bnx2_tx_int(struct bnx2 *bp)
 
                 dev_kfree_skb_irq(skb);
 
-                hw_cons = bp->status_blk->status_tx_quick_consumer_index0;
+                hw_cons = bp->hw_tx_cons =
+                        sblk->status_tx_quick_consumer_index0;
+
                 if ((hw_cons & MAX_TX_DESC_CNT) == MAX_TX_DESC_CNT) {
                         hw_cons++;
                 }
@@ -1382,11 +1639,12 @@ bnx2_reuse_rx_skb(struct bnx2 *bp, struct sk_buff *skb,
 static int
 bnx2_rx_int(struct bnx2 *bp, int budget)
 {
+        struct status_block *sblk = bp->status_blk;
         u16 hw_cons, sw_cons, sw_ring_cons, sw_prod, sw_ring_prod;
         struct l2_fhdr *rx_hdr;
         int rx_pkt = 0;
 
-        hw_cons = bp->status_blk->status_rx_quick_consumer_index0;
+        hw_cons = bp->hw_rx_cons = sblk->status_rx_quick_consumer_index0;
         if ((hw_cons & MAX_RX_DESC_CNT) == MAX_RX_DESC_CNT) {
                 hw_cons++;
         }
@@ -1506,6 +1764,15 @@ next_rx:
 
                 if ((rx_pkt == budget))
                         break;
+
+                /* Refresh hw_cons to see if there is new work */
+                if (sw_cons == hw_cons) {
+                        hw_cons = bp->hw_rx_cons =
+                                sblk->status_rx_quick_consumer_index0;
+                        if ((hw_cons & MAX_RX_DESC_CNT) == MAX_RX_DESC_CNT)
+                                hw_cons++;
+                        rmb();
+                }
         }
         bp->rx_cons = sw_cons;
         bp->rx_prod = sw_prod;
@@ -1573,15 +1840,27 @@ bnx2_interrupt(int irq, void *dev_instance, struct pt_regs *regs)
         return IRQ_HANDLED;
 }
 
+static inline int
+bnx2_has_work(struct bnx2 *bp)
+{
+        struct status_block *sblk = bp->status_blk;
+
+        if ((sblk->status_rx_quick_consumer_index0 != bp->hw_rx_cons) ||
+            (sblk->status_tx_quick_consumer_index0 != bp->hw_tx_cons))
+                return 1;
+
+        if (((sblk->status_attn_bits & STATUS_ATTN_BITS_LINK_STATE) != 0) !=
+            bp->link_up)
+                return 1;
+
+        return 0;
+}
+
 static int
 bnx2_poll(struct net_device *dev, int *budget)
 {
         struct bnx2 *bp = dev->priv;
-        int rx_done = 1;
 
-        bp->last_status_idx = bp->status_blk->status_idx;
-
-        rmb();
         if ((bp->status_blk->status_attn_bits &
                 STATUS_ATTN_BITS_LINK_STATE) !=
                 (bp->status_blk->status_attn_bits_ack &
@@ -1592,11 +1871,10 @@ bnx2_poll(struct net_device *dev, int *budget)
                 spin_unlock(&bp->phy_lock);
         }
 
-        if (bp->status_blk->status_tx_quick_consumer_index0 != bp->tx_cons) {
+        if (bp->status_blk->status_tx_quick_consumer_index0 != bp->hw_tx_cons)
                 bnx2_tx_int(bp);
-        }
 
-        if (bp->status_blk->status_rx_quick_consumer_index0 != bp->rx_cons) {
+        if (bp->status_blk->status_rx_quick_consumer_index0 != bp->hw_rx_cons) {
                 int orig_budget = *budget;
                 int work_done;
 
@@ -1606,13 +1884,12 @@ bnx2_poll(struct net_device *dev, int *budget)
                 work_done = bnx2_rx_int(bp, orig_budget);
                 *budget -= work_done;
                 dev->quota -= work_done;
-                
-                if (work_done >= orig_budget) {
-                        rx_done = 0;
-                }
         }
         
-        if (rx_done) {
+        bp->last_status_idx = bp->status_blk->status_idx;
+        rmb();
+
+        if (!bnx2_has_work(bp)) {
                 netif_rx_complete(dev);
                 REG_WR(bp, BNX2_PCICFG_INT_ACK_CMD,
                         BNX2_PCICFG_INT_ACK_CMD_INDEX_VALID |
@@ -2383,21 +2660,27 @@ bnx2_init_nvram(struct bnx2 *bp)
 
                 /* Flash interface has been reconfigured */
                 for (j = 0, flash = &flash_table[0]; j < entry_count;
-                        j++, flash++) {
-
-                        if (val == flash->config1) {
+                     j++, flash++) {
+                        if ((val & FLASH_BACKUP_STRAP_MASK) ==
+                            (flash->config1 & FLASH_BACKUP_STRAP_MASK)) {
                                 bp->flash_info = flash;
                                 break;
                         }
                 }
         }
         else {
+                u32 mask;
                 /* Not yet been reconfigured */
 
+                if (val & (1 << 23))
+                        mask = FLASH_BACKUP_STRAP_MASK;
+                else
+                        mask = FLASH_STRAP_MASK;
+
                 for (j = 0, flash = &flash_table[0]; j < entry_count;
                         j++, flash++) {
 
-                        if ((val & FLASH_STRAP_MASK) == flash->strapping) {
+                        if ((val & mask) == (flash->strapping & mask)) {
                                 bp->flash_info = flash;
 
                                 /* Request access to the flash interface. */
@@ -2733,7 +3016,7 @@ bnx2_reset_chip(struct bnx2 *bp, u32 reset_code)
 
         /* Deposit a driver reset signature so the firmware knows that
          * this is a soft reset. */
-        REG_WR_IND(bp, HOST_VIEW_SHMEM_BASE + BNX2_DRV_RESET_SIGNATURE,
+        REG_WR_IND(bp, bp->shmem_base + BNX2_DRV_RESET_SIGNATURE,
                    BNX2_DRV_RESET_SIGNATURE_MAGIC);
 
         bp->fw_timed_out = 0;
@@ -2962,6 +3245,7 @@ bnx2_init_tx_ring(struct bnx2 *bp)
 
         bp->tx_prod = 0;
         bp->tx_cons = 0;
+        bp->hw_tx_cons = 0;
         bp->tx_prod_bseq = 0;
         
         val = BNX2_L2CTX_TYPE_TYPE_L2;
@@ -2994,6 +3278,7 @@ bnx2_init_rx_ring(struct bnx2 *bp)
 
         ring_prod = prod = bp->rx_prod = 0;
         bp->rx_cons = 0;
+        bp->hw_rx_cons = 0;
         bp->rx_prod_bseq = 0;
                 
         rxbd = &bp->rx_desc_ring[0];
@@ -3079,7 +3364,7 @@ bnx2_free_rx_skbs(struct bnx2 *bp)
                 struct sw_bd *rx_buf = &bp->rx_buf_ring[i];
                 struct sk_buff *skb = rx_buf->skb;
 
-                if (skb == 0)
+                if (skb == NULL)
                         continue;
 
                 pci_unmap_single(bp->pdev, pci_unmap_addr(rx_buf, mapping),
@@ -3234,7 +3519,7 @@ bnx2_test_registers(struct bnx2 *bp)
                 { 0x1408, 0, 0x01c00800, 0x00000000 },
                 { 0x149c, 0, 0x8000ffff, 0x00000000 },
                 { 0x14a8, 0, 0x00000000, 0x000001ff },
-                { 0x14ac, 0, 0x4fffffff, 0x10000000 },
+                { 0x14ac, 0, 0x0fffffff, 0x10000000 },
                 { 0x14b0, 0, 0x00000002, 0x00000001 },
                 { 0x14b8, 0, 0x00000000, 0x00000000 },
                 { 0x14c0, 0, 0x00000000, 0x00000009 },
@@ -3577,7 +3862,7 @@ bnx2_test_memory(struct bnx2 *bp)
                 u32   len;
         } mem_tbl[] = {
                 { 0x60000,  0x4000 },
-                { 0xa0000,  0x4000 },
+                { 0xa0000,  0x3000 },
                 { 0xe0000,  0x4000 },
                 { 0x120000, 0x4000 },
                 { 0x1a0000, 0x4000 },
@@ -3810,7 +4095,7 @@ bnx2_timer(unsigned long data)
                 goto bnx2_restart_timer;
 
         msg = (u32) ++bp->fw_drv_pulse_wr_seq;
-        REG_WR_IND(bp, HOST_VIEW_SHMEM_BASE + BNX2_DRV_PULSE_MB, msg);
+        REG_WR_IND(bp, bp->shmem_base + BNX2_DRV_PULSE_MB, msg);
 
         if ((bp->phy_flags & PHY_SERDES_FLAG) &&
             (CHIP_NUM(bp) == CHIP_NUM_5706)) {
@@ -4264,7 +4549,8 @@ bnx2_get_stats(struct net_device *dev)
                 (unsigned long) (stats_blk->stat_Dot3StatsExcessiveCollisions +
                 stats_blk->stat_Dot3StatsLateCollisions);
 
-        if (CHIP_NUM(bp) == CHIP_NUM_5706)
+        if ((CHIP_NUM(bp) == CHIP_NUM_5706) ||
+            (CHIP_ID(bp) == CHIP_ID_5708_A0))
                 net_stats->tx_carrier_errors = 0;
         else {
                 net_stats->tx_carrier_errors =
@@ -4814,6 +5100,14 @@ static u8 bnx2_5706_stats_len_arr[BNX2_NUM_STATS] = {
         4,4,4,4,4,
 };
 
+static u8 bnx2_5708_stats_len_arr[BNX2_NUM_STATS] = {
+        8,0,8,8,8,8,8,8,8,8,
+        4,4,4,4,4,4,4,4,4,4,
+        4,4,4,4,4,4,4,4,4,4,
+        4,4,4,4,4,4,4,4,4,4,
+        4,4,4,4,4,
+};
+
 #define BNX2_NUM_TESTS 6
 
 static struct {
@@ -4922,8 +5216,13 @@ bnx2_get_ethtool_stats(struct net_device *dev,
                 return;
         }
 
-        if (CHIP_NUM(bp) == CHIP_NUM_5706)
+        if ((CHIP_ID(bp) == CHIP_ID_5706_A0) ||
+            (CHIP_ID(bp) == CHIP_ID_5706_A1) ||
+            (CHIP_ID(bp) == CHIP_ID_5706_A2) ||
+            (CHIP_ID(bp) == CHIP_ID_5708_A0))
                 stats_len_arr = bnx2_5706_stats_len_arr;
+        else
+                stats_len_arr = bnx2_5708_stats_len_arr;
 
         for (i = 0; i < BNX2_NUM_STATS; i++) {
                 if (stats_len_arr[i] == 0) {
@@ -5205,8 +5504,6 @@ bnx2_init_board(struct pci_dev *pdev, struct net_device *dev)
 
         bp->chip_id = REG_RD(bp, BNX2_MISC_ID);
 
-        bp->phy_addr = 1;
-
         /* Get bus information. */
         reg = REG_RD(bp, BNX2_PCICFG_MISC_STATUS);
         if (reg & BNX2_PCICFG_MISC_STATUS_PCIX_DET) {
@@ -5269,10 +5566,18 @@ bnx2_init_board(struct pci_dev *pdev, struct net_device *dev)
 
         bnx2_init_nvram(bp);
 
+        reg = REG_RD_IND(bp, BNX2_SHM_HDR_SIGNATURE);
+
+        if ((reg & BNX2_SHM_HDR_SIGNATURE_SIG_MASK) ==
+            BNX2_SHM_HDR_SIGNATURE_SIG)
+                bp->shmem_base = REG_RD_IND(bp, BNX2_SHM_HDR_ADDR_0);
+        else
+                bp->shmem_base = HOST_VIEW_SHMEM_BASE;
+
         /* Get the permanent MAC address.  First we need to make sure the
          * firmware is actually running.
          */
-        reg = REG_RD_IND(bp, HOST_VIEW_SHMEM_BASE + BNX2_DEV_INFO_SIGNATURE);
+        reg = REG_RD_IND(bp, bp->shmem_base + BNX2_DEV_INFO_SIGNATURE);
 
         if ((reg & BNX2_DEV_INFO_SIGNATURE_MAGIC_MASK) !=
             BNX2_DEV_INFO_SIGNATURE_MAGIC) {
@@ -5281,14 +5586,13 @@ bnx2_init_board(struct pci_dev *pdev, struct net_device *dev)
                 goto err_out_unmap;
         }
 
-        bp->fw_ver = REG_RD_IND(bp, HOST_VIEW_SHMEM_BASE +
-                                BNX2_DEV_INFO_BC_REV);
+        bp->fw_ver = REG_RD_IND(bp, bp->shmem_base + BNX2_DEV_INFO_BC_REV);
 
-        reg = REG_RD_IND(bp, HOST_VIEW_SHMEM_BASE + BNX2_PORT_HW_CFG_MAC_UPPER);
+        reg = REG_RD_IND(bp, bp->shmem_base + BNX2_PORT_HW_CFG_MAC_UPPER);
         bp->mac_addr[0] = (u8) (reg >> 8);
         bp->mac_addr[1] = (u8) reg;
 
-        reg = REG_RD_IND(bp, HOST_VIEW_SHMEM_BASE + BNX2_PORT_HW_CFG_MAC_LOWER);
+        reg = REG_RD_IND(bp, bp->shmem_base + BNX2_PORT_HW_CFG_MAC_LOWER);
         bp->mac_addr[2] = (u8) (reg >> 24);
         bp->mac_addr[3] = (u8) (reg >> 16);
         bp->mac_addr[4] = (u8) (reg >> 8);
@@ -5316,10 +5620,19 @@ bnx2_init_board(struct pci_dev *pdev, struct net_device *dev)
         bp->timer_interval =  HZ;
         bp->current_interval =  HZ;
 
+        bp->phy_addr = 1;
+
         /* Disable WOL support if we are running on a SERDES chip. */
         if (CHIP_BOND_ID(bp) & CHIP_BOND_ID_SERDES_BIT) {
                 bp->phy_flags |= PHY_SERDES_FLAG;
                 bp->flags |= NO_WOL_FLAG;
+                if (CHIP_NUM(bp) == CHIP_NUM_5708) {
+                        bp->phy_addr = 2;
+                        reg = REG_RD_IND(bp, bp->shmem_base +
+                                         BNX2_SHARED_HW_CFG_CONFIG);
+                        if (reg & BNX2_SHARED_HW_CFG_PHY_2_5G)
+                                bp->phy_flags |= PHY_2_5G_CAPABLE_FLAG;
+                }
         }
 
         if (CHIP_ID(bp) == CHIP_ID_5706_A0) {
@@ -5339,8 +5652,7 @@ bnx2_init_board(struct pci_dev *pdev, struct net_device *dev)
         if (bp->phy_flags & PHY_SERDES_FLAG) {
                 bp->advertising = ETHTOOL_ALL_FIBRE_SPEED | ADVERTISED_Autoneg;
 
-                reg = REG_RD_IND(bp, HOST_VIEW_SHMEM_BASE +
-                                 BNX2_PORT_HW_CFG_CONFIG);
+                reg = REG_RD_IND(bp, bp->shmem_base + BNX2_PORT_HW_CFG_CONFIG);
                 reg &= BNX2_PORT_HW_CFG_CFG_DFLT_LINK_MASK;
                 if (reg == BNX2_PORT_HW_CFG_CFG_DFLT_LINK_1G) {
                         bp->autoneg = 0;
diff --git a/drivers/net/bnx2.h b/drivers/net/bnx2.h
index 62857b6a6ee4..76bb5f1a250b 100644
--- a/drivers/net/bnx2.h
+++ b/drivers/net/bnx2.h
@@ -1449,8 +1449,9 @@ struct l2_fhdr {
 #define BNX2_EMAC_MODE_PORT_NONE                         (0L<<2)
 #define BNX2_EMAC_MODE_PORT_MII                          (1L<<2)
 #define BNX2_EMAC_MODE_PORT_GMII                         (2L<<2)
-#define BNX2_EMAC_MODE_PORT_UNDEF                        (3L<<2)
+#define BNX2_EMAC_MODE_PORT_MII_10                       (3L<<2)
 #define BNX2_EMAC_MODE_MAC_LOOP                          (1L<<4)
+#define BNX2_EMAC_MODE_25G                               (1L<<5)
 #define BNX2_EMAC_MODE_TAGGED_MAC_CTL                    (1L<<7)
 #define BNX2_EMAC_MODE_TX_BURST                          (1L<<8)
 #define BNX2_EMAC_MODE_MAX_DEFER_DROP_ENA                (1L<<9)
@@ -3714,6 +3715,15 @@ struct l2_fhdr {
 #define BNX2_MCP_ROM                                    0x00150000
 #define BNX2_MCP_SCRATCH                                0x00160000
 
+#define BNX2_SHM_HDR_SIGNATURE                          BNX2_MCP_SCRATCH
+#define BNX2_SHM_HDR_SIGNATURE_SIG_MASK                  0xffff0000
+#define BNX2_SHM_HDR_SIGNATURE_SIG                       0x53530000
+#define BNX2_SHM_HDR_SIGNATURE_VER_MASK                  0x000000ff
+#define BNX2_SHM_HDR_SIGNATURE_VER_ONE                   0x00000001
+
+#define BNX2_SHM_HDR_ADDR_0                             BNX2_MCP_SCRATCH + 4
+#define BNX2_SHM_HDR_ADDR_1                             BNX2_MCP_SCRATCH + 8
+
 
 #define NUM_MC_HASH_REGISTERS   8
 
@@ -3724,6 +3734,53 @@ struct l2_fhdr {
 #define PHY_ID(id)                                  ((id) & 0xfffffff0)
 #define PHY_REV_ID(id)                              ((id) & 0xf)
 
+/* 5708 Serdes PHY registers */
+
+#define BCM5708S_UP1                            0xb
+
+#define BCM5708S_UP1_2G5                        0x1
+
+#define BCM5708S_BLK_ADDR                       0x1f
+
+#define BCM5708S_BLK_ADDR_DIG                   0x0000
+#define BCM5708S_BLK_ADDR_DIG3                  0x0002
+#define BCM5708S_BLK_ADDR_TX_MISC               0x0005
+
+/* Digital Block */
+#define BCM5708S_1000X_CTL1                     0x10
+
+#define BCM5708S_1000X_CTL1_FIBER_MODE          0x0001
+#define BCM5708S_1000X_CTL1_AUTODET_EN          0x0010
+
+#define BCM5708S_1000X_CTL2                     0x11
+
+#define BCM5708S_1000X_CTL2_PLLEL_DET_EN        0x0001
+
+#define BCM5708S_1000X_STAT1                    0x14
+
+#define BCM5708S_1000X_STAT1_SGMII              0x0001
+#define BCM5708S_1000X_STAT1_LINK               0x0002
+#define BCM5708S_1000X_STAT1_FD                 0x0004
+#define BCM5708S_1000X_STAT1_SPEED_MASK         0x0018
+#define BCM5708S_1000X_STAT1_SPEED_10           0x0000
+#define BCM5708S_1000X_STAT1_SPEED_100          0x0008
+#define BCM5708S_1000X_STAT1_SPEED_1G           0x0010
+#define BCM5708S_1000X_STAT1_SPEED_2G5          0x0018
+#define BCM5708S_1000X_STAT1_TX_PAUSE           0x0020
+#define BCM5708S_1000X_STAT1_RX_PAUSE           0x0040
+
+/* Digital3 Block */
+#define BCM5708S_DIG_3_0                        0x10
+
+#define BCM5708S_DIG_3_0_USE_IEEE               0x0001
+
+/* Tx/Misc Block */
+#define BCM5708S_TX_ACTL1                       0x15
+
+#define BCM5708S_TX_ACTL1_DRIVER_VCM            0x30
+
+#define BCM5708S_TX_ACTL3                       0x17
+
 #define MIN_ETHERNET_PACKET_SIZE        60
 #define MAX_ETHERNET_PACKET_SIZE        1514
 #define MAX_ETHERNET_JUMBO_PACKET_SIZE  9014
@@ -3799,7 +3856,7 @@ struct sw_bd {
 #define BUFFERED_FLASH_PHY_PAGE_SIZE            (1 << BUFFERED_FLASH_PAGE_BITS)
 #define BUFFERED_FLASH_BYTE_ADDR_MASK           (BUFFERED_FLASH_PHY_PAGE_SIZE-1)
 #define BUFFERED_FLASH_PAGE_SIZE                264
-#define BUFFERED_FLASH_TOTAL_SIZE               131072
+#define BUFFERED_FLASH_TOTAL_SIZE               0x21000
 
 #define SAIFUN_FLASH_PAGE_BITS                  8
 #define SAIFUN_FLASH_PHY_PAGE_SIZE              (1 << SAIFUN_FLASH_PAGE_BITS)
@@ -3807,6 +3864,12 @@ struct sw_bd {
 #define SAIFUN_FLASH_PAGE_SIZE                  256
 #define SAIFUN_FLASH_BASE_TOTAL_SIZE            65536
 
+#define ST_MICRO_FLASH_PAGE_BITS                8
+#define ST_MICRO_FLASH_PHY_PAGE_SIZE            (1 << ST_MICRO_FLASH_PAGE_BITS)
+#define ST_MICRO_FLASH_BYTE_ADDR_MASK           (ST_MICRO_FLASH_PHY_PAGE_SIZE-1)
+#define ST_MICRO_FLASH_PAGE_SIZE                256
+#define ST_MICRO_FLASH_BASE_TOTAL_SIZE          65536
+
 #define NVRAM_TIMEOUT_COUNT                     30000
 
 
@@ -3815,6 +3878,8 @@ struct sw_bd {
                                                  BNX2_NVM_CFG1_PROTECT_MODE | \
                                                  BNX2_NVM_CFG1_FLASH_SIZE)
 
+#define FLASH_BACKUP_STRAP_MASK                 (0xf << 26)
+
 struct flash_spec {
         u32 strapping;
         u32 config1;
@@ -3849,6 +3914,9 @@ struct bnx2 {
         u16                     tx_cons;
         int                     tx_ring_size;
 
+        u16                     hw_tx_cons;
+        u16                     hw_rx_cons;
+
 #ifdef BCM_VLAN 
         struct                  vlan_group *vlgrp;
 #endif
@@ -3893,6 +3961,7 @@ struct bnx2 {
 #define PHY_SERDES_FLAG                 1
 #define PHY_CRC_FIX_FLAG                2
 #define PHY_PARALLEL_DETECT_FLAG        4
+#define PHY_2_5G_CAPABLE_FLAG           8
 #define PHY_INT_MODE_MASK_FLAG          0x300
 #define PHY_INT_MODE_AUTO_POLLING_FLAG  0x100
 #define PHY_INT_MODE_LINK_READY_FLAG    0x200
@@ -3901,6 +3970,7 @@ struct bnx2 {
         /* chip num:16-31, rev:12-15, metal:4-11, bond_id:0-3 */
 #define CHIP_NUM(bp)                    (((bp)->chip_id) & 0xffff0000)
 #define CHIP_NUM_5706                   0x57060000
+#define CHIP_NUM_5708                   0x57080000
 
 #define CHIP_REV(bp)                    (((bp)->chip_id) & 0x0000f000)
 #define CHIP_REV_Ax                     0x00000000
@@ -3913,6 +3983,9 @@ struct bnx2 {
 #define CHIP_ID(bp)                     (((bp)->chip_id) & 0xfffffff0)
 #define CHIP_ID_5706_A0                 0x57060000
 #define CHIP_ID_5706_A1                 0x57060010
+#define CHIP_ID_5706_A2                 0x57060020
+#define CHIP_ID_5708_A0                 0x57080000
+#define CHIP_ID_5708_B0                 0x57081000
 
 #define CHIP_BOND_ID(bp)                (((bp)->chip_id) & 0xf)
 
@@ -3991,6 +4064,8 @@ struct bnx2 {
 
         u8                      mac_addr[8];
 
+        u32                     shmem_base;
+
         u32                     fw_ver;
 
         int                     pm_cap;
@@ -4130,14 +4205,46 @@ struct fw_info {
 #define BNX2_FW_MSG_STATUS_FAILURE               0x00ff0000
 
 #define BNX2_LINK_STATUS                        0x0000000c
+#define BNX2_LINK_STATUS_INIT_VALUE              0xffffffff 
+#define BNX2_LINK_STATUS_LINK_UP                 0x1 
+#define BNX2_LINK_STATUS_LINK_DOWN               0x0 
+#define BNX2_LINK_STATUS_SPEED_MASK              0x1e
+#define BNX2_LINK_STATUS_AN_INCOMPLETE           (0<<1) 
+#define BNX2_LINK_STATUS_10HALF                  (1<<1) 
+#define BNX2_LINK_STATUS_10FULL                  (2<<1) 
+#define BNX2_LINK_STATUS_100HALF                 (3<<1) 
+#define BNX2_LINK_STATUS_100BASE_T4              (4<<1) 
+#define BNX2_LINK_STATUS_100FULL                 (5<<1) 
+#define BNX2_LINK_STATUS_1000HALF                (6<<1) 
+#define BNX2_LINK_STATUS_1000FULL                (7<<1) 
+#define BNX2_LINK_STATUS_2500HALF                (8<<1) 
+#define BNX2_LINK_STATUS_2500FULL                (9<<1) 
+#define BNX2_LINK_STATUS_AN_ENABLED              (1<<5) 
+#define BNX2_LINK_STATUS_AN_COMPLETE             (1<<6) 
+#define BNX2_LINK_STATUS_PARALLEL_DET            (1<<7) 
+#define BNX2_LINK_STATUS_RESERVED                (1<<8) 
+#define BNX2_LINK_STATUS_PARTNER_AD_1000FULL     (1<<9) 
+#define BNX2_LINK_STATUS_PARTNER_AD_1000HALF     (1<<10) 
+#define BNX2_LINK_STATUS_PARTNER_AD_100BT4       (1<<11) 
+#define BNX2_LINK_STATUS_PARTNER_AD_100FULL      (1<<12) 
+#define BNX2_LINK_STATUS_PARTNER_AD_100HALF      (1<<13) 
+#define BNX2_LINK_STATUS_PARTNER_AD_10FULL       (1<<14) 
+#define BNX2_LINK_STATUS_PARTNER_AD_10HALF       (1<<15) 
+#define BNX2_LINK_STATUS_TX_FC_ENABLED           (1<<16) 
+#define BNX2_LINK_STATUS_RX_FC_ENABLED           (1<<17) 
+#define BNX2_LINK_STATUS_PARTNER_SYM_PAUSE_CAP   (1<<18) 
+#define BNX2_LINK_STATUS_PARTNER_ASYM_PAUSE_CAP  (1<<19) 
+#define BNX2_LINK_STATUS_SERDES_LINK             (1<<20) 
+#define BNX2_LINK_STATUS_PARTNER_AD_2500FULL     (1<<21) 
+#define BNX2_LINK_STATUS_PARTNER_AD_2500HALF     (1<<22) 
 
 #define BNX2_DRV_PULSE_MB                       0x00000010
-#define BNX2_DRV_PULSE_SEQ_MASK                  0x0000ffff
+#define BNX2_DRV_PULSE_SEQ_MASK                  0x00007fff
 
 /* Indicate to the firmware not to go into the
  * OS absent when it is not getting driver pulse.
  * This is used for debugging. */
-#define BNX2_DRV_MSG_DATA_PULSE_CODE_ALWAYS_ALIVE        0x00010000
+#define BNX2_DRV_MSG_DATA_PULSE_CODE_ALWAYS_ALIVE        0x00080000
 
 #define BNX2_DEV_INFO_SIGNATURE                 0x00000020
 #define BNX2_DEV_INFO_SIGNATURE_MAGIC            0x44564900
@@ -4160,6 +4267,8 @@ struct fw_info {
 #define BNX2_SHARED_HW_CFG_DESIGN_LOM            0x1
 #define BNX2_SHARED_HW_CFG_PHY_COPPER            0
 #define BNX2_SHARED_HW_CFG_PHY_FIBER             0x2
+#define BNX2_SHARED_HW_CFG_PHY_2_5G              0x20
+#define BNX2_SHARED_HW_CFG_PHY_BACKPLANE         0x40
 #define BNX2_SHARED_HW_CFG_LED_MODE_SHIFT_BITS   8
 #define BNX2_SHARED_HW_CFG_LED_MODE_MASK         0x300
 #define BNX2_SHARED_HW_CFG_LED_MODE_MAC          0
@@ -4173,9 +4282,11 @@ struct fw_info {
 
 #define BNX2_PORT_HW_CFG_MAC_LOWER              0x00000054
 #define BNX2_PORT_HW_CFG_CONFIG                 0x00000058
+#define BNX2_PORT_HW_CFG_CFG_TXCTL3_MASK         0x0000ffff
 #define BNX2_PORT_HW_CFG_CFG_DFLT_LINK_MASK      0x001f0000
 #define BNX2_PORT_HW_CFG_CFG_DFLT_LINK_AN        0x00000000
 #define BNX2_PORT_HW_CFG_CFG_DFLT_LINK_1G        0x00030000
+#define BNX2_PORT_HW_CFG_CFG_DFLT_LINK_2_5G      0x00040000
 
 #define BNX2_PORT_HW_CFG_IMD_MAC_A_UPPER        0x00000068
 #define BNX2_PORT_HW_CFG_IMD_MAC_A_LOWER        0x0000006c
diff --git a/drivers/net/bnx2_fw.h b/drivers/net/bnx2_fw.h
index 35f3a2ae5ef1..ab07a4900e9a 100644
--- a/drivers/net/bnx2_fw.h
+++ b/drivers/net/bnx2_fw.h
@@ -14,24 +14,23 @@
  * accompanying it.
  */
 
-
-static int bnx2_COM_b06FwReleaseMajor = 0x0;
+static int bnx2_COM_b06FwReleaseMajor = 0x1;
 static int bnx2_COM_b06FwReleaseMinor = 0x0;
 static int bnx2_COM_b06FwReleaseFix = 0x0;
-static u32 bnx2_COM_b06FwStartAddr = 0x080004a0;
+static u32 bnx2_COM_b06FwStartAddr = 0x080008b4;
 static u32 bnx2_COM_b06FwTextAddr = 0x08000000;
-static int bnx2_COM_b06FwTextLen = 0x4594;
-static u32 bnx2_COM_b06FwDataAddr = 0x080045e0;
+static int bnx2_COM_b06FwTextLen = 0x57bc;
+static u32 bnx2_COM_b06FwDataAddr = 0x08005840;
 static int bnx2_COM_b06FwDataLen = 0x0;
-static u32 bnx2_COM_b06FwRodataAddr = 0x08004598;
-static int bnx2_COM_b06FwRodataLen = 0x18;
-static u32 bnx2_COM_b06FwBssAddr = 0x08004600;
+static u32 bnx2_COM_b06FwRodataAddr = 0x080057c0;
+static int bnx2_COM_b06FwRodataLen = 0x58;
+static u32 bnx2_COM_b06FwBssAddr = 0x08005860;
 static int bnx2_COM_b06FwBssLen = 0x88;
-static u32 bnx2_COM_b06FwSbssAddr = 0x080045e0;
+static u32 bnx2_COM_b06FwSbssAddr = 0x08005840;
 static int bnx2_COM_b06FwSbssLen = 0x1c;
-static u32 bnx2_COM_b06FwText[(0x4594/4) + 1] = {
-        0x0a000128, 0x00000000, 0x00000000, 0x0000000d, 0x636f6d20, 0x302e362e,
-        0x39000000, 0x00060902, 0x00000000, 0x00000003, 0x00000014, 0x00000032,
+static u32 bnx2_COM_b06FwText[(0x57bc/4) + 1] = {
+        0x0a00022d, 0x00000000, 0x00000000, 0x0000000d, 0x636f6d20, 0x322e352e,
+        0x38000000, 0x02050802, 0x00000000, 0x00000003, 0x00000014, 0x00000032,
         0x00000003, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
         0x00000010, 0x000003e8, 0x0000ea60, 0x00000001, 0x00000000, 0x00000000,
         0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
@@ -79,70 +78,117 @@ static u32 bnx2_COM_b06FwText[(0x4594/4) + 1] = {
         0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
         0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
         0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-        0x00000000, 0x00000000, 0x00000000, 0x10000003, 0x00000000, 0x0000000d,
-        0x0000000d, 0x3c020800, 0x244245e0, 0x3c030800, 0x24634688, 0xac400000,
-        0x0043202b, 0x1480fffd, 0x24420004, 0x3c1d0800, 0x37bd7ffc, 0x03a0f021,
-        0x3c100800, 0x261004a0, 0x3c1c0800, 0x279c45e0, 0x0e0001f2, 0x00000000,
-        0x0000000d, 0x27bdffe8, 0x3c1a8000, 0x3c020008, 0x0342d825, 0x3c036010,
-        0xafbf0010, 0x8c655000, 0x3c020800, 0x24470ac8, 0x3c040800, 0x24864600,
-        0x2402ff7f, 0x00a22824, 0x34a5380c, 0xac655000, 0x00002821, 0x24020037,
-        0x24030c80, 0xaf420008, 0xaf430024, 0xacc70000, 0x24a50001, 0x2ca20016,
-        0x1440fffc, 0x24c60004, 0x24844600, 0x3c020800, 0x24420ad4, 0x3c030800,
-        0x246309d4, 0xac820004, 0x3c020800, 0x24420618, 0x3c050800, 0x24a50ca0,
-        0xac82000c, 0x3c020800, 0x24423100, 0xac830008, 0x3c030800, 0x246325c8,
-        0xac820014, 0x3c020800, 0x24422b0c, 0xac830018, 0xac83001c, 0x3c030800,
-        0x24630adc, 0xac820024, 0x3c020800, 0x24423040, 0xac83002c, 0x3c030800,
-        0x24633060, 0xac820030, 0x3c020800, 0x24422f6c, 0xac830034, 0x3c030800,
-        0x24632c60, 0xac82003c, 0x3c020800, 0x24420b6c, 0xac850010, 0xac850020,
-        0xac830040, 0x0e000bd6, 0xac820050, 0x8fbf0010, 0x03e00008, 0x27bd0018,
-        0x27bdffe0, 0xafb00010, 0x27500100, 0xafbf0018, 0xafb10014, 0x9203000b,
-        0x24020003, 0x1462005b, 0x96110008, 0x32220001, 0x10400009, 0x27430080,
-        0x8e020000, 0x96040014, 0x000211c2, 0x00021040, 0x00621821, 0xa4640000,
-        0x0a0001cb, 0x3c020800, 0x3c020800, 0x8c430020, 0x1060002a, 0x3c030800,
-        0x0e001006, 0x00000000, 0x97420108, 0x8f850018, 0x9743010c, 0x3042003e,
-        0x00021400, 0x00621825, 0xaca30000, 0x8f840018, 0x8f420100, 0xac820004,
-        0x97430116, 0x9742010e, 0x8f840018, 0x00031c00, 0x00431025, 0xac820008,
-        0x97430110, 0x97440112, 0x8f850018, 0x00031c00, 0x00832025, 0xaca4000c,
-        0x97420114, 0x8f840018, 0x3042ffff, 0xac820010, 0x8f830018, 0xac600014,
-        0x8f820018, 0x3c030800, 0xac400018, 0x9462466e, 0x8f840018, 0x3c032000,
-        0x00431025, 0xac82001c, 0x0e001044, 0x24040001, 0x3c030800, 0x8c620040,
-        0x24420001, 0xac620040, 0x3c020800, 0x8c430044, 0x32240004, 0x24630001,
-        0x10800017, 0xac430044, 0x8f4202b8, 0x04430007, 0x8e020020, 0x3c040800,
-        0x8c830060, 0x24020001, 0x24630001, 0x0a0001ed, 0xac830060, 0x3c060800,
-        0x8cc4005c, 0xaf420280, 0x96030016, 0x00001021, 0xa7430284, 0x8e050004,
-        0x24840001, 0x3c031000, 0xaf450288, 0xaf4302b8, 0x0a0001ed, 0xacc4005c,
-        0x32220002, 0x0a0001ed, 0x0002102b, 0x3c026000, 0xac400808, 0x0000000d,
-        0x00001021, 0x8fbf0018, 0x8fb10014, 0x8fb00010, 0x03e00008, 0x27bd0020,
-        0x27bdffc8, 0xafbf0034, 0xafbe0030, 0xafb7002c, 0xafb60028, 0xafb50024,
-        0xafb40020, 0xafb3001c, 0xafb20018, 0xafb10014, 0x0e00013f, 0xafb00010,
-        0x24110020, 0x24150030, 0x2794000c, 0x27930008, 0x3c124000, 0x3c1e0800,
-        0x3c170800, 0x3c160800, 0x8f820004, 0x3c040800, 0x8c830020, 0x10430004,
-        0x00000000, 0xaf830004, 0x0e00110b, 0x00000000, 0x8f500000, 0x32020007,
-        0x1040fff5, 0x32020001, 0x1040002b, 0x32020002, 0x8f420100, 0xaf420020,
-        0x8f430104, 0xaf4300a8, 0x9342010b, 0x93630000, 0x306300ff, 0x10710005,
-        0x304400ff, 0x10750006, 0x2c820016, 0x0a000227, 0x00000000, 0xaf940000,
-        0x0a000228, 0x2c820016, 0xaf930000, 0x0a000228, 0x00000000, 0xaf800000,
-        0x14400005, 0x00041880, 0x0e0002b2, 0x00000000, 0x0a000234, 0x00000000,
-        0x3c020800, 0x24424600, 0x00621821, 0x8c620000, 0x0040f809, 0x00000000,
-        0x10400005, 0x8fc20034, 0x8f420104, 0x3c016020, 0xac220014, 0x8fc20034,
-        0xaf520138, 0x24420001, 0xafc20034, 0x32020002, 0x10400019, 0x32020004,
-        0x8f420140, 0xaf420020, 0x93630000, 0x306300ff, 0x10710005, 0x00000000,
-        0x10750006, 0x00000000, 0x0a000250, 0x00000000, 0xaf940000, 0x0a000251,
-        0x00000000, 0xaf930000, 0x0a000251, 0x00000000, 0xaf800000, 0x0e0008b9,
-        0x00000000, 0x8ee20038, 0xaf520178, 0x24420001, 0xaee20038, 0x32020004,
-        0x1040ffad, 0x00000000, 0x8f420180, 0xaf420020, 0x93630000, 0x306300ff,
-        0x10710005, 0x00000000, 0x10750006, 0x00000000, 0x0a00026a, 0x00000000,
-        0xaf940000, 0x0a00026b, 0x00000000, 0xaf930000, 0x0a00026b, 0x00000000,
-        0xaf800000, 0x93620000, 0x14510004, 0x8ec2003c, 0x0e000835, 0x00000000,
-        0x8ec2003c, 0xaf5201b8, 0x24420001, 0x0a000206, 0xaec2003c, 0x27bdffe8,
-        0xafbf0010, 0x97420108, 0x24033000, 0x30447000, 0x10830012, 0x28823001,
-        0x10400007, 0x24024000, 0x1080000b, 0x24022000, 0x1082001a, 0x24020001,
-        0x0a000299, 0x00000000, 0x1082000c, 0x24025000, 0x1082000e, 0x00000000,
-        0x0a000299, 0x00000000, 0x0000000d, 0x0a00029b, 0x00001021, 0x0e000300,
-        0x00000000, 0x0a00029b, 0x00001021, 0x0e00048f, 0x00000000, 0x0a00029b,
-        0x00001021, 0x0e000fdf, 0x00000000, 0x0a00029b, 0x00001021, 0x0000000d,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x10000003, 0x00000000, 0x0000000d, 0x0000000d, 0x3c020800, 0x24425840,
+        0x3c030800, 0x246358e8, 0xac400000, 0x0043202b, 0x1480fffd, 0x24420004,
+        0x3c1d0800, 0x37bd7ffc, 0x03a0f021, 0x3c100800, 0x261008b4, 0x3c1c0800,
+        0x279c5840, 0x0e0002f7, 0x00000000, 0x0000000d, 0x27bdffe8, 0x3c1a8000,
+        0x3c020008, 0x0342d825, 0x3c036010, 0xafbf0010, 0x8c655000, 0x3c020800,
+        0x24470f30, 0x3c040800, 0x24865860, 0x2402ff7f, 0x00a22824, 0x34a5380c,
+        0xac655000, 0x00002821, 0x24020037, 0x24030c80, 0xaf420008, 0xaf430024,
+        0xacc70000, 0x24a50001, 0x2ca20016, 0x1440fffc, 0x24c60004, 0x24845860,
+        0x3c020800, 0x24420f3c, 0x3c030800, 0x24630e2c, 0xac820004, 0x3c020800,
+        0x24420a2c, 0x3c050800, 0x24a51268, 0xac82000c, 0x3c020800, 0x244243dc,
+        0xac830008, 0x3c030800, 0x24633698, 0xac820014, 0x3c020800, 0x24423c24,
+        0xac830018, 0xac83001c, 0x3c030800, 0x24630f44, 0xac820024, 0x3c020800,
+        0x244243ac, 0xac83002c, 0x3c030800, 0x246343cc, 0xac820030, 0x3c020800,
+        0x244242f0, 0xac830034, 0x3c030800, 0x24633d78, 0xac82003c, 0x3c020800,
+        0x24420fd4, 0xac850010, 0xac850020, 0xac830040, 0x0e0010b7, 0xac820050,
+        0x8fbf0010, 0x03e00008, 0x27bd0018, 0x27bdffe0, 0xafb00010, 0x27500100,
+        0xafbf0018, 0xafb10014, 0x9203000b, 0x24020003, 0x1462005b, 0x96110008,
+        0x32220001, 0x10400009, 0x27430080, 0x8e020000, 0x96040014, 0x000211c2,
+        0x00021040, 0x00621821, 0xa4640000, 0x0a0002d0, 0x3c020800, 0x3c020800,
+        0x8c430020, 0x1060002a, 0x3c030800, 0x0e00148e, 0x00000000, 0x97420108,
+        0x8f850018, 0x9743010c, 0x3042003e, 0x00021400, 0x00621825, 0xaca30000,
+        0x8f840018, 0x8f420100, 0xac820004, 0x97430116, 0x9742010e, 0x8f840018,
+        0x00031c00, 0x00431025, 0xac820008, 0x97430110, 0x97440112, 0x8f850018,
+        0x00031c00, 0x00832025, 0xaca4000c, 0x97420114, 0x8f840018, 0x3042ffff,
+        0xac820010, 0x8f830018, 0xac600014, 0x8f820018, 0x3c030800, 0xac400018,
+        0x946258ce, 0x8f840018, 0x3c032000, 0x00431025, 0xac82001c, 0x0e0014cc,
+        0x24040001, 0x3c030800, 0x8c620040, 0x24420001, 0xac620040, 0x3c020800,
+        0x8c430044, 0x32240004, 0x24630001, 0x10800017, 0xac430044, 0x8f4202b8,
+        0x04430007, 0x8e020020, 0x3c040800, 0x8c830060, 0x24020001, 0x24630001,
+        0x0a0002f2, 0xac830060, 0x3c060800, 0x8cc4005c, 0xaf420280, 0x96030016,
+        0x00001021, 0xa7430284, 0x8e050004, 0x24840001, 0x3c031000, 0xaf450288,
+        0xaf4302b8, 0x0a0002f2, 0xacc4005c, 0x32220002, 0x0a0002f2, 0x0002102b,
+        0x3c026000, 0xac400808, 0x0000000d, 0x00001021, 0x8fbf0018, 0x8fb10014,
+        0x8fb00010, 0x03e00008, 0x27bd0020, 0x27bdffc8, 0xafbf0034, 0xafbe0030,
+        0xafb7002c, 0xafb60028, 0xafb50024, 0xafb40020, 0xafb3001c, 0xafb20018,
+        0xafb10014, 0x0e000244, 0xafb00010, 0x3c170800, 0x3c160800, 0x24110020,
+        0x24150030, 0x2794000c, 0x27930008, 0x3c124000, 0x3c1e0800, 0x8f820004,
+        0x3c040800, 0x8c830020, 0x10430005, 0x8ee200a4, 0xaf830004, 0x0e001593,
+        0x00000000, 0x8ee200a4, 0x8ec300a0, 0x10430004, 0x26c400a0, 0x94820002,
+        0xa742009e, 0xaee300a4, 0x8f500000, 0x32020007, 0x1040ffee, 0x32020001,
+        0x1040002c, 0x32020002, 0x8f420100, 0xaf420020, 0x8f430104, 0xaf4300a8,
+        0x9342010b, 0x93630000, 0x306300ff, 0x10710005, 0x304400ff, 0x10750006,
+        0x2c820016, 0x0a000333, 0x00000000, 0xaf940000, 0x0a000334, 0x2c820016,
+        0xaf930000, 0x0a000334, 0x00000000, 0xaf800000, 0x14400005, 0x00041880,
+        0x0e0003cc, 0x00000000, 0x0a000340, 0x00000000, 0x3c020800, 0x24425860,
+        0x00621821, 0x8c620000, 0x0040f809, 0x00000000, 0x10400005, 0x3c030800,
+        0x8f420104, 0x3c016020, 0xac220014, 0x3c030800, 0x8c620034, 0xaf520138,
+        0x24420001, 0xac620034, 0x32020002, 0x1040001a, 0x32020004, 0x8f420140,
+        0xaf420020, 0x93630000, 0x306300ff, 0x10710005, 0x00000000, 0x10750006,
+        0x00000000, 0x0a00035d, 0x00000000, 0xaf940000, 0x0a00035e, 0x00000000,
+        0xaf930000, 0x0a00035e, 0x00000000, 0xaf800000, 0x0e000c7b, 0x00000000,
+        0x3c040800, 0x8c820038, 0xaf520178, 0x24420001, 0xac820038, 0x32020004,
+        0x1040ffa4, 0x00000000, 0x8f420180, 0xaf420020, 0x93630000, 0x306300ff,
+        0x10710005, 0x00000000, 0x10750006, 0x00000000, 0x0a000378, 0x00000000,
+        0xaf940000, 0x0a000379, 0x00000000, 0xaf930000, 0x0a000379, 0x00000000,
+        0xaf800000, 0x8f430180, 0x24020f00, 0x14620005, 0x00000000, 0x8f420188,
+        0xa742009c, 0x0a000387, 0x8fc2003c, 0x93620000, 0x14510004, 0x8fc2003c,
+        0x0e000bad, 0x00000000, 0x8fc2003c, 0xaf5201b8, 0x24420001, 0x0a00030b,
+        0xafc2003c, 0x27bdffe8, 0xafbf0010, 0x97420108, 0x24033000, 0x30447000,
+        0x10830016, 0x28823001, 0x10400007, 0x24024000, 0x1080000b, 0x24022000,
+        0x1082000c, 0x00000000, 0x0a0003b3, 0x00000000, 0x10820010, 0x24025000,
+        0x10820012, 0x00000000, 0x0a0003b3, 0x00000000, 0x0000000d, 0x0a0003b5,
+        0x00001021, 0x0e000442, 0x00000000, 0x0a0003b6, 0x8fbf0010, 0x0e00041a,
+        0x00000000, 0x0a0003b5, 0x00001021, 0x0e000669, 0x00000000, 0x0a0003b5,
+        0x00001021, 0x0e001467, 0x00000000, 0x0a0003b5, 0x00001021, 0x0000000d,
         0x00001021, 0x8fbf0010, 0x03e00008, 0x27bd0018, 0x93620000, 0x24030020,
-        0x304400ff, 0x10830005, 0x24020030, 0x10820007, 0x00000000, 0x0a0002af,
+        0x304400ff, 0x10830005, 0x24020030, 0x10820007, 0x00000000, 0x0a0003c9,
         0x00000000, 0x2782000c, 0xaf820000, 0x03e00008, 0x00000000, 0x27820008,
         0xaf820000, 0x03e00008, 0x00000000, 0xaf800000, 0x03e00008, 0x00000000,
         0x0000000d, 0x03e00008, 0x00001021, 0x03e00008, 0x00001021, 0x27440100,
@@ -159,1000 +205,1716 @@ static u32 bnx2_COM_b06FwText[(0x4594/4) + 1] = {
         0x3c020006, 0x34420001, 0xaf420030, 0x00000000, 0x00000000, 0x00000000,
         0x8f420000, 0x30420010, 0x1040fffd, 0x00001021, 0x03e00008, 0x00000000,
         0x3c020800, 0x8c430020, 0x27bdffe8, 0xafb00010, 0x27500100, 0x1060001e,
-        0xafbf0014, 0x0e001006, 0x00000000, 0x8f830018, 0x8e020018, 0xac620000,
+        0xafbf0014, 0x0e00148e, 0x00000000, 0x8f830018, 0x8e020018, 0xac620000,
         0x8f840018, 0x9602000c, 0xac820004, 0x8f830018, 0xac600008, 0x8f820018,
         0xac40000c, 0x8f830018, 0xac600010, 0x8f820018, 0xac400014, 0x8f840018,
-        0x3c026000, 0x8c434448, 0xac830018, 0x96020008, 0x3c030800, 0x9464466e,
-        0x8f850018, 0x00021400, 0x00441025, 0x24040001, 0x0e001044, 0xaca2001c,
-        0x8fbf0014, 0x8fb00010, 0x03e00008, 0x27bd0018, 0x27bdffc8, 0xafb3001c,
-        0x00009821, 0xafb7002c, 0x0000b821, 0xafbe0030, 0x0000f021, 0xafb50024,
-        0x27550100, 0xafbf0034, 0xafb60028, 0xafb40020, 0xafb20018, 0xafb10014,
-        0xafb00010, 0x96a20008, 0x8f540100, 0x8eb20018, 0x30420001, 0x10400037,
-        0x02a0b021, 0x8f630054, 0x2642ffff, 0x00431023, 0x18400006, 0x00000000,
-        0x0000000d, 0x00000000, 0x24000128, 0x0a000372, 0x00002021, 0x8f62004c,
-        0x02421023, 0x18400028, 0x00002021, 0x93650120, 0x93640121, 0x3c030800,
-        0x8c62008c, 0x308400ff, 0x24420001, 0x30a500ff, 0x00803821, 0x1485000b,
-        0xac62008c, 0x3c040800, 0x8c830090, 0x24630001, 0xac830090, 0x93620122,
-        0x30420001, 0x00021023, 0x30420005, 0x0a000372, 0x34440004, 0x27660100,
-        0x00041080, 0x00c21021, 0x8c430000, 0x02431823, 0x04600004, 0x24820001,
-        0x30440007, 0x1485fff9, 0x00041080, 0x10870007, 0x3c030800, 0xa3640121,
-        0x8c620094, 0x24040005, 0x24420001, 0x0a000372, 0xac620094, 0x24040004,
-        0x00809821, 0x9362003f, 0x304400ff, 0x38830016, 0x2c630001, 0x38820010,
-        0x2c420001, 0x00621825, 0x1460000c, 0x24020001, 0x38830008, 0x2c630001,
-        0x38820014, 0x2c420001, 0x00621825, 0x14600005, 0x24020001, 0x24020012,
-        0x14820002, 0x00001021, 0x24020001, 0x50400007, 0x8eb10020, 0x8ea20020,
-        0x8f630040, 0x00408821, 0x00431023, 0x5c400001, 0x8f710040, 0x9343010b,
-        0x24020004, 0x54620005, 0x36730080, 0x96a20008, 0x36730002, 0x24170001,
-        0x305e0020, 0x2402fffb, 0x02628024, 0x1200002a, 0x3c030800, 0x8c620030,
-        0x02021024, 0x10400026, 0x3c020800, 0x8c430020, 0x10600024, 0x32620004,
-        0x0e001006, 0x00000000, 0x8f830018, 0x8f420100, 0xac620000, 0x8f840018,
-        0x02201821, 0x32620002, 0xac900004, 0x8f840018, 0x50400001, 0x8ec30014,
-        0xac830008, 0x8f830018, 0x8ec20020, 0xac62000c, 0x8f840018, 0x8f620040,
-        0xac820010, 0x8f830018, 0x8ec20018, 0xac620014, 0x8f840018, 0x3c026000,
-        0x8c434448, 0x3c020800, 0xac830018, 0x9443466e, 0x8f840018, 0x3c024010,
-        0x00621825, 0xac83001c, 0x0e001044, 0x24040001, 0x32620004, 0x10400076,
-        0x00003821, 0x3c029000, 0x34420001, 0x3c038000, 0x02821025, 0xa360007c,
-        0xaf420020, 0x8f420020, 0x00431024, 0x1440fffd, 0x00000000, 0x93620023,
-        0x30420080, 0x10400011, 0x00000000, 0x8f65005c, 0x8f63004c, 0x9764003c,
-        0x8f620064, 0x00a32823, 0x00852821, 0x00a2102b, 0x54400006, 0x3c023fff,
-        0x93620023, 0x3042007f, 0xa3620023, 0xaf720064, 0x3c023fff, 0x0a0003f1,
-        0x3442ffff, 0x8f62005c, 0x02421023, 0x04400011, 0x00000000, 0x8f65005c,
-        0x8f630064, 0x9764003c, 0x3c023fff, 0x3442ffff, 0xaf720064, 0x00a32823,
-        0x00852821, 0x0045102b, 0x10400004, 0x02451021, 0x3c053fff, 0x34a5ffff,
-        0x02451021, 0xaf62005c, 0x24070001, 0xaf72004c, 0x8f620054, 0x16420005,
+        0x3c026000, 0x8c434448, 0xac830018, 0x96020008, 0x3c030800, 0x946458ce,
+        0x8f850018, 0x00021400, 0x00441025, 0x24040001, 0x0e0014cc, 0xaca2001c,
+        0x8fbf0014, 0x8fb00010, 0x03e00008, 0x27bd0018, 0x27bdffe8, 0xafb00010,
+        0x27500100, 0xafbf0014, 0x92020009, 0x14400003, 0x3c020800, 0x0a00046c,
+        0x24020001, 0x8c430020, 0x1060001f, 0x00001021, 0x0e00148e, 0x00000000,
+        0x8f830018, 0x8e020018, 0xac620000, 0x8f840018, 0x9602000c, 0xac820004,
+        0x8f830018, 0xac600008, 0x8f820018, 0xac40000c, 0x8f830018, 0xac600010,
+        0x8f820018, 0xac400014, 0x8f840018, 0x3c026000, 0x8c434448, 0xac830018,
+        0x96020008, 0x3c030800, 0x946458ce, 0x8f850018, 0x00021400, 0x00441025,
+        0x24040001, 0x0e0014cc, 0xaca2001c, 0x00001021, 0x8fbf0014, 0x8fb00010,
+        0x03e00008, 0x27bd0018, 0x3c0b0800, 0x8d6808b0, 0x3c070800, 0x24e700b0,
+        0x00084900, 0x01271821, 0xac640000, 0x93620005, 0x97660008, 0x00e95021,
+        0x93630023, 0x9364003f, 0x25080001, 0x00021600, 0x00063400, 0x00461025,
+        0x00031a00, 0x00431025, 0x00822025, 0xad440004, 0x9362007e, 0x9366007f,
+        0x8f630178, 0x9364007a, 0x00021600, 0x00063400, 0x00461025, 0x00031a00,
+        0x00431025, 0x00822025, 0xad440008, 0x93620080, 0x9363007d, 0x3108007f,
+        0x01403821, 0xad6808b0, 0x00021600, 0x00031c00, 0x00431025, 0x00451025,
+        0x03e00008, 0xace2000c, 0x27bdffb8, 0xafb3002c, 0x00009821, 0xafbe0040,
+        0x0000f021, 0xafb50034, 0x27550100, 0xafbf0044, 0xafb7003c, 0xafb60038,
+        0xafb40030, 0xafb20028, 0xafb10024, 0xafb00020, 0xafa00010, 0xafa00014,
+        0x96a20008, 0x8f540100, 0x8eb10018, 0x30420001, 0x10400037, 0x02a0b821,
+        0x8f630054, 0x2622ffff, 0x00431023, 0x18400006, 0x00000000, 0x0000000d,
+        0x00000000, 0x2400015c, 0x0a0004e5, 0x00002021, 0x8f62004c, 0x02221023,
+        0x18400028, 0x00002021, 0x93650120, 0x93640121, 0x3c030800, 0x8c62008c,
+        0x308400ff, 0x24420001, 0x30a500ff, 0x00803821, 0x1485000b, 0xac62008c,
+        0x3c040800, 0x8c830090, 0x24630001, 0xac830090, 0x93620122, 0x30420001,
+        0x00021023, 0x30420005, 0x0a0004e5, 0x34440004, 0x27660100, 0x00041080,
+        0x00c21021, 0x8c430000, 0x02231823, 0x04600004, 0x24820001, 0x30440007,
+        0x1485fff9, 0x00041080, 0x10870007, 0x3c030800, 0xa3640121, 0x8c620094,
+        0x24040005, 0x24420001, 0x0a0004e5, 0xac620094, 0x24040004, 0x00809821,
+        0x9362003f, 0x304400ff, 0x38830016, 0x2c630001, 0x38820010, 0x2c420001,
+        0x00621825, 0x1460000c, 0x24020001, 0x38830008, 0x2c630001, 0x38820014,
+        0x2c420001, 0x00621825, 0x14600005, 0x24020001, 0x24020012, 0x14820002,
+        0x00001021, 0x24020001, 0x10400009, 0x00000000, 0x8ea20020, 0x8f630040,
+        0x0040b021, 0x00431023, 0x5c400010, 0x8f760040, 0x0a000511, 0x00000000,
+        0x9343010b, 0x24020004, 0x1462000a, 0x8eb60020, 0x8f630040, 0x3c021000,
+        0x00761823, 0x0043102a, 0x10400004, 0x00000000, 0x0000000d, 0x00000000,
+        0x240002fa, 0x9343010b, 0x24020004, 0x5462000b, 0x96a20008, 0x24020001,
+        0xafa20010, 0x96a20008, 0x24030001, 0xafa30018, 0x8eb2001c, 0x36730002,
+        0x30420020, 0x0a000526, 0xafa20014, 0x36730080, 0x30420002, 0x10400003,
+        0xafa00018, 0x0a000526, 0x8eb2001c, 0x8eb20014, 0x2402fffb, 0x02628024,
+        0x1200002a, 0x3c030800, 0x8c620030, 0x02021024, 0x10400026, 0x3c020800,
+        0x8c430020, 0x10600024, 0x32620004, 0x0e00148e, 0x00000000, 0x8f830018,
+        0x8f420100, 0xac620000, 0x8f840018, 0x02401821, 0x32620002, 0xac900004,
+        0x8f840018, 0x54400001, 0x02c01821, 0xac830008, 0x8f830018, 0x8ee20020,
+        0xac62000c, 0x8f840018, 0x8f620040, 0xac820010, 0x8f830018, 0x8ee20018,
+        0xac620014, 0x8f850018, 0x3c026000, 0x8c434448, 0x24040001, 0x3c020800,
+        0xaca30018, 0x944358ce, 0x8f850018, 0x3c024010, 0x00621825, 0x0e0014cc,
+        0xaca3001c, 0x32620004, 0x10400063, 0x00003821, 0x3c029000, 0x34420001,
+        0x3c038000, 0x02821025, 0xa360007c, 0xaf420020, 0x8f420020, 0x00431024,
+        0x1440fffd, 0x00000000, 0x93620023, 0x30420080, 0x10400011, 0x00000000,
+        0x8f65005c, 0x8f63004c, 0x9764003c, 0x8f620064, 0x00a32823, 0x00852821,
+        0x00a2102b, 0x54400006, 0x3c023fff, 0x93620023, 0x3042007f, 0xa3620023,
+        0xaf710064, 0x3c023fff, 0x0a000580, 0x3442ffff, 0x8f62005c, 0x02221023,
+        0x04400011, 0x00000000, 0x8f65005c, 0x8f630064, 0x9764003c, 0x3c023fff,
+        0x3442ffff, 0xaf710064, 0x00a32823, 0x00852821, 0x0045102b, 0x10400004,
+        0x02251021, 0x3c053fff, 0x34a5ffff, 0x02251021, 0xaf62005c, 0x24070001,
+        0xaf71004c, 0x8f620054, 0x16220005, 0x00000000, 0x93620023, 0x30420040,
+        0x10400017, 0x24020001, 0x9762006a, 0x00022880, 0x50a00001, 0x24050001,
+        0x97630068, 0x93640081, 0x3c020800, 0x8c46004c, 0x00652821, 0x00852804,
+        0x00c5102b, 0x54400001, 0x00a03021, 0x3c020800, 0x8c440050, 0x00c4182b,
+        0x54600001, 0x00c02021, 0x8f420074, 0x2403fffe, 0x00832824, 0x00a21021,
+        0xaf62000c, 0x93620082, 0x30420080, 0x50400001, 0xa3600081, 0x3c028000,
+        0x34420001, 0x02821025, 0xaf420020, 0x9363007e, 0x9362007a, 0x10620004,
+        0x00000000, 0x0e0013c4, 0x00000000, 0x00403821, 0x54e00001, 0x241e0001,
+        0x8f700040, 0x8f620040, 0x14520003, 0x00521023, 0x0a0005bf, 0x00001021,
+        0x28420001, 0x10400041, 0x8fa20010, 0x0e000fae, 0x02402021, 0xaf720040,
+        0x9362003e, 0x30420001, 0x1440000b, 0x3c029000, 0x93620022, 0x24420001,
+        0xa3620022, 0x93630022, 0x3c020800, 0x8c440098, 0x0064182b, 0x14600027,
+        0x3c020800, 0x3c029000, 0x34420001, 0x02821025, 0xaf420020, 0x3c038000,
+        0x8f420020, 0x00431024, 0x1440fffd, 0x00000000, 0x9362007d, 0x3c038000,
+        0x34420001, 0xa362007d, 0x8f640074, 0x34630001, 0x02831825, 0xaf430020,
+        0x04810006, 0x3c038000, 0x02802021, 0x0e000470, 0x24050273, 0x0a0005f2,
+        0x24050001, 0x8f4201f8, 0x00431024, 0x1440fffd, 0x24020002, 0x3c031000,
+        0xaf5401c0, 0xa34201c4, 0xaf4301f8, 0x24050001, 0x24020001, 0xa7620012,
+        0xa3600022, 0x0a0005fe, 0x2ca20001, 0x9743007a, 0x9444002a, 0x00002821,
+        0x00641821, 0x3063fffe, 0xa7630012, 0x2ca20001, 0x00021023, 0x03c2f024,
+        0x8fa20010, 0x10400004, 0x8fa30014, 0x0e0013c1, 0x00000000, 0x8fa30014,
+        0x10600003, 0x00000000, 0x0e0010eb, 0x00000000, 0x13c0001f, 0x3c029000,
+        0x34420001, 0x02821025, 0xaf420020, 0x3c038000, 0x8f420020, 0x00431024,
+        0x1440fffd, 0x00000000, 0x9362007d, 0x3c038000, 0xa362007d, 0x8f640074,
+        0x34630001, 0x02831825, 0xaf430020, 0x04810006, 0x3c038000, 0x02802021,
+        0x0e000470, 0x2405036c, 0x0a00062b, 0x8fa20018, 0x8f4201f8, 0x00431024,
+        0x1440fffd, 0x24020002, 0x3c031000, 0xaf5401c0, 0xa34201c4, 0xaf4301f8,
+        0x8fa20018, 0x5040002f, 0x96a20008, 0x8f620048, 0x8f630024, 0x00761821,
+        0xaf630048, 0x9764003c, 0x00501023, 0x0044102b, 0x10400025, 0x3c029000,
+        0x34420001, 0x3c040800, 0x8c830080, 0x8f450100, 0x3c068000, 0x24630001,
+        0x00a21025, 0xac830080, 0xaf420020, 0x8f420020, 0x00461024, 0x1440fffd,
+        0x00000000, 0x9362007d, 0x3c038000, 0x34420004, 0xa362007d, 0x8f640074,
+        0x34630001, 0x00a31825, 0xaf430020, 0x04810006, 0x3c038000, 0x00a02021,
+        0x0e000470, 0x2405038a, 0x0a00065b, 0x96a20008, 0x8f4201f8, 0x00431024,
+        0x1440fffd, 0x24020002, 0x3c031000, 0xaf4501c0, 0xa34201c4, 0xaf4301f8,
+        0x96a20008, 0x8fbf0044, 0x8fbe0040, 0x8fb7003c, 0x8fb60038, 0x8fb50034,
+        0x8fb40030, 0x8fb3002c, 0x8fb20028, 0x8fb10024, 0x8fb00020, 0x00021042,
+        0x30420001, 0x03e00008, 0x27bd0048, 0x27bdffe0, 0xafbf0018, 0x97420108,
+        0x24030019, 0x304400ff, 0x10830065, 0x2882001a, 0x1040001a, 0x2882000a,
+        0x1040000f, 0x28820008, 0x10400040, 0x24020001, 0x1082003a, 0x28820002,
+        0x50400005, 0x24020006, 0x10800032, 0x3c026000, 0x0a0006fb, 0x00000000,
+        0x1082003d, 0x00000000, 0x0a0006fb, 0x00000000, 0x2402000b, 0x10820044,
+        0x2882000b, 0x1440004b, 0x2402000e, 0x10820045, 0x00000000, 0x0a0006fb,
+        0x00000000, 0x24020020, 0x10820062, 0x28820021, 0x1040000e, 0x2402001c,
+        0x1082004c, 0x2882001d, 0x10400005, 0x2402001b, 0x10820043, 0x00000000,
+        0x0a0006fb, 0x00000000, 0x2402001f, 0x10820050, 0x00000000, 0x0a0006fb,
+        0x00000000, 0x240200c1, 0x10820042, 0x288200c2, 0x10400005, 0x24020080,
+        0x10820021, 0x00000000, 0x0a0006fb, 0x00000000, 0x240200c2, 0x1082003d,
+        0x240200c9, 0x50820049, 0xafa00010, 0x0a0006fb, 0x00000000, 0x0e001163,
+        0xac400808, 0x0a0006fd, 0x8fbf0018, 0x3c026000, 0x8c444448, 0x3c030800,
+        0xac640064, 0x0e001163, 0x00000000, 0x3c026000, 0x8c444448, 0x3c030800,
+        0x0a0006fc, 0xac640068, 0x8f440100, 0x0e0006ff, 0x00000000, 0x3c026000,
+        0x8c444448, 0x3c030800, 0x0a0006fc, 0xac64006c, 0x0e001191, 0x00000000,
+        0x0a0006fd, 0x8fbf0018, 0x8f440100, 0x0e0011bb, 0x00000000, 0x0a0006fd,
+        0x8fbf0018, 0x0e001202, 0x00000000, 0x0a0006fd, 0x8fbf0018, 0x0000000d,
+        0x0a0006fd, 0x8fbf0018, 0x0e000826, 0x00000000, 0x0a0006fd, 0x8fbf0018,
+        0x8f440100, 0x0e001264, 0x00000000, 0x0a0006fd, 0x8fbf0018, 0x0e00134e,
+        0x00000000, 0x0a0006fd, 0x8fbf0018, 0x0e00087c, 0x27440100, 0x0a0006fd,
+        0x8fbf0018, 0x8f640040, 0x0e000fae, 0x00000000, 0x0a0006fd, 0x8fbf0018,
+        0x8f440100, 0x0e001059, 0x00000000, 0x0a0006fd, 0x8fbf0018, 0x0e001417,
+        0x00000000, 0x0a0006fd, 0x8fbf0018, 0xafa00014, 0x8f440100, 0x8f450118,
+        0x8f46011c, 0x0e001439, 0x8f470120, 0x0a0006fd, 0x8fbf0018, 0x0000000d,
+        0x8fbf0018, 0x03e00008, 0x27bd0020, 0x27bdffe8, 0xafbf0010, 0x9742010c,
+        0x1440005e, 0x00803821, 0x3c029000, 0x34420001, 0x00e21025, 0xaf420020,
+        0x3c038000, 0x8f420020, 0x00431024, 0x1440fffd, 0x00000000, 0x93620023,
+        0x30420010, 0x14400026, 0x3c030800, 0x8f630074, 0x3c027fff, 0x3442ffff,
+        0x00621824, 0xaf630074, 0x93620005, 0x34420001, 0xa3620005, 0x8f63004c,
+        0x8f620054, 0x10620021, 0x24040001, 0x9762006a, 0x00022880, 0x50a00001,
+        0x24050001, 0x97630068, 0x93640081, 0x3c020800, 0x8c46004c, 0x00652821,
+        0x00852804, 0x00c5102b, 0x54400001, 0x00a03021, 0x3c020800, 0x8c440050,
+        0x00c4182b, 0x54600001, 0x00c02021, 0x8f420074, 0x2403fffe, 0x00832824,
+        0x00a21021, 0xaf62000c, 0x0a00073d, 0x24040001, 0x8c6200a8, 0x00002021,
+        0x24420001, 0xac6200a8, 0x0000000d, 0x00000000, 0x2400044d, 0x3c028000,
+        0x34420001, 0x00e21025, 0xaf420020, 0x1080001f, 0x3c029000, 0x34420001,
+        0x00e21025, 0xaf420020, 0x3c038000, 0x8f420020, 0x00431024, 0x1440fffd,
+        0x00000000, 0x9362007d, 0x3c038000, 0xa362007d, 0x8f640074, 0x34630001,
+        0x00e31825, 0xaf430020, 0x04810006, 0x3c038000, 0x00e02021, 0x0e000470,
+        0x24050455, 0x0a000761, 0x00000000, 0x8f4201f8, 0x00431024, 0x1440fffd,
+        0x24020002, 0x3c031000, 0xaf4701c0, 0xa34201c4, 0xaf4301f8, 0x0e001163,
+        0x00000000, 0x8fbf0010, 0x03e00008, 0x27bd0018, 0x27bdffd8, 0xafbf0024,
+        0xafb40020, 0xafb3001c, 0xafb20018, 0xafb10014, 0xafb00010, 0x93630005,
+        0x00809821, 0x24020030, 0x30630030, 0x146200ac, 0x00a0a021, 0x3c020800,
+        0x8c430020, 0x106000a6, 0x00000000, 0x0e00148e, 0x00000000, 0x8f830018,
+        0xac730000, 0x936200c4, 0x30420002, 0x10400004, 0x24020001, 0x8f830018,
+        0x0a000784, 0x00000000, 0x8f830018, 0x24020003, 0xac620004, 0x8f6200dc,
+        0x8f630040, 0x00431023, 0x18400004, 0x00000000, 0x0000000d, 0x00000000,
+        0x24000509, 0x8f840018, 0x8f6200dc, 0xac820008, 0x8f830018, 0xac60000c,
+        0x8f820018, 0xac400010, 0x8f830018, 0x8f62004c, 0x3c100800, 0xac620014,
+        0x8f850018, 0x3c026000, 0x8c434448, 0x261258c0, 0x00002021, 0xaca30018,
+        0x9642000e, 0x8f850018, 0x3c034010, 0x00431025, 0x0e0014cc, 0xaca2001c,
+        0x8f830018, 0xac730000, 0x9362003e, 0x9363003f, 0x8f840018, 0x00021200,
+        0x00621825, 0xac830004, 0x93620081, 0x93630082, 0x8f840018, 0x00021600,
+        0x00031c00, 0x00431025, 0xac820008, 0x8f830018, 0x8f620040, 0xac62000c,
+        0x8f840018, 0x8f620048, 0xac820010, 0x8f71004c, 0x8f820018, 0xac510014,
+        0x8f620050, 0x8f850018, 0x00401821, 0x02221023, 0x5c400001, 0x02201821,
+        0x00002021, 0xaca30018, 0x9642000e, 0x8f850018, 0x3c03c00b, 0x00431025,
+        0x0e0014cc, 0xaca2001c, 0x8f620054, 0x8f840018, 0x00401821, 0x02221023,
+        0x5c400001, 0x02201821, 0xac830000, 0x8f840018, 0x8f630058, 0xac830004,
+        0x93620023, 0x30420010, 0x10400004, 0x00000000, 0x8f830018, 0x0a0007dd,
+        0x8f620148, 0x8f830018, 0x8f62005c, 0xac620008, 0x8f830018, 0x8f620060,
+        0xac62000c, 0x8f840018, 0x8f620064, 0xac820010, 0x97630068, 0x9762006a,
+        0x8f840018, 0x00031c00, 0x00431025, 0xac820014, 0x8f850018, 0x00002021,
+        0x2402ffff, 0x260358c0, 0xaca20018, 0x9462000e, 0x8f850018, 0x3c03c00c,
+        0x00431025, 0x0e0014cc, 0xaca2001c, 0x8f840018, 0x8f630018, 0xac830000,
+        0x936200c4, 0x30420002, 0x10400006, 0x00000000, 0x976200c8, 0x8f830018,
+        0x3042ffff, 0x0a000803, 0xac620004, 0x8f820018, 0xac400004, 0x8f830018,
+        0x8f62006c, 0xac620008, 0x8f840018, 0x8f6200dc, 0xac82000c, 0x8f830018,
+        0xac600010, 0x93620005, 0x8f830018, 0x00021600, 0x00541025, 0xac620014,
+        0x8f850018, 0x3c026000, 0x8c434448, 0x24040001, 0x260258c0, 0xaca30018,
+        0x9443000e, 0x8f850018, 0x3c02400d, 0x00621825, 0x0e0014cc, 0xaca3001c,
+        0x0e00122e, 0x02602021, 0x8fbf0024, 0x8fb40020, 0x8fb3001c, 0x8fb20018,
+        0x8fb10014, 0x8fb00010, 0x03e00008, 0x27bd0028, 0x27bdffe0, 0xafb00010,
+        0x27500100, 0xafbf0018, 0xafb10014, 0x9603000c, 0x240200c1, 0x54620024,
+        0x8e040000, 0x3c029000, 0x8f450100, 0x34420001, 0x3c038000, 0x00a21025,
+        0xaf420020, 0x8f420020, 0x00431024, 0x1440fffd, 0x00000000, 0x9362007d,
+        0x3c038000, 0x34420004, 0xa362007d, 0x8f640074, 0x34630001, 0x00a31825,
+        0xaf430020, 0x04810006, 0x3c038000, 0x00a02021, 0x0e000470, 0x240505b2,
+        0x0a000878, 0x8fbf0018, 0x8f4201f8, 0x00431024, 0x1440fffd, 0x24020002,
+        0x3c031000, 0xaf4501c0, 0xa34201c4, 0xaf4301f8, 0x0a000878, 0x8fbf0018,
+        0x8f65004c, 0x24060001, 0x0e0012a3, 0x240705be, 0x3c020800, 0x8c430020,
+        0x9611000c, 0x1060001d, 0x8e100000, 0x0e00148e, 0x00000000, 0x8f820018,
+        0xac500000, 0x8f840018, 0x00111400, 0xac820004, 0x8f830018, 0xac600008,
+        0x8f820018, 0xac40000c, 0x8f830018, 0xac600010, 0x8f840018, 0x240205c1,
+        0xac820014, 0x8f850018, 0x3c026000, 0x8c434448, 0x24040001, 0x3c020800,
+        0xaca30018, 0x944358ce, 0x8f850018, 0x3c024019, 0x00621825, 0x0e0014cc,
+        0xaca3001c, 0x8fbf0018, 0x8fb10014, 0x8fb00010, 0x03e00008, 0x27bd0020,
+        0x27bdffb0, 0xafb5003c, 0x0000a821, 0xafbe0048, 0x0000f021, 0xafb70044,
+        0x0000b821, 0xafb30034, 0x00009821, 0xafb60040, 0x0080b021, 0xafbf004c,
+        0xafb40038, 0xafb20030, 0xafb1002c, 0xafb00028, 0xafa00010, 0x8f620040,
+        0x8ec30014, 0x96d1000c, 0x00431023, 0x04410025, 0x8ed40000, 0x32220401,
+        0x1040030c, 0x3c029000, 0x34420001, 0x02821025, 0xaf420020, 0x3c038000,
+        0x8f420020, 0x00431024, 0x1440fffd, 0x00000000, 0x9362007d, 0x3c038000,
+        0x34420004, 0xa362007d, 0x8f640074, 0x34630001, 0x02831825, 0xaf430020,
+        0x04810006, 0x3c038000, 0x02802021, 0x0e000470, 0x24050664, 0x0a000ba2,
+        0x8fbf004c, 0x8f4201f8, 0x00431024, 0x1440fffd, 0x24020002, 0x3c031000,
+        0xaf5401c0, 0xa34201c4, 0xaf4301f8, 0x0a000ba2, 0x8fbf004c, 0x32220010,
+        0x1040006b, 0x00003021, 0x9362003f, 0x92c6000f, 0x304500ff, 0x24c3fff8,
+        0x2c62000f, 0x10400057, 0x3c020800, 0x244257c0, 0x00031880, 0x00621821,
+        0x8c640000, 0x00800008, 0x00000000, 0x38a20012, 0x0a000924, 0x0002a82b,
+        0x2402000e, 0x14a20004, 0x2402000c, 0x24150001, 0x0a000924, 0x24060010,
+        0x10a20049, 0x38a30010, 0x2c630001, 0x38a20016, 0x2c420001, 0x00621825,
+        0x1460004d, 0x0000a821, 0x24020014, 0x10a2004a, 0x00000000, 0x0000000d,
+        0x00000000, 0x2400069c, 0x0a000924, 0x0000a821, 0x24020016, 0x14a20005,
+        0x2402000c, 0x24150001, 0x24060010, 0x0a000924, 0x3231fffd, 0x10a20032,
+        0x38a30010, 0x2c630001, 0x38a2000e, 0x2c420001, 0x00621825, 0x14600036,
+        0x0000a821, 0x24020014, 0x14a20003, 0x24150001, 0x0a000924, 0x24060012,
+        0x0000000d, 0x00000000, 0x240006bc, 0x0a000924, 0x0000a821, 0x2402000e,
+        0x14a20004, 0x24020016, 0x24150001, 0x0a000924, 0x3231fffb, 0x14a20004,
+        0x24020014, 0x24150001, 0x0a000924, 0x3231fffd, 0x54a20013, 0x92c2000e,
+        0x24150001, 0x24060012, 0x0a000924, 0x3231fffd, 0x2402000c, 0x54a2000c,
+        0x92c2000e, 0x92c3000e, 0x2402000a, 0x10620005, 0x24150001, 0x0000000d,
+        0x00000000, 0x240006e8, 0x24150001, 0x0a000924, 0x24060014, 0x92c2000e,
+        0x14a20003, 0x00000000, 0x0a000924, 0x24150001, 0x10a6ffc1, 0x24020012,
+        0x10a20005, 0x0000a821, 0x0000000d, 0x00000000, 0x24000704, 0x0000a821,
+        0x12a00022, 0x32220004, 0x10400002, 0x24020001, 0xafa20010, 0x32230102,
+        0x24020002, 0x1462000f, 0x00000000, 0x92c2000a, 0x30420020, 0x1440000b,
+        0x00000000, 0x8f630048, 0x8f620040, 0x14620004, 0x00000000, 0x8f620048,
+        0x24420001, 0xaf620048, 0x8f620040, 0x24420001, 0xaf620040, 0xa366003f,
+        0x38c30012, 0x2c630001, 0x38c20010, 0x2c420001, 0x00621825, 0x10600005,
+        0x3c030800, 0x8c620074, 0x24420001, 0x0e00140d, 0xac620074, 0x32220040,
+        0x32230020, 0xafa30020, 0x32230080, 0xafa30024, 0x32230001, 0xafa30018,
+        0x32230008, 0xafa3001c, 0x32230100, 0x104000c4, 0xafa30014, 0x8ec60010,
+        0x8f630054, 0x24c2ffff, 0x00431023, 0x18400006, 0x00000000, 0x0000000d,
+        0x00000000, 0x2400015c, 0x0a000989, 0x00009021, 0x8f62004c, 0x00c21023,
+        0x18400028, 0x00009021, 0x93650120, 0x93640121, 0x3c030800, 0x8c62008c,
+        0x308400ff, 0x24420001, 0x30a500ff, 0x00804021, 0x1485000b, 0xac62008c,
+        0x3c040800, 0x8c830090, 0x24630001, 0xac830090, 0x93620122, 0x30420001,
+        0x00021023, 0x30420005, 0x0a000989, 0x34520004, 0x27670100, 0x00041080,
+        0x00e21021, 0x8c430000, 0x00c31823, 0x04600004, 0x24820001, 0x30440007,
+        0x1485fff9, 0x00041080, 0x10880007, 0x3c030800, 0xa3640121, 0x8c620094,
+        0x24120005, 0x24420001, 0x0a000989, 0xac620094, 0x24120004, 0x32420001,
+        0x10400021, 0x3c020800, 0x8c430020, 0x8ed00000, 0x1060001c, 0x8ed30010,
+        0x0e00148e, 0x00000000, 0x8f820018, 0xac500000, 0x8f840018, 0x24020001,
+        0xac820004, 0x8f830018, 0xac600008, 0x8f820018, 0xac40000c, 0x8f830018,
+        0xac600010, 0x8f820018, 0xac530014, 0x8f850018, 0x3c026000, 0x8c434448,
+        0x24040001, 0x3c020800, 0xaca30018, 0x944358ce, 0x8f850018, 0x3c024010,
+        0x00621825, 0x0e0014cc, 0xaca3001c, 0x24130001, 0x32420004, 0x10400068,
+        0x00003821, 0x3c029000, 0x8ec60010, 0x34420001, 0x3c038000, 0x02821025,
+        0xa360007c, 0xaf420020, 0x8f420020, 0x00431024, 0x1440fffd, 0x00000000,
+        0x93620023, 0x30420080, 0x10400011, 0x00000000, 0x8f65005c, 0x8f63004c,
+        0x9764003c, 0x8f620064, 0x00a32823, 0x00852821, 0x00a2102b, 0x54400006,
+        0x3c023fff, 0x93620023, 0x3042007f, 0xa3620023, 0xaf660064, 0x3c023fff,
+        0x0a0009da, 0x3442ffff, 0x8f62005c, 0x00c21023, 0x04400011, 0x00000000,
+        0x8f65005c, 0x8f630064, 0x9764003c, 0x3c023fff, 0x3442ffff, 0xaf660064,
+        0x00a32823, 0x00852821, 0x0045102b, 0x10400004, 0x00c51021, 0x3c053fff,
+        0x34a5ffff, 0x00c51021, 0xaf62005c, 0x24070001, 0xaf66004c, 0x8fa20010,
+        0x10400003, 0x00000000, 0xaf660050, 0xaf660054, 0x8f620054, 0x14c20005,
         0x00000000, 0x93620023, 0x30420040, 0x10400017, 0x24020001, 0x9762006a,
         0x00022880, 0x50a00001, 0x24050001, 0x97630068, 0x93640081, 0x3c020800,
         0x8c46004c, 0x00652821, 0x00852804, 0x00c5102b, 0x54400001, 0x00a03021,
         0x3c020800, 0x8c440050, 0x00c4182b, 0x54600001, 0x00c02021, 0x8f420074,
-        0x2403fffe, 0x00832824, 0x00a21021, 0xaf62000c, 0x3c028000, 0x34420001,
-        0x02821025, 0xa3600081, 0xaf420020, 0x9363007e, 0x9362007a, 0x10620004,
-        0x00000000, 0x0e000f2a, 0x00000000, 0x00403821, 0x10e00017, 0x3c029000,
+        0x2403fffe, 0x00832824, 0x00a21021, 0xaf62000c, 0x93620082, 0x30420080,
+        0x50400001, 0xa3600081, 0x3c028000, 0x34420001, 0x02821025, 0xaf420020,
+        0x9363007e, 0x9362007a, 0x10620005, 0x00e0b821, 0x0e0013c4, 0x00000000,
+        0x00403821, 0x00e0b821, 0x8fa30020, 0x10600009, 0x8fa20010, 0x8ec20018,
+        0xaf620018, 0x8ec3001c, 0xaf63001c, 0x8ec20020, 0x24170001, 0xaf620058,
+        0x8fa20010, 0x10400057, 0x8fa30024, 0x93620023, 0x30420040, 0x10400053,
+        0x00000000, 0x16600021, 0x3c120800, 0x8e420020, 0x8f70004c, 0x1040001e,
+        0x24130001, 0x0e00148e, 0x00000000, 0x8f820018, 0xac540000, 0x8f840018,
+        0x24020001, 0xac820004, 0x8f830018, 0xac600008, 0x8f820018, 0xac40000c,
+        0x8f830018, 0xac600010, 0x8f820018, 0xac500014, 0x8f850018, 0x3c026000,
+        0x8c434448, 0x24040001, 0x3c020800, 0xaca30018, 0x944358ce, 0x8f850018,
+        0x3c024010, 0x00621825, 0xaca3001c, 0x0e0014cc, 0x24130001, 0x8e420020,
+        0x1040001c, 0x8ed00000, 0x0e00148e, 0x00000000, 0x8f820018, 0xac500000,
+        0x8f830018, 0xac600004, 0x8f820018, 0xac400008, 0x8f830018, 0xac60000c,
+        0x8f820018, 0xac400010, 0x8f830018, 0x24020798, 0xac620014, 0x8f850018,
+        0x3c026000, 0x8c434448, 0x24040001, 0x3c020800, 0xaca30018, 0x944358ce,
+        0x8f850018, 0x3c024019, 0x00621825, 0x0e0014cc, 0xaca3001c, 0x3c029000,
         0x34420001, 0x02821025, 0xaf420020, 0x3c038000, 0x8f420020, 0x00431024,
-        0x1440fffd, 0x3c028000, 0x9363007d, 0x34420001, 0x3c048000, 0x02821025,
-        0xa363007d, 0xaf420020, 0x8f4201f8, 0x00441024, 0x1440fffd, 0x24020002,
-        0x3c031000, 0xaf5401c0, 0xa34201c4, 0xaf4301f8, 0x8ea30014, 0x8f620040,
-        0x14430003, 0x00431023, 0x0a000443, 0x00001021, 0x28420001, 0x10400034,
-        0x00000000, 0x8f620040, 0xaf630040, 0x9362003e, 0x30420001, 0x1440000b,
-        0x3c029000, 0x93620022, 0x24420001, 0xa3620022, 0x93630022, 0x3c020800,
-        0x8c440098, 0x0064182b, 0x1460001e, 0x3c020800, 0x3c029000, 0x34420001,
+        0x1440fffd, 0x24020001, 0xaf62000c, 0x93630023, 0x3c028000, 0x34420001,
+        0x02821025, 0x306300bf, 0xa3630023, 0xaf420020, 0x8fa30024, 0x10600012,
+        0x8fa30018, 0x9362007c, 0x24420001, 0xa362007c, 0x9363007e, 0x9362007a,
+        0x1462000b, 0x8fa30018, 0x9362007c, 0x3c030800, 0x8c640024, 0x0044102b,
+        0x14400005, 0x8fa30018, 0x0e0013c4, 0x00000000, 0x02e2b825, 0x8fa30018,
+        0x3062ffff, 0x10400003, 0x32220200, 0x0a000a94, 0x241e0004, 0x10400003,
+        0x00000000, 0x241e0040, 0x24170001, 0x12a000d0, 0x32220002, 0x104000cf,
+        0x8fa2001c, 0x92c2000a, 0x30420002, 0x5040003b, 0x92c2000a, 0x93620023,
+        0x30420008, 0x54400037, 0x92c2000a, 0x3c020800, 0x8c430020, 0x10600023,
+        0x3c029000, 0x0e00148e, 0x00000000, 0x8f840018, 0x8ec30000, 0xac830000,
+        0x92c2000a, 0x8f830018, 0x00021600, 0xac620004, 0x8f840018, 0x8f620040,
+        0xac820008, 0x8f850018, 0x8f63004c, 0xaca3000c, 0x9362003f, 0x8f840018,
+        0x304200ff, 0xac820010, 0x8f830018, 0x3c026000, 0xac600014, 0x8f850018,
+        0x8c434448, 0x24040001, 0x3c020800, 0xaca30018, 0x944358ce, 0x8f850018,
+        0x3c02401a, 0x00621825, 0x0e0014cc, 0xaca3001c, 0x3c029000, 0x34420001,
         0x02821025, 0xaf420020, 0x3c038000, 0x8f420020, 0x00431024, 0x1440fffd,
-        0x00000000, 0x3c038000, 0x9362007d, 0x34630001, 0x3c048000, 0x02831825,
-        0x34420001, 0xa362007d, 0xaf430020, 0x8f4201f8, 0x00441024, 0x1440fffd,
-        0x24020002, 0x3c031000, 0xaf5401c0, 0xa34201c4, 0x24020001, 0xaf4301f8,
-        0xa7620012, 0x0a000476, 0xa3600022, 0x9743007a, 0x9444002a, 0x00641821,
-        0x3063fffe, 0xa7630012, 0x0e000b68, 0x00000000, 0x12e00003, 0x00000000,
-        0x0e000f27, 0x00000000, 0x53c00004, 0x96a20008, 0x0e000c10, 0x00000000,
-        0x96a20008, 0x8fbf0034, 0x8fbe0030, 0x8fb7002c, 0x8fb60028, 0x8fb50024,
-        0x8fb40020, 0x8fb3001c, 0x8fb20018, 0x8fb10014, 0x8fb00010, 0x00021042,
-        0x30420001, 0x03e00008, 0x27bd0038, 0x27bdffe8, 0xafbf0010, 0x97420108,
-        0x2403000b, 0x304400ff, 0x1083004e, 0x2882000c, 0x10400011, 0x24020006,
-        0x1082003e, 0x28820007, 0x10400007, 0x28820008, 0x1080002b, 0x24020001,
-        0x1082002e, 0x3c026000, 0x0a000504, 0x00000000, 0x14400061, 0x2882000a,
-        0x1440002b, 0x00000000, 0x0a0004ec, 0x00000000, 0x2402001c, 0x1082004e,
-        0x2882001d, 0x1040000e, 0x24020019, 0x10820041, 0x2882001a, 0x10400005,
-        0x2402000e, 0x10820036, 0x00000000, 0x0a000504, 0x00000000, 0x2402001b,
-        0x1082003c, 0x00000000, 0x0a000504, 0x00000000, 0x240200c1, 0x10820040,
-        0x288200c2, 0x10400005, 0x24020080, 0x1082001f, 0x00000000, 0x0a000504,
-        0x00000000, 0x240200c2, 0x1082003b, 0x00000000, 0x0a000504, 0x00000000,
-        0x3c026000, 0x0e000c7d, 0xac400808, 0x0a000506, 0x8fbf0010, 0x8c444448,
-        0x3c030800, 0xac640064, 0x0e000c7d, 0x00000000, 0x3c026000, 0x8c444448,
-        0x3c030800, 0x0a000505, 0xac640068, 0x8f440100, 0x0e000508, 0x00000000,
-        0x3c026000, 0x8c444448, 0x3c030800, 0x0a000505, 0xac64006c, 0x0e000cab,
-        0x00000000, 0x0a000506, 0x8fbf0010, 0x8f440100, 0x0e000cd5, 0x00000000,
-        0x0a000506, 0x8fbf0010, 0x0e000d1c, 0x00000000, 0x0a000506, 0x8fbf0010,
-        0x0000000d, 0x0a000506, 0x8fbf0010, 0x0e0005d7, 0x00000000, 0x0a000506,
-        0x8fbf0010, 0x8f440100, 0x0e000d7e, 0x00000000, 0x0a000506, 0x8fbf0010,
-        0x0e000e95, 0x00000000, 0x0a000506, 0x8fbf0010, 0x0e000626, 0x00000000,
-        0x0a000506, 0x8fbf0010, 0x0e000b68, 0x00000000, 0x0a000506, 0x8fbf0010,
-        0x0000000d, 0x8fbf0010, 0x03e00008, 0x27bd0018, 0x27bdffe8, 0x3c029000,
-        0x34420001, 0xafb00010, 0x00808021, 0x02021025, 0x3c038000, 0xafbf0014,
-        0xaf420020, 0x8f420020, 0x00431024, 0x1440fffd, 0x00000000, 0x93620005,
-        0x34420001, 0xa3620005, 0x8f63004c, 0x8f620054, 0x10620019, 0x3c028000,
-        0x9762006a, 0x00022880, 0x50a00001, 0x24050001, 0x97630068, 0x93640081,
-        0x3c020800, 0x8c46004c, 0x00652821, 0x00852804, 0x00c5102b, 0x54400001,
-        0x00a03021, 0x3c020800, 0x8c440050, 0x00c4182b, 0x54600001, 0x00c02021,
-        0x8f420074, 0x2403fffe, 0x00832824, 0x00a21021, 0xaf62000c, 0x3c028000,
-        0x34420001, 0x02021025, 0x0e000c7d, 0xaf420020, 0x3c029000, 0x34420001,
-        0x3c038000, 0x02021025, 0xaf420020, 0x8f420020, 0x00431024, 0x1440fffd,
-        0x3c028000, 0x9363007d, 0x34420001, 0x3c048000, 0x02021025, 0xa363007d,
-        0xaf420020, 0x8f4201f8, 0x00441024, 0x1440fffd, 0x8fbf0014, 0xaf5001c0,
-        0x8fb00010, 0x24020002, 0x3c031000, 0xa34201c4, 0xaf4301f8, 0x03e00008,
-        0x27bd0018, 0x27bdffd8, 0xafbf0020, 0xafb3001c, 0xafb20018, 0xafb10014,
-        0xafb00010, 0x93630005, 0x00809021, 0x24020030, 0x30630030, 0x14620072,
-        0x00a09821, 0x3c020800, 0x8c430020, 0x1060006c, 0x00000000, 0x0e001006,
-        0x00000000, 0x8f820018, 0xac520000, 0x9363003e, 0x9362003f, 0x8f840018,
-        0x00031a00, 0x00431025, 0xac820004, 0x93630081, 0x93620082, 0x8f850018,
-        0x00031e00, 0x00021400, 0x00621825, 0xaca30008, 0x8f840018, 0x8f620040,
-        0xac82000c, 0x8f830018, 0x8f620048, 0xac620010, 0x8f840018, 0x8f62004c,
-        0x3c110800, 0xac820014, 0x8f830018, 0x8f620050, 0x26304660, 0x00002021,
-        0xac620018, 0x9602000e, 0x8f850018, 0x3c03c00b, 0x00431025, 0x0e001044,
-        0xaca2001c, 0x8f830018, 0x8f620054, 0xac620000, 0x8f840018, 0x8f620058,
-        0xac820004, 0x8f830018, 0x8f62005c, 0xac620008, 0x8f840018, 0x8f620060,
-        0xac82000c, 0x8f850018, 0x8f620064, 0xaca20010, 0x97630068, 0x9762006a,
-        0x8f840018, 0x00031c00, 0x00431025, 0xac820014, 0x8f830018, 0x00002021,
-        0xac600018, 0x9602000e, 0x8f850018, 0x3c03c00c, 0x00431025, 0x0e001044,
-        0xaca2001c, 0x8f840018, 0x8f630018, 0xac830000, 0x936200c4, 0x30420002,
-        0x10400006, 0x00000000, 0x976200c8, 0x8f830018, 0x3042ffff, 0x0a0005b5,
-        0xac620004, 0x8f820018, 0xac400004, 0x8f830018, 0x8f62006c, 0xac620008,
-        0x8f840018, 0x8f6200dc, 0xac82000c, 0x8f830018, 0xac600010, 0x93620005,
-        0x8f830018, 0x00021600, 0x00531025, 0xac620014, 0x8f850018, 0x3c026000,
-        0x8c434448, 0x24040001, 0x26224660, 0xaca30018, 0x9443000e, 0x8f850018,
-        0x3c02400d, 0x00621825, 0x0e001044, 0xaca3001c, 0x0e000d48, 0x02402021,
-        0x8fbf0020, 0x8fb3001c, 0x8fb20018, 0x8fb10014, 0x8fb00010, 0x03e00008,
-        0x27bd0028, 0x27bdffe0, 0xafb00010, 0x27500100, 0xafbf0018, 0xafb10014,
-        0x9603000c, 0x240200c1, 0x5462001d, 0x8e040000, 0x3c029000, 0x8f440100,
-        0x34420001, 0x3c038000, 0x00821025, 0xaf420020, 0x8f420020, 0x00431024,
-        0x1440fffd, 0x00000000, 0x3c038000, 0x9362007d, 0x34630001, 0x3c058000,
-        0x00831825, 0x34420004, 0xa362007d, 0xaf430020, 0x8f4201f8, 0x00451024,
-        0x1440fffd, 0x24020002, 0x3c031000, 0xaf4401c0, 0xa34201c4, 0xaf4301f8,
-        0x0a000622, 0x8fbf0018, 0x8f65004c, 0x24060001, 0x0e000db5, 0x2407049f,
-        0x3c020800, 0x8c430020, 0x9611000c, 0x1060001d, 0x8e100000, 0x0e001006,
-        0x00000000, 0x8f820018, 0xac500000, 0x8f840018, 0x00111400, 0xac820004,
-        0x8f830018, 0xac600008, 0x8f820018, 0xac40000c, 0x8f830018, 0xac600010,
-        0x8f840018, 0x240204a2, 0xac820014, 0x8f850018, 0x3c026000, 0x8c434448,
-        0x24040001, 0x3c020800, 0xaca30018, 0x9443466e, 0x8f850018, 0x3c024019,
-        0x00621825, 0x0e001044, 0xaca3001c, 0x8fbf0018, 0x8fb10014, 0x8fb00010,
-        0x03e00008, 0x27bd0020, 0x27bdffb0, 0xafb1002c, 0x27510100, 0xafbf004c,
-        0xafbe0048, 0xafb70044, 0xafb60040, 0xafb5003c, 0xafb40038, 0xafb30034,
-        0xafb20030, 0xafb00028, 0x8e350000, 0x9634000c, 0x3c026000, 0x8c434448,
-        0x0000f021, 0xaf630170, 0x8f620040, 0x8e230014, 0x0000b821, 0x00431023,
-        0x044001ec, 0x0000b021, 0x32820010, 0x1040002e, 0x3c026000, 0x9363003f,
-        0x9222000e, 0x10430006, 0x2402000c, 0x9223000f, 0x10620003, 0x24020014,
-        0x14620025, 0x3c026000, 0x32820004, 0x10400007, 0x241e0001, 0x8f620050,
-        0x24420001, 0xaf620050, 0x8f630054, 0x24630001, 0xaf630054, 0x32830102,
-        0x24020002, 0x5462000d, 0x9222000f, 0x8f620040, 0x24420001, 0xaf620040,
-        0x8f630048, 0x8f620040, 0x24630001, 0x54620005, 0x9222000f, 0x8f620048,
-        0x24420001, 0xaf620048, 0x9222000f, 0xa362003f, 0x9223000f, 0x24020012,
-        0x14620007, 0x3c026000, 0x3c030800, 0x8c620074, 0x24420001, 0x0e000f6e,
-        0xac620074, 0x3c026000, 0x8c434448, 0x32820040, 0xaf630174, 0x32830020,
-        0xafa30010, 0x32830080, 0xafa30014, 0x32830001, 0xafa3001c, 0x32830008,
-        0xafa30020, 0x32830100, 0x104000bb, 0xafa30018, 0x8e260010, 0x8f630054,
-        0x24c2ffff, 0x00431023, 0x18400006, 0x00000000, 0x0000000d, 0x00000000,
-        0x24000128, 0x0a0006b2, 0x00009021, 0x8f62004c, 0x00c21023, 0x18400028,
-        0x00009021, 0x93650120, 0x93640121, 0x3c030800, 0x8c62008c, 0x308400ff,
-        0x24420001, 0x30a500ff, 0x00804021, 0x1485000b, 0xac62008c, 0x3c040800,
-        0x8c830090, 0x24630001, 0xac830090, 0x93620122, 0x30420001, 0x00021023,
-        0x30420005, 0x0a0006b2, 0x34520004, 0x27670100, 0x00041080, 0x00e21021,
-        0x8c430000, 0x00c31823, 0x04600004, 0x24820001, 0x30440007, 0x1485fff9,
-        0x00041080, 0x10880007, 0x3c030800, 0xa3640121, 0x8c620094, 0x24120005,
-        0x24420001, 0x0a0006b2, 0xac620094, 0x24120004, 0x32420001, 0x10400020,
-        0x3c020800, 0x8c430020, 0x8e300000, 0x1060001c, 0x8e330010, 0x0e001006,
-        0x00000000, 0x8f820018, 0xac500000, 0x8f840018, 0x24020001, 0xac820004,
-        0x8f830018, 0xac600008, 0x8f820018, 0xac40000c, 0x8f830018, 0xac600010,
-        0x8f820018, 0xac530014, 0x8f850018, 0x3c026000, 0x8c434448, 0x24040001,
-        0x3c020800, 0xaca30018, 0x9443466e, 0x8f850018, 0x3c024010, 0x00621825,
-        0x0e001044, 0xaca3001c, 0x32420004, 0x10400060, 0x00003821, 0x3c029000,
-        0x8e260010, 0x34420001, 0x3c038000, 0x02a21025, 0xa360007c, 0xaf420020,
-        0x8f420020, 0x00431024, 0x1440fffd, 0x00000000, 0x93620023, 0x30420080,
-        0x10400011, 0x00000000, 0x8f65005c, 0x8f63004c, 0x9764003c, 0x8f620064,
-        0x00a32823, 0x00852821, 0x00a2102b, 0x54400006, 0x3c023fff, 0x93620023,
-        0x3042007f, 0xa3620023, 0xaf660064, 0x3c023fff, 0x0a000702, 0x3442ffff,
-        0x8f62005c, 0x00c21023, 0x04400011, 0x00000000, 0x8f65005c, 0x8f630064,
-        0x9764003c, 0x3c023fff, 0x3442ffff, 0xaf660064, 0x00a32823, 0x00852821,
-        0x0045102b, 0x10400004, 0x00c51021, 0x3c053fff, 0x34a5ffff, 0x00c51021,
-        0xaf62005c, 0x24070001, 0xaf66004c, 0x8f620054, 0x14c20005, 0x00000000,
-        0x93620023, 0x30420040, 0x10400017, 0x24020001, 0x9762006a, 0x00022880,
-        0x50a00001, 0x24050001, 0x97630068, 0x93640081, 0x3c020800, 0x8c46004c,
-        0x00652821, 0x00852804, 0x00c5102b, 0x54400001, 0x00a03021, 0x3c020800,
-        0x8c440050, 0x00c4182b, 0x54600001, 0x00c02021, 0x8f420074, 0x2403fffe,
-        0x00832824, 0x00a21021, 0xaf62000c, 0x3c028000, 0x34420001, 0x02a21025,
-        0xa3600081, 0xaf420020, 0x9363007e, 0x9362007a, 0x10620005, 0x00e0b021,
-        0x0e000f2a, 0x00000000, 0x00403821, 0x00e0b021, 0x8fa20010, 0x10400008,
-        0x00000000, 0x8e220018, 0xaf620018, 0x8e23001c, 0xaf63001c, 0x8e220020,
-        0x24160001, 0xaf620058, 0x13c00036, 0x32820004, 0x10400035, 0x8fa30014,
-        0x93620023, 0x30420040, 0x10400031, 0x3c020800, 0x8c430020, 0x1060001c,
-        0x8e300000, 0x0e001006, 0x00000000, 0x8f820018, 0xac500000, 0x8f830018,
-        0xac600004, 0x8f820018, 0xac400008, 0x8f830018, 0xac60000c, 0x8f820018,
-        0xac400010, 0x8f830018, 0x24020587, 0xac620014, 0x8f850018, 0x3c026000,
-        0x8c434448, 0x24040001, 0x3c020800, 0xaca30018, 0x9443466e, 0x8f850018,
-        0x3c024019, 0x00621825, 0x0e001044, 0xaca3001c, 0x3c029000, 0x34420001,
-        0x02a21025, 0xaf420020, 0x3c038000, 0x8f420020, 0x00431024, 0x1440fffd,
-        0x24020001, 0xaf62000c, 0x93630023, 0x3c028000, 0x34420001, 0x02a21025,
-        0x306300bf, 0xa3630023, 0xaf420020, 0x8fa30014, 0x10600012, 0x8fa3001c,
-        0x9362007c, 0x24420001, 0xa362007c, 0x9363007e, 0x9362007a, 0x1462000b,
-        0x8fa3001c, 0x9362007c, 0x3c030800, 0x8c640024, 0x0044102b, 0x14400005,
-        0x8fa3001c, 0x0e000f2a, 0x00000000, 0x02c2b025, 0x8fa3001c, 0x3062ffff,
-        0x10400003, 0x32820200, 0x0a000793, 0x24170004, 0x10400003, 0x00000000,
-        0x24170040, 0x24160001, 0x13c0005d, 0x32820002, 0x1040005c, 0x8fa20020,
-        0x9222000a, 0x30420020, 0x10400033, 0x3c100800, 0x93620023, 0x30420040,
-        0x1040002f, 0x8e020020, 0x1040001e, 0x3c029000, 0x0e001006, 0x00000000,
-        0x8f820018, 0xac550000, 0x8f840018, 0x3c02008d, 0xac820004, 0x8f830018,
-        0xac600008, 0x8f820018, 0xac40000c, 0x8f830018, 0xac600010, 0x8f840018,
-        0x240205bf, 0xac820014, 0x8f850018, 0x3c026000, 0x8c434448, 0x24040001,
-        0x3c020800, 0xaca30018, 0x9443466e, 0x8f850018, 0x3c024019, 0x00621825,
-        0x0e001044, 0xaca3001c, 0x3c029000, 0x34420001, 0x02a21025, 0xaf420020,
-        0x3c038000, 0x8f420020, 0x00431024, 0x1440fffd, 0x00000000, 0x93630023,
-        0x3c028000, 0x34420001, 0x02a21025, 0x306300bf, 0xa3630023, 0xaf420020,
-        0x8e020020, 0x10400023, 0x8fa20020, 0x0e001006, 0x00000000, 0x8f840018,
-        0x8e230000, 0xac830000, 0x9222000a, 0x8f830018, 0x00021600, 0xac620004,
-        0x8f840018, 0x8f620040, 0xac820008, 0x8f850018, 0x8f63004c, 0xaca3000c,
-        0x9362003f, 0x8f840018, 0x304200ff, 0xac820010, 0x8f830018, 0x3c026000,
-        0xac600014, 0x8f850018, 0x8c434448, 0x24040001, 0x3c020800, 0xaca30018,
-        0x9443466e, 0x8f850018, 0x3c02401a, 0x00621825, 0x0e001044, 0xaca3001c,
-        0x8fa20020, 0x1040000e, 0x8fa20018, 0x9222000a, 0xa3620082, 0x56e00005,
-        0x36f70008, 0x8fa30018, 0x10600004, 0x00000000, 0x36f70008, 0x0a000801,
-        0x24160001, 0x0e000de1, 0x02a02021, 0x8fa20018, 0x10400003, 0x00000000,
-        0x36f70010, 0x24160001, 0x12c00019, 0x3c029000, 0x34420001, 0x02a21025,
-        0xaf420020, 0x3c038000, 0x8f420020, 0x00431024, 0x1440fffd, 0x00000000,
-        0x3c038000, 0x9362007d, 0x34630001, 0x3c048000, 0x02a31825, 0x02e21025,
-        0xa362007d, 0xaf430020, 0x8f4201f8, 0x00441024, 0x1440fffd, 0x24020002,
-        0x3c031000, 0xaf5501c0, 0xa34201c4, 0xaf4301f8, 0x9363003f, 0x24020012,
-        0x14620004, 0x3c026000, 0x0e000f6e, 0x00000000, 0x3c026000, 0x8c434448,
-        0xaf630178, 0x8fbf004c, 0x8fbe0048, 0x8fb70044, 0x8fb60040, 0x8fb5003c,
+        0x00000000, 0x93630023, 0x3c028000, 0x34420001, 0x02821025, 0x34630008,
+        0xa3630023, 0xaf420020, 0x92c2000a, 0x30420020, 0x1040008e, 0x8fa2001c,
+        0x93620023, 0x30420001, 0x14400035, 0x3c020800, 0x8c430020, 0x10600023,
+        0x3c029000, 0x0e00148e, 0x00000000, 0x8f840018, 0x8ec30000, 0xac830000,
+        0x92c2000a, 0x8f830018, 0x00021600, 0xac620004, 0x8f840018, 0x8f620040,
+        0xac820008, 0x8f850018, 0x8f63004c, 0xaca3000c, 0x9362003f, 0x8f840018,
+        0x304200ff, 0xac820010, 0x8f830018, 0x3c026000, 0xac600014, 0x8f850018,
+        0x8c434448, 0x24040001, 0x3c020800, 0xaca30018, 0x944358ce, 0x8f850018,
+        0x3c02401a, 0x00621825, 0x0e0014cc, 0xaca3001c, 0x3c029000, 0x34420001,
+        0x02821025, 0xaf420020, 0x3c038000, 0x8f420020, 0x00431024, 0x1440fffd,
+        0x00000000, 0x93630023, 0x3c028000, 0x34420001, 0x02821025, 0x34630001,
+        0xa3630023, 0xaf420020, 0x93620023, 0x30420040, 0x10400052, 0x8fa2001c,
+        0x16600020, 0x3c120800, 0x8e420020, 0x8f70004c, 0x1040003c, 0x3c029000,
+        0x0e00148e, 0x00000000, 0x8f820018, 0xac540000, 0x8f840018, 0x24020001,
+        0xac820004, 0x8f830018, 0xac600008, 0x8f820018, 0xac40000c, 0x8f830018,
+        0xac600010, 0x8f820018, 0xac500014, 0x8f850018, 0x3c026000, 0x8c434448,
+        0x24040001, 0x3c020800, 0xaca30018, 0x944358ce, 0x8f850018, 0x3c024010,
+        0x00621825, 0x0e0014cc, 0xaca3001c, 0x8e420020, 0x1040001e, 0x3c029000,
+        0x0e00148e, 0x00000000, 0x8f820018, 0xac540000, 0x8f840018, 0x3c02008d,
+        0xac820004, 0x8f830018, 0xac600008, 0x8f820018, 0xac40000c, 0x8f830018,
+        0xac600010, 0x8f840018, 0x240207ee, 0xac820014, 0x8f850018, 0x3c026000,
+        0x8c434448, 0x24040001, 0x3c020800, 0xaca30018, 0x944358ce, 0x8f850018,
+        0x3c024019, 0x00621825, 0x0e0014cc, 0xaca3001c, 0x3c029000, 0x34420001,
+        0x02821025, 0xaf420020, 0x3c038000, 0x8f420020, 0x00431024, 0x1440fffd,
+        0x00000000, 0x93630023, 0x3c028000, 0x34420001, 0x02821025, 0x306300bf,
+        0xa3630023, 0xaf420020, 0x8fa2001c, 0x1040000e, 0x8fa20014, 0x92c2000a,
+        0xa3620082, 0x57c00005, 0x37de0008, 0x8fa30014, 0x10600004, 0x00000000,
+        0x37de0008, 0x0a000b75, 0x24170001, 0x0e0012cf, 0x02802021, 0x8fa20014,
+        0x10400003, 0x00000000, 0x37de0010, 0x24170001, 0x12e00020, 0x3c029000,
+        0x34420001, 0x02821025, 0xaf420020, 0x3c038000, 0x8f420020, 0x00431024,
+        0x1440fffd, 0x00000000, 0x9362007d, 0x3c038000, 0x03c21025, 0xa362007d,
+        0x8f640074, 0x34630001, 0x02831825, 0xaf430020, 0x04810006, 0x3c038000,
+        0x02802021, 0x0e000470, 0x2405082a, 0x0a000b9b, 0x00000000, 0x8f4201f8,
+        0x00431024, 0x1440fffd, 0x24020002, 0x3c031000, 0xaf5401c0, 0xa34201c4,
+        0xaf4301f8, 0x9363003f, 0x24020012, 0x14620004, 0x8fbf004c, 0x0e00140d,
+        0x00000000, 0x8fbf004c, 0x8fbe0048, 0x8fb70044, 0x8fb60040, 0x8fb5003c,
         0x8fb40038, 0x8fb30034, 0x8fb20030, 0x8fb1002c, 0x8fb00028, 0x03e00008,
         0x27bd0050, 0x27bdffe8, 0xafbf0014, 0xafb00010, 0x8f500180, 0x97420184,
         0x30420200, 0x14400015, 0x00000000, 0x8f430188, 0x3c02ff00, 0x00621824,
         0x3c020200, 0x10620031, 0x0043102b, 0x14400007, 0x3c020300, 0x1060000b,
-        0x3c020100, 0x1062000d, 0x00000000, 0x0a0008b4, 0x00000000, 0x10620027,
-        0x3c020400, 0x1062003e, 0x02002021, 0x0a0008b4, 0x00000000, 0x0e000e1e,
-        0x02002021, 0x0a0008b6, 0x8fbf0014, 0x93620005, 0x30420020, 0x1440005e,
+        0x3c020100, 0x1062000d, 0x00000000, 0x0a000c2c, 0x00000000, 0x10620027,
+        0x3c020400, 0x1062003e, 0x02002021, 0x0a000c2c, 0x00000000, 0x0e000c31,
+        0x02002021, 0x0a000c2e, 0x8fbf0014, 0x93620005, 0x30420020, 0x1440005e,
         0x8fbf0014, 0x3c029000, 0x34420001, 0x02021025, 0xaf420020, 0x3c038000,
         0x8f420020, 0x00431024, 0x1440fffd, 0x00000000, 0x93620005, 0x3c038000,
         0x34630001, 0x02031825, 0x34420020, 0xa3620005, 0xaf430020, 0x93620005,
-        0x30420020, 0x14400003, 0x02002021, 0x0000000d, 0x02002021, 0x0e000553,
-        0x24055854, 0x0a0008b6, 0x8fbf0014, 0x93620005, 0x30420001, 0x1040003f,
+        0x30420020, 0x14400003, 0x02002021, 0x0000000d, 0x02002021, 0x0e000766,
+        0x24055854, 0x0a000c2e, 0x8fbf0014, 0x93620005, 0x30420001, 0x1040003f,
         0x3c029000, 0x34420001, 0x02021025, 0xaf420020, 0x3c038000, 0x8f420020,
-        0x00431024, 0x1440fffd, 0x00000000, 0x93620005, 0x3c048000, 0x3c030800,
-        0x304200fe, 0xa3620005, 0x8c620020, 0x34840001, 0x02042025, 0xaf440020,
-        0x1040002d, 0x8fbf0014, 0x0a000894, 0x00000000, 0x00002821, 0x00003021,
-        0x0e000f78, 0x240706a4, 0x3c020800, 0x8c430020, 0x10600023, 0x8fbf0014,
-        0x0e001006, 0x00000000, 0x8f820018, 0xac500000, 0x93630082, 0x9362003f,
+        0x00431024, 0x1440fffd, 0x00000000, 0x93620023, 0x34420004, 0xa3620023,
+        0x93630005, 0x3c048000, 0x3c020800, 0x306300fe, 0xa3630005, 0x8c430020,
+        0x34840001, 0x02042025, 0x0a000c0a, 0xaf440020, 0x00002821, 0x00003021,
+        0x0e000fb1, 0x240708d9, 0x3c020800, 0x8c430020, 0x10600023, 0x8fbf0014,
+        0x0e00148e, 0x00000000, 0x8f820018, 0xac500000, 0x93630082, 0x9362003f,
         0x8f840018, 0x00031a00, 0x00431025, 0xac820004, 0x8f830018, 0xac600008,
         0x8f820018, 0xac40000c, 0x8f830018, 0xac600010, 0x8f820018, 0xac400014,
         0x8f850018, 0x3c026000, 0x8c434448, 0x24040001, 0x3c020800, 0xaca30018,
-        0x9443466e, 0x8f850018, 0x3c02400a, 0x00621825, 0x0e001044, 0xaca3001c,
-        0x0a0008b6, 0x8fbf0014, 0x0000000d, 0x8fbf0014, 0x8fb00010, 0x03e00008,
-        0x27bd0018, 0x27bdffe8, 0xafbf0010, 0x93420148, 0x2444ffff, 0x2c830005,
-        0x10600047, 0x3c020800, 0x24424598, 0x00041880, 0x00621821, 0x8c640000,
-        0x00800008, 0x00000000, 0x8f430144, 0x8f62000c, 0x14620006, 0x24020001,
-        0xaf62000c, 0x0e000909, 0x00000000, 0x0a000907, 0x8fbf0010, 0x8f62000c,
-        0x0a000900, 0x00000000, 0x97630010, 0x8f420144, 0x14430006, 0x24020001,
-        0xa7620010, 0x0e000eeb, 0x00000000, 0x0a000907, 0x8fbf0010, 0x97620010,
-        0x0a000900, 0x00000000, 0x97630012, 0x8f420144, 0x14430006, 0x24020001,
-        0xa7620012, 0x0e000f06, 0x00000000, 0x0a000907, 0x8fbf0010, 0x97620012,
-        0x0a000900, 0x00000000, 0x97630014, 0x8f420144, 0x14430006, 0x24020001,
-        0xa7620014, 0x0e000f21, 0x00000000, 0x0a000907, 0x8fbf0010, 0x97620014,
-        0x0a000900, 0x00000000, 0x97630016, 0x8f420144, 0x14430006, 0x24020001,
-        0xa7620016, 0x0e000f24, 0x00000000, 0x0a000907, 0x8fbf0010, 0x97620016,
-        0x14400006, 0x8fbf0010, 0x3c030800, 0x8c620070, 0x24420001, 0xac620070,
-        0x8fbf0010, 0x03e00008, 0x27bd0018, 0x27bdffe8, 0xafbf0010, 0x93620081,
-        0x3c030800, 0x8c640048, 0x0044102b, 0x14400028, 0x3c029000, 0x8f460140,
-        0x34420001, 0x3c038000, 0x00c21025, 0xaf420020, 0x8f420020, 0x00431024,
-        0x1440fffd, 0x3c048000, 0x34840001, 0x3c059000, 0x34a50001, 0x3c078000,
-        0x24020012, 0x24030080, 0x00c42025, 0x00c52825, 0xa362003f, 0xa3630082,
-        0xaf440020, 0xaf450020, 0x8f420020, 0x00471024, 0x1440fffd, 0x3c038000,
-        0x9362007d, 0x34630001, 0x3c048000, 0x00c31825, 0x34420020, 0xa362007d,
-        0xaf430020, 0x8f4201f8, 0x00441024, 0x1440fffd, 0x24020002, 0x3c031000,
-        0x0a00096d, 0xaf4601c0, 0x93620081, 0x24420001, 0x0e000f2a, 0xa3620081,
-        0x9763006a, 0x00032880, 0x14a00002, 0x00403821, 0x24050001, 0x97630068,
+        0x944358ce, 0x8f850018, 0x3c02400a, 0x00621825, 0x0e0014cc, 0xaca3001c,
+        0x0a000c2e, 0x8fbf0014, 0x0000000d, 0x8fbf0014, 0x8fb00010, 0x03e00008,
+        0x27bd0018, 0x27bdffe8, 0xafbf0010, 0x8f420188, 0x00803021, 0x93640000,
+        0x24030020, 0x00021402, 0x10830008, 0x304500ff, 0x3c036018, 0x8c625000,
+        0x34420400, 0xac625000, 0x0000000d, 0x00000000, 0x24000955, 0x9363003f,
+        0x24020012, 0x14620023, 0x3c029000, 0x34420001, 0x3c038000, 0x00c21025,
+        0xaf650178, 0xa365007a, 0xaf420020, 0x8f420020, 0x00431024, 0x1440fffd,
+        0x00000000, 0x9362007d, 0x3c038000, 0xa362007d, 0x8f640074, 0x34630001,
+        0x00c31825, 0xaf430020, 0x04810006, 0x3c038000, 0x00c02021, 0x0e000470,
+        0x24050963, 0x0a000c79, 0x8fbf0010, 0x8f4201f8, 0x00431024, 0x1440fffd,
+        0x24020002, 0x3c031000, 0xaf4601c0, 0xa34201c4, 0xaf4301f8, 0x0a000c79,
+        0x8fbf0010, 0x9362007e, 0x1445000e, 0x00000000, 0x8f620178, 0x1045000b,
+        0x00000000, 0x8f820000, 0xaf650178, 0x8f660178, 0x8f440180, 0x8f65004c,
+        0x8c430000, 0x0060f809, 0x30c600ff, 0x0a000c79, 0x8fbf0010, 0xaf650178,
+        0x8fbf0010, 0x03e00008, 0x27bd0018, 0x27bdffe8, 0xafbf0010, 0x93630000,
+        0x24020020, 0x10620005, 0x00000000, 0x93630000, 0x24020030, 0x1462004d,
+        0x8fbf0010, 0x93420148, 0x2444ffff, 0x2c830005, 0x10600047, 0x3c020800,
+        0x24425800, 0x00041880, 0x00621821, 0x8c640000, 0x00800008, 0x00000000,
+        0x8f430144, 0x8f62000c, 0x14620006, 0x24020001, 0xaf62000c, 0x0e000d59,
+        0x00000000, 0x0a000cd1, 0x8fbf0010, 0x8f62000c, 0x0a000cca, 0x00000000,
+        0x97630010, 0x8f420144, 0x14430006, 0x24020001, 0xa7620010, 0x0e00137a,
+        0x00000000, 0x0a000cd1, 0x8fbf0010, 0x97620010, 0x0a000cca, 0x00000000,
+        0x97630012, 0x8f420144, 0x14430006, 0x24020001, 0xa7620012, 0x0e001395,
+        0x00000000, 0x0a000cd1, 0x8fbf0010, 0x97620012, 0x0a000cca, 0x00000000,
+        0x97630014, 0x8f420144, 0x14430006, 0x24020001, 0xa7620014, 0x0e0013bb,
+        0x00000000, 0x0a000cd1, 0x8fbf0010, 0x97620014, 0x0a000cca, 0x00000000,
+        0x97630016, 0x8f420144, 0x14430006, 0x24020001, 0xa7620016, 0x0e0013be,
+        0x00000000, 0x0a000cd1, 0x8fbf0010, 0x97620016, 0x14400006, 0x8fbf0010,
+        0x3c030800, 0x8c620070, 0x24420001, 0xac620070, 0x8fbf0010, 0x03e00008,
+        0x27bd0018, 0x27bdffe0, 0x3c029000, 0xafbf001c, 0xafb20018, 0xafb10014,
+        0xafb00010, 0x8f500140, 0x34420001, 0x3c038000, 0x02021025, 0xaf420020,
+        0x8f420020, 0x00431024, 0x1440fffd, 0x24020012, 0x24030080, 0xa362003f,
+        0xa3630082, 0x93620023, 0x30420040, 0x10400007, 0x00008821, 0x93620023,
+        0x24110001, 0x304200bf, 0xa3620023, 0x0a000cf0, 0x3c028000, 0x3c028000,
+        0x34420001, 0x3c039000, 0x34630001, 0x3c048000, 0x02021025, 0x02031825,
+        0xaf420020, 0xaf430020, 0x8f420020, 0x00441024, 0x1440fffd, 0x00000000,
+        0x9362007d, 0x3c038000, 0x34420020, 0xa362007d, 0x8f640074, 0x34630001,
+        0x02031825, 0xaf430020, 0x04810006, 0x3c038000, 0x02002021, 0x0e000470,
+        0x24050a63, 0x0a000d13, 0x00000000, 0x8f4201f8, 0x00431024, 0x1440fffd,
+        0x24020002, 0x3c031000, 0xaf5001c0, 0xa34201c4, 0xaf4301f8, 0x1220003f,
+        0x3c120800, 0x8e420020, 0x8f71004c, 0x1040003c, 0x8fbf001c, 0x0e00148e,
+        0x00000000, 0x8f820018, 0xac500000, 0x8f840018, 0x24020001, 0xac820004,
+        0x8f830018, 0xac600008, 0x8f820018, 0xac40000c, 0x8f830018, 0xac600010,
+        0x8f820018, 0xac510014, 0x8f850018, 0x3c026000, 0x8c434448, 0x24040001,
+        0x3c020800, 0xaca30018, 0x944358ce, 0x8f850018, 0x3c024010, 0x00621825,
+        0x0e0014cc, 0xaca3001c, 0x8e420020, 0x1040001e, 0x8fbf001c, 0x0e00148e,
+        0x00000000, 0x8f820018, 0xac500000, 0x8f840018, 0x3c02008d, 0xac820004,
+        0x8f830018, 0xac600008, 0x8f820018, 0xac40000c, 0x8f830018, 0xac600010,
+        0x8f840018, 0x24020a6a, 0xac820014, 0x8f850018, 0x3c026000, 0x8c434448,
+        0x24040001, 0x3c020800, 0xaca30018, 0x944358ce, 0x8f850018, 0x3c024019,
+        0x00621825, 0x0e0014cc, 0xaca3001c, 0x8fbf001c, 0x8fb20018, 0x8fb10014,
+        0x8fb00010, 0x03e00008, 0x27bd0020, 0x27bdffe8, 0xafbf0010, 0x93620081,
+        0x3c030800, 0x8c640048, 0x0044102b, 0x14400005, 0x00000000, 0x0e000cd3,
+        0x00000000, 0x0a000da4, 0x8fbf0010, 0x93620081, 0x24420001, 0x0e0013c4,
+        0xa3620081, 0x9763006a, 0x00032880, 0x14a00002, 0x00403821, 0x24050001,
+        0x97630068, 0x93640081, 0x3c020800, 0x8c46004c, 0x00652821, 0x00852804,
+        0x00c5102b, 0x54400001, 0x00a03021, 0x3c020800, 0x8c440050, 0x00c4182b,
+        0x54600001, 0x00c02021, 0x8f420074, 0x2403fffe, 0x00832824, 0x00a21021,
+        0xaf62000c, 0x10e00021, 0x3c029000, 0x8f450140, 0x34420001, 0x3c038000,
+        0x00a21025, 0xaf420020, 0x8f420020, 0x00431024, 0x1440fffd, 0x00000000,
+        0x9362007d, 0x3c038000, 0x34420004, 0xa362007d, 0x8f640074, 0x34630001,
+        0x00a31825, 0xaf430020, 0x04810006, 0x3c038000, 0x00a02021, 0x0e000470,
+        0x24050a92, 0x0a000da4, 0x8fbf0010, 0x8f4201f8, 0x00431024, 0x1440fffd,
+        0x24020002, 0x3c031000, 0xaf4501c0, 0xa34201c4, 0xaf4301f8, 0x8fbf0010,
+        0x03e00008, 0x27bd0018, 0x27bdffd8, 0xafb3001c, 0x27530100, 0xafbf0024,
+        0xafb40020, 0xafb20018, 0xafb10014, 0xafb00010, 0x96620008, 0x3c140800,
+        0x8f520100, 0x30420001, 0x104000da, 0x00000000, 0x8e700018, 0x8f630054,
+        0x2602ffff, 0x00431023, 0x18400006, 0x00000000, 0x0000000d, 0x00000000,
+        0x2400015c, 0x0a000dea, 0x00008821, 0x8f62004c, 0x02021023, 0x18400028,
+        0x00008821, 0x93650120, 0x93640121, 0x3c030800, 0x8c62008c, 0x308400ff,
+        0x24420001, 0x30a500ff, 0x00803821, 0x1485000b, 0xac62008c, 0x3c040800,
+        0x8c830090, 0x24630001, 0xac830090, 0x93620122, 0x30420001, 0x00021023,
+        0x30420005, 0x0a000dea, 0x34510004, 0x27660100, 0x00041080, 0x00c21021,
+        0x8c430000, 0x02031823, 0x04600004, 0x24820001, 0x30440007, 0x1485fff9,
+        0x00041080, 0x10870007, 0x3c030800, 0xa3640121, 0x8c620094, 0x24110005,
+        0x24420001, 0x0a000dea, 0xac620094, 0x24110004, 0x32220001, 0x1040001e,
+        0x8e820020, 0x1040001d, 0x32220004, 0x0e00148e, 0x00000000, 0x8f820018,
+        0xac520000, 0x8f840018, 0x24020001, 0xac820004, 0x8f830018, 0xac600008,
+        0x8f820018, 0xac40000c, 0x8f830018, 0xac600010, 0x8f820018, 0xac500014,
+        0x8f850018, 0x3c026000, 0x8c434448, 0x24040001, 0x3c020800, 0xaca30018,
+        0x944358ce, 0x8f850018, 0x3c024010, 0x00621825, 0x0e0014cc, 0xaca3001c,
+        0x32220004, 0x10400081, 0x00003821, 0x3c029000, 0x34420001, 0x3c038000,
+        0x02421025, 0xa360007c, 0xaf420020, 0x8f420020, 0x00431024, 0x1440fffd,
+        0x00000000, 0x93620023, 0x30420080, 0x10400011, 0x00000000, 0x8f65005c,
+        0x8f63004c, 0x9764003c, 0x8f620064, 0x00a32823, 0x00852821, 0x00a2102b,
+        0x54400006, 0x3c023fff, 0x93620023, 0x3042007f, 0xa3620023, 0xaf700064,
+        0x3c023fff, 0x0a000e37, 0x3442ffff, 0x8f62005c, 0x02021023, 0x04400011,
+        0x00000000, 0x8f65005c, 0x8f630064, 0x9764003c, 0x3c023fff, 0x3442ffff,
+        0xaf700064, 0x00a32823, 0x00852821, 0x0045102b, 0x10400004, 0x02051021,
+        0x3c053fff, 0x34a5ffff, 0x02051021, 0xaf62005c, 0x24070001, 0xaf70004c,
+        0x8f620054, 0x16020005, 0x00000000, 0x93620023, 0x30420040, 0x10400017,
+        0x24020001, 0x9762006a, 0x00022880, 0x50a00001, 0x24050001, 0x97630068,
         0x93640081, 0x3c020800, 0x8c46004c, 0x00652821, 0x00852804, 0x00c5102b,
         0x54400001, 0x00a03021, 0x3c020800, 0x8c440050, 0x00c4182b, 0x54600001,
         0x00c02021, 0x8f420074, 0x2403fffe, 0x00832824, 0x00a21021, 0xaf62000c,
-        0x10e0001a, 0x3c029000, 0x8f440140, 0x34420001, 0x3c038000, 0x00821025,
-        0xaf420020, 0x8f420020, 0x00431024, 0x1440fffd, 0x00000000, 0x3c038000,
-        0x9362007d, 0x34630001, 0x3c058000, 0x00831825, 0x34420004, 0xa362007d,
-        0xaf430020, 0x8f4201f8, 0x00451024, 0x1440fffd, 0x24020002, 0x3c031000,
-        0xaf4401c0, 0xa34201c4, 0xaf4301f8, 0x8fbf0010, 0x03e00008, 0x27bd0018,
-        0x27bdffd8, 0xafb3001c, 0x27530100, 0xafbf0024, 0xafb40020, 0xafb20018,
-        0xafb10014, 0xafb00010, 0x96620008, 0x3c140800, 0x8f520100, 0x30420001,
-        0x104000cf, 0x00000000, 0x8e700018, 0x8f630054, 0x2602ffff, 0x00431023,
-        0x18400006, 0x00000000, 0x0000000d, 0x00000000, 0x24000128, 0x0a0009b6,
-        0x00008821, 0x8f62004c, 0x02021023, 0x18400028, 0x00008821, 0x93650120,
-        0x93640121, 0x3c030800, 0x8c62008c, 0x308400ff, 0x24420001, 0x30a500ff,
-        0x00803821, 0x1485000b, 0xac62008c, 0x3c040800, 0x8c830090, 0x24630001,
-        0xac830090, 0x93620122, 0x30420001, 0x00021023, 0x30420005, 0x0a0009b6,
-        0x34510004, 0x27660100, 0x00041080, 0x00c21021, 0x8c430000, 0x02031823,
-        0x04600004, 0x24820001, 0x30440007, 0x1485fff9, 0x00041080, 0x10870007,
-        0x3c030800, 0xa3640121, 0x8c620094, 0x24110005, 0x24420001, 0x0a0009b6,
-        0xac620094, 0x24110004, 0x32220001, 0x1040001e, 0x8e820020, 0x1040001d,
-        0x32220004, 0x0e001006, 0x00000000, 0x8f820018, 0xac520000, 0x8f840018,
-        0x24020001, 0xac820004, 0x8f830018, 0xac600008, 0x8f820018, 0xac40000c,
-        0x8f830018, 0xac600010, 0x8f820018, 0xac500014, 0x8f850018, 0x3c026000,
-        0x8c434448, 0x24040001, 0x3c020800, 0xaca30018, 0x9443466e, 0x8f850018,
-        0x3c024010, 0x00621825, 0x0e001044, 0xaca3001c, 0x32220004, 0x10400076,
-        0x00003821, 0x3c029000, 0x34420001, 0x3c038000, 0x02421025, 0xa360007c,
-        0xaf420020, 0x8f420020, 0x00431024, 0x1440fffd, 0x00000000, 0x93620023,
-        0x30420080, 0x10400011, 0x00000000, 0x8f65005c, 0x8f63004c, 0x9764003c,
-        0x8f620064, 0x00a32823, 0x00852821, 0x00a2102b, 0x54400006, 0x3c023fff,
-        0x93620023, 0x3042007f, 0xa3620023, 0xaf700064, 0x3c023fff, 0x0a000a03,
-        0x3442ffff, 0x8f62005c, 0x02021023, 0x04400011, 0x00000000, 0x8f65005c,
-        0x8f630064, 0x9764003c, 0x3c023fff, 0x3442ffff, 0xaf700064, 0x00a32823,
-        0x00852821, 0x0045102b, 0x10400004, 0x02051021, 0x3c053fff, 0x34a5ffff,
-        0x02051021, 0xaf62005c, 0x24070001, 0xaf70004c, 0x8f620054, 0x16020005,
-        0x00000000, 0x93620023, 0x30420040, 0x10400017, 0x24020001, 0x9762006a,
-        0x00022880, 0x50a00001, 0x24050001, 0x97630068, 0x93640081, 0x3c020800,
-        0x8c46004c, 0x00652821, 0x00852804, 0x00c5102b, 0x54400001, 0x00a03021,
-        0x3c020800, 0x8c440050, 0x00c4182b, 0x54600001, 0x00c02021, 0x8f420074,
-        0x2403fffe, 0x00832824, 0x00a21021, 0xaf62000c, 0x3c028000, 0x34420001,
-        0x02421025, 0xa3600081, 0xaf420020, 0x9363007e, 0x9362007a, 0x10620004,
-        0x00000000, 0x0e000f2a, 0x00000000, 0x00403821, 0x10e00017, 0x3c029000,
+        0x93620082, 0x30420080, 0x50400001, 0xa3600081, 0x3c028000, 0x34420001,
+        0x02421025, 0xaf420020, 0x9363007e, 0x9362007a, 0x10620004, 0x00000000,
+        0x0e0013c4, 0x00000000, 0x00403821, 0x10e0001f, 0x3c029000, 0x34420001,
+        0x02421025, 0xaf420020, 0x3c038000, 0x8f420020, 0x00431024, 0x1440fffd,
+        0x00000000, 0x9362007d, 0x3c038000, 0xa362007d, 0x8f640074, 0x34630001,
+        0x02431825, 0xaf430020, 0x04810006, 0x3c038000, 0x02402021, 0x0e000470,
+        0x24050b3d, 0x0a000e8d, 0x00000000, 0x8f4201f8, 0x00431024, 0x1440fffd,
+        0x24020002, 0x3c031000, 0xaf5201c0, 0xa34201c4, 0xaf4301f8, 0x9342010b,
+        0x9343010b, 0x8e820020, 0x27500100, 0x38630006, 0x10400029, 0x2c710001,
+        0x0e00148e, 0x00000000, 0x8f830018, 0x8e020000, 0xac620000, 0x8f840018,
+        0x96020008, 0xac820004, 0x8f830018, 0x8e020014, 0xac620008, 0x8f850018,
+        0x3c026000, 0x8c434448, 0xaca3000c, 0x8f840018, 0x96020012, 0xac820010,
+        0x8f850018, 0x8e030020, 0xaca30014, 0x9602000c, 0x9603000e, 0x8f840018,
+        0x00021400, 0x00431025, 0xac820018, 0x12200005, 0x3c020800, 0x944358ce,
+        0x8f840018, 0x0a000eb8, 0x3c024013, 0x944358ce, 0x8f840018, 0x3c024014,
+        0x00621825, 0xac83001c, 0x0e0014cc, 0x24040001, 0x8e700014, 0x8f620040,
+        0x14500003, 0x00501023, 0x0a000ec3, 0x00001021, 0x28420001, 0x1040003a,
+        0x00000000, 0x0e000fae, 0x02002021, 0xaf700040, 0x9362003e, 0x30420001,
+        0x1440000b, 0x3c029000, 0x93620022, 0x24420001, 0xa3620022, 0x93630022,
+        0x3c020800, 0x8c440098, 0x0064182b, 0x14600025, 0x3c020800, 0x3c029000,
         0x34420001, 0x02421025, 0xaf420020, 0x3c038000, 0x8f420020, 0x00431024,
-        0x1440fffd, 0x3c028000, 0x9363007d, 0x34420001, 0x3c048000, 0x02421025,
-        0xa363007d, 0xaf420020, 0x8f4201f8, 0x00441024, 0x1440fffd, 0x24020002,
-        0x3c031000, 0xaf5201c0, 0xa34201c4, 0xaf4301f8, 0x9342010b, 0x8e830020,
-        0x27500100, 0x38420006, 0x10600029, 0x2c510001, 0x0e001006, 0x00000000,
-        0x8f830018, 0x8e020000, 0xac620000, 0x8f840018, 0x96020008, 0xac820004,
-        0x8f830018, 0x8e020014, 0xac620008, 0x8f850018, 0x3c026000, 0x8c434448,
-        0xaca3000c, 0x8f840018, 0x96020012, 0xac820010, 0x8f850018, 0x8e030020,
-        0xaca30014, 0x9602000c, 0x9603000e, 0x8f840018, 0x00021400, 0x00431025,
-        0xac820018, 0x12200005, 0x3c020800, 0x9443466e, 0x8f840018, 0x0a000a78,
-        0x3c024013, 0x9443466e, 0x8f840018, 0x3c024014, 0x00621825, 0xac83001c,
-        0x0e001044, 0x24040001, 0x8e630014, 0x8f620040, 0x14430003, 0x00431023,
-        0x0a000a83, 0x00001021, 0x28420001, 0x10400034, 0x00000000, 0x8f620040,
-        0xaf630040, 0x9362003e, 0x30420001, 0x1440000b, 0x3c029000, 0x93620022,
-        0x24420001, 0xa3620022, 0x93630022, 0x3c020800, 0x8c440098, 0x0064182b,
-        0x1460001e, 0x3c020800, 0x3c029000, 0x34420001, 0x02421025, 0xaf420020,
-        0x3c038000, 0x8f420020, 0x00431024, 0x1440fffd, 0x00000000, 0x3c038000,
-        0x9362007d, 0x34630001, 0x3c048000, 0x02431825, 0x34420001, 0xa362007d,
-        0xaf430020, 0x8f4201f8, 0x00441024, 0x1440fffd, 0x24020002, 0x3c031000,
-        0xaf5201c0, 0xa34201c4, 0x24020001, 0xaf4301f8, 0xa7620012, 0x0a000ab6,
-        0xa3600022, 0x9743007a, 0x9444002a, 0x00641821, 0x3063fffe, 0xa7630012,
-        0x0e000b68, 0x00000000, 0x97420108, 0x8fbf0024, 0x8fb40020, 0x8fb3001c,
-        0x8fb20018, 0x8fb10014, 0x8fb00010, 0x00021042, 0x30420001, 0x03e00008,
-        0x27bd0028, 0x27bdffe0, 0xafb20018, 0x3c120800, 0x8e420020, 0xafb00010,
-        0x27500100, 0xafbf001c, 0x10400046, 0xafb10014, 0x0e001006, 0x00000000,
-        0x8f840018, 0x8e020000, 0xac820000, 0x936300b1, 0x936200c5, 0x8f850018,
-        0x00031e00, 0x00021400, 0x34420100, 0x00621825, 0xaca30004, 0x8f840018,
-        0x8e02001c, 0xac820008, 0x8f830018, 0x8f620048, 0xac62000c, 0x8f840018,
-        0x96020012, 0xac820010, 0x8f830018, 0x8f620040, 0x24040001, 0xac620014,
-        0x8f850018, 0x3c026000, 0x8c434448, 0x3c020800, 0x24514660, 0xaca30018,
-        0x9623000e, 0x8f850018, 0x3c024016, 0x00621825, 0x0e001044, 0xaca3001c,
-        0x96030008, 0x30630010, 0x1060001c, 0x8e420020, 0x1040001a, 0x8e100000,
-        0x0e001006, 0x00000000, 0x8f820018, 0xac500000, 0x8f830018, 0xac600004,
-        0x8f820018, 0xac400008, 0x8f830018, 0xac60000c, 0x8f820018, 0xac400010,
-        0x8f830018, 0xac600014, 0x8f850018, 0x3c036000, 0x8c634448, 0x24040001,
-        0xaca30018, 0x9622000e, 0x8f850018, 0x3c034015, 0x00431025, 0x0e001044,
-        0xaca2001c, 0x00001021, 0x8fbf001c, 0x8fb20018, 0x8fb10014, 0x8fb00010,
-        0x03e00008, 0x27bd0020, 0x27bdffe0, 0xafb20018, 0x3c120800, 0x8e420020,
-        0xafb00010, 0x27500100, 0xafbf001c, 0x10400041, 0xafb10014, 0x0e001006,
-        0x00000000, 0x8f830018, 0x8e020000, 0xac620000, 0x8f840018, 0x24020100,
-        0xac820004, 0x8f830018, 0x8e02001c, 0xac620008, 0x8f840018, 0x8e020018,
-        0xac82000c, 0x8f830018, 0x96020012, 0xac620010, 0x8f840018, 0x96020008,
-        0xac820014, 0x8f850018, 0x3c026000, 0x8c434448, 0x24040001, 0x3c020800,
-        0x24514660, 0xaca30018, 0x9623000e, 0x8f850018, 0x3c024017, 0x00621825,
-        0x0e001044, 0xaca3001c, 0x96030008, 0x30630010, 0x1060001c, 0x8e420020,
-        0x1040001a, 0x8e100000, 0x0e001006, 0x00000000, 0x8f820018, 0xac500000,
+        0x1440fffd, 0x00000000, 0x9362007d, 0x3c038000, 0x34420001, 0xa362007d,
+        0x8f640074, 0x34630001, 0x02431825, 0xaf430020, 0x04810006, 0x3c038000,
+        0x02402021, 0x0e000470, 0x24050273, 0x0a000ef6, 0x24020001, 0x8f4201f8,
+        0x00431024, 0x1440fffd, 0x24020002, 0x3c031000, 0xaf5201c0, 0xa34201c4,
+        0xaf4301f8, 0x24020001, 0xa7620012, 0x0a000efe, 0xa3600022, 0x9743007a,
+        0x9444002a, 0x00641821, 0x3063fffe, 0xa7630012, 0x97420108, 0x8fbf0024,
+        0x8fb40020, 0x8fb3001c, 0x8fb20018, 0x8fb10014, 0x8fb00010, 0x00021042,
+        0x30420001, 0x03e00008, 0x27bd0028, 0x27bdffe0, 0xafb20018, 0x3c120800,
+        0x8e420020, 0xafb00010, 0x27500100, 0xafbf001c, 0x10400046, 0xafb10014,
+        0x0e00148e, 0x00000000, 0x8f840018, 0x8e020000, 0xac820000, 0x936300b1,
+        0x936200c5, 0x8f850018, 0x00031e00, 0x00021400, 0x34420100, 0x00621825,
+        0xaca30004, 0x8f840018, 0x8e02001c, 0xac820008, 0x8f830018, 0x8f620048,
+        0xac62000c, 0x8f840018, 0x96020012, 0xac820010, 0x8f830018, 0x8f620040,
+        0x24040001, 0xac620014, 0x8f850018, 0x3c026000, 0x8c434448, 0x3c020800,
+        0x245158c0, 0xaca30018, 0x9623000e, 0x8f850018, 0x3c024016, 0x00621825,
+        0x0e0014cc, 0xaca3001c, 0x96030008, 0x30630010, 0x1060001c, 0x8e420020,
+        0x1040001a, 0x8e100000, 0x0e00148e, 0x00000000, 0x8f820018, 0xac500000,
         0x8f830018, 0xac600004, 0x8f820018, 0xac400008, 0x8f830018, 0xac60000c,
         0x8f820018, 0xac400010, 0x8f830018, 0xac600014, 0x8f850018, 0x3c036000,
         0x8c634448, 0x24040001, 0xaca30018, 0x9622000e, 0x8f850018, 0x3c034015,
-        0x00431025, 0x0e001044, 0xaca2001c, 0x00001021, 0x8fbf001c, 0x8fb20018,
-        0x8fb10014, 0x8fb00010, 0x03e00008, 0x27bd0020, 0x27bdffe8, 0xafbf0010,
-        0x936200c4, 0x30420002, 0x10400019, 0x00000000, 0x936200c5, 0x936300b1,
-        0x00431023, 0x304400ff, 0x30830080, 0x10600004, 0x00000000, 0x0000000d,
-        0x00000000, 0x24000a6a, 0x93620004, 0x00441023, 0x304400ff, 0x30830080,
-        0x10600004, 0x2482ffff, 0x8f650024, 0x0a000b82, 0x00000000, 0x00022b00,
-        0x8f620024, 0x0045102b, 0x10400002, 0x00000000, 0x8f650024, 0x8f620048,
-        0x8f630040, 0x00431823, 0x0065202b, 0x10800004, 0x00000000, 0x8f620040,
-        0x00451021, 0xaf620048, 0x9762003c, 0x0062102b, 0x10400041, 0x8fbf0010,
-        0x10a0003f, 0x3c029000, 0x34420001, 0x3c040800, 0x8c830080, 0x8f450100,
-        0x3c068000, 0x24630001, 0x00a21025, 0xac830080, 0xaf420020, 0x8f420020,
-        0x00461024, 0x1440fffd, 0x3c038000, 0x9362007d, 0x34630001, 0x3c048000,
-        0x00a31825, 0x34420004, 0xa362007d, 0xaf430020, 0x8f4201f8, 0x00441024,
-        0x1440fffd, 0x24020002, 0x3c030800, 0xaf4501c0, 0xa34201c4, 0x8c640020,
-        0x3c021000, 0xaf4201f8, 0x1080001f, 0x8fbf0010, 0x0e001006, 0x00000000,
-        0x8f830018, 0x8f420100, 0xac620000, 0x8f840018, 0x8f620040, 0xac820004,
-        0x8f850018, 0x8f620048, 0xaca20008, 0x8f830018, 0xac60000c, 0x8f820018,
-        0xac400010, 0x8f830018, 0x3c026000, 0xac600014, 0x8f840018, 0x8c434448,
-        0x3c020800, 0xac830018, 0x9443466e, 0x8f840018, 0x3c0240c2, 0x00621825,
-        0xac83001c, 0x0e001044, 0x24040001, 0x8fbf0010, 0x03e00008, 0x27bd0018,
-        0x3c020800, 0x24423958, 0xaf82000c, 0x03e00008, 0x00000000, 0x27bdffe8,
-        0xafb00010, 0x27500100, 0xafbf0014, 0x8e02001c, 0x14400003, 0x3c020800,
-        0x0000000d, 0x3c020800, 0x8c430020, 0x10600026, 0x00001021, 0x0e001006,
-        0x00000000, 0x8f830018, 0x8e020000, 0xac620000, 0x8f840018, 0x8e02001c,
-        0xac820004, 0x8f830018, 0xac600008, 0x8f840018, 0x8e020018, 0xac82000c,
-        0x8f850018, 0x96020012, 0xaca20010, 0x8f830018, 0x3c106000, 0xac600014,
-        0x8f840018, 0x8e024448, 0x3c030800, 0xac820018, 0x9462466e, 0x8f840018,
-        0x3c034012, 0x00431025, 0xac82001c, 0x0e001044, 0x24040001, 0x8e036800,
-        0x00001021, 0x3c040001, 0x00641825, 0xae036800, 0x0a000c0d, 0x8fbf0014,
-        0x8fbf0014, 0x8fb00010, 0x03e00008, 0x27bd0018, 0x3c020800, 0x97430078,
-        0x9444002e, 0x00001021, 0x00641821, 0x3063fffe, 0x03e00008, 0xa7630010,
-        0x27450100, 0x8f640048, 0x8ca30018, 0x00641023, 0x18400021, 0x00000000,
-        0xaf630048, 0x8f620040, 0x9763003c, 0x00821023, 0x0043102a, 0x1040001a,
-        0x3c029000, 0x8ca40000, 0x34420001, 0x3c038000, 0x00821025, 0xaf420020,
-        0x8f420020, 0x00431024, 0x1440fffd, 0x00000000, 0x3c038000, 0x9362007d,
-        0x34630001, 0x3c058000, 0x00831825, 0x34420004, 0xa362007d, 0xaf430020,
-        0x8f4201f8, 0x00451024, 0x1440fffd, 0x24020002, 0x3c031000, 0xaf4401c0,
-        0xa34201c4, 0xaf4301f8, 0x03e00008, 0x00001021, 0x8f420100, 0x34420001,
-        0xaf4200a4, 0x03e00008, 0x00001021, 0x27bdffe0, 0xafbf0018, 0xafb10014,
-        0xafb00010, 0x9362007e, 0x30d000ff, 0x16020029, 0x00808821, 0x93620080,
-        0x16020026, 0x00000000, 0x9362007f, 0x16020023, 0x00000000, 0x9362007a,
-        0x16020004, 0x00000000, 0x0000000d, 0x00000000, 0x24000771, 0x0e000f49,
-        0x00000000, 0x3c039000, 0x34630001, 0x3c048000, 0x02231825, 0xa370007a,
-        0xaf430020, 0x8f420020, 0x00441024, 0x1440fffd, 0x3c028000, 0x9363007d,
-        0x34420001, 0x3c048000, 0x02221025, 0xa363007d, 0xaf420020, 0x8f4201f8,
-        0x00441024, 0x1440fffd, 0x24020002, 0x3c031000, 0xaf5101c0, 0xa34201c4,
-        0xaf4301f8, 0x0a000c79, 0x8fbf0018, 0x0000000d, 0x00000000, 0x24000781,
-        0x8fbf0018, 0x8fb10014, 0x8fb00010, 0x03e00008, 0x27bd0020, 0x3c020800,
+        0x00431025, 0x0e0014cc, 0xaca2001c, 0x00001021, 0x8fbf001c, 0x8fb20018,
+        0x8fb10014, 0x8fb00010, 0x03e00008, 0x27bd0020, 0x27bdffe0, 0xafb20018,
+        0x3c120800, 0x8e420020, 0xafb00010, 0x27500100, 0xafbf001c, 0x10400041,
+        0xafb10014, 0x0e00148e, 0x00000000, 0x8f830018, 0x8e020000, 0xac620000,
+        0x8f840018, 0x24020100, 0xac820004, 0x8f830018, 0x8e02001c, 0xac620008,
+        0x8f840018, 0x8e020018, 0xac82000c, 0x8f830018, 0x96020012, 0xac620010,
+        0x8f840018, 0x96020008, 0xac820014, 0x8f850018, 0x3c026000, 0x8c434448,
+        0x24040001, 0x3c020800, 0x245158c0, 0xaca30018, 0x9623000e, 0x8f850018,
+        0x3c024017, 0x00621825, 0x0e0014cc, 0xaca3001c, 0x96030008, 0x30630010,
+        0x1060001c, 0x8e420020, 0x1040001a, 0x8e100000, 0x0e00148e, 0x00000000,
+        0x8f820018, 0xac500000, 0x8f830018, 0xac600004, 0x8f820018, 0xac400008,
+        0x8f830018, 0xac60000c, 0x8f820018, 0xac400010, 0x8f830018, 0xac600014,
+        0x8f850018, 0x3c036000, 0x8c634448, 0x24040001, 0xaca30018, 0x9622000e,
+        0x8f850018, 0x3c034015, 0x00431025, 0x0e0014cc, 0xaca2001c, 0x00001021,
+        0x8fbf001c, 0x8fb20018, 0x8fb10014, 0x8fb00010, 0x03e00008, 0x27bd0020,
+        0x27bdfff0, 0x03e00008, 0x27bd0010, 0x27bdffd0, 0xafb10014, 0x00808821,
+        0xafb40020, 0x00c0a021, 0xafbf0028, 0xafb50024, 0xafb3001c, 0xafb20018,
+        0xafb00010, 0x93620023, 0x00e0a821, 0x30420040, 0x1040003e, 0x30b3ffff,
+        0x3c120800, 0x8e420020, 0x1040003a, 0x8f70004c, 0x0e00148e, 0x00000000,
+        0x8f820018, 0xac510000, 0x8f840018, 0x24020001, 0xac820004, 0x8f830018,
+        0xac600008, 0x8f820018, 0xac40000c, 0x8f830018, 0xac600010, 0x8f820018,
+        0x24040001, 0xac500014, 0x8f850018, 0x3c026000, 0x8c434448, 0x3c020800,
+        0x245058c0, 0xaca30018, 0x9603000e, 0x8f850018, 0x3c024010, 0x00621825,
+        0x0e0014cc, 0xaca3001c, 0x8e430020, 0x1060001b, 0x00000000, 0x0e00148e,
+        0x00000000, 0x8f820018, 0xac510000, 0x8f840018, 0x3c02008d, 0xac820004,
+        0x8f830018, 0xac600008, 0x8f820018, 0xac40000c, 0x8f830018, 0xac600010,
+        0x8f820018, 0xac550014, 0x8f850018, 0x3c036000, 0x8c634448, 0x24040001,
+        0xaca30018, 0x9602000e, 0x8f850018, 0x3c034019, 0x00431025, 0x0e0014cc,
+        0xaca2001c, 0x93620023, 0x30420020, 0x14400003, 0x3c120800, 0x1280003f,
+        0x3c029000, 0x8e420020, 0x8f70004c, 0x1040003b, 0x3c029000, 0x0e00148e,
+        0x00000000, 0x8f820018, 0xac510000, 0x8f840018, 0x24020001, 0xac820004,
+        0x8f830018, 0xac600008, 0x8f820018, 0xac40000c, 0x8f830018, 0xac600010,
+        0x8f820018, 0x24040001, 0xac500014, 0x8f850018, 0x3c026000, 0x8c434448,
+        0x3c020800, 0x245058c0, 0xaca30018, 0x9603000e, 0x8f850018, 0x3c024010,
+        0x00621825, 0x0e0014cc, 0xaca3001c, 0x8e430020, 0x1060001c, 0x3c029000,
+        0x0e00148e, 0x00000000, 0x8f820018, 0xac510000, 0x8f840018, 0x00131400,
+        0xac820004, 0x8f830018, 0xac750008, 0x8f820018, 0xac40000c, 0x8f830018,
+        0xac600010, 0x8f820018, 0xac400014, 0x8f850018, 0x3c036000, 0x8c634448,
+        0x24040001, 0xaca30018, 0x9602000e, 0x8f850018, 0x3c03401b, 0x00431025,
+        0x0e0014cc, 0xaca2001c, 0x3c029000, 0x34420001, 0x02221025, 0xaf420020,
+        0x3c038000, 0x8f420020, 0x00431024, 0x1440fffd, 0x00000000, 0x93630023,
+        0x3c028000, 0x34420001, 0x02221025, 0x8fbf0028, 0x8fb50024, 0x8fb40020,
+        0x8fb3001c, 0x8fb20018, 0x8fb10014, 0x8fb00010, 0x3063009f, 0xa3630023,
+        0xaf420020, 0x03e00008, 0x27bd0030, 0x27bdffe0, 0xafb10014, 0x27510100,
+        0x3c029000, 0x34420001, 0xafb00010, 0x00808021, 0x02021025, 0x3c038000,
+        0xafbf0018, 0xaf420020, 0x8f420020, 0x00431024, 0x1440fffd, 0x00000000,
+        0xa7600008, 0x8f63005c, 0x3c028000, 0x34420001, 0xaf630148, 0x8f640050,
+        0x02021025, 0x3c039000, 0xaf64017c, 0xaf420020, 0x8f450100, 0x34630001,
+        0x3c048000, 0x00a31825, 0xaf430020, 0x8f420020, 0x00441024, 0x1440fffd,
+        0x00000000, 0x9362007d, 0x3c038000, 0x34420001, 0xa362007d, 0x8f640074,
+        0x34630001, 0x00a31825, 0xaf430020, 0x04810006, 0x3c038000, 0x00a02021,
+        0x0e000470, 0x24050de5, 0x0a001093, 0x3c020800, 0x8f4201f8, 0x00431024,
+        0x1440fffd, 0x24020002, 0x3c031000, 0xaf4501c0, 0xa34201c4, 0xaf4301f8,
+        0x3c020800, 0x8c430020, 0x1060001e, 0x8fbf0018, 0x0e00148e, 0x00000000,
+        0x8f830018, 0xac700000, 0x9622000c, 0x8f840018, 0x00021400, 0xac820004,
+        0x8f830018, 0xac600008, 0x8f820018, 0xac40000c, 0x8f830018, 0xac600010,
+        0x8f820018, 0xac400014, 0x8f850018, 0x3c026000, 0x8c434448, 0x24040001,
+        0x3c020800, 0xaca30018, 0x944358ce, 0x8f850018, 0x3c02401f, 0x00621825,
+        0x0e0014cc, 0xaca3001c, 0x8fbf0018, 0x8fb10014, 0x8fb00010, 0x03e00008,
+        0x27bd0020, 0x3c020800, 0x24424c3c, 0xaf82000c, 0x03e00008, 0x00000000,
+        0x27bdffe8, 0xafb00010, 0x27500100, 0xafbf0014, 0x8e02001c, 0x14400003,
+        0x3c020800, 0x0000000d, 0x3c020800, 0x8c430020, 0x10600020, 0x00001021,
+        0x0e00148e, 0x00000000, 0x8f830018, 0x8e020000, 0xac620000, 0x8f840018,
+        0x8e02001c, 0xac820004, 0x8f830018, 0xac600008, 0x8f840018, 0x8e020018,
+        0xac82000c, 0x8f850018, 0x96020012, 0xaca20010, 0x8f830018, 0x3c026000,
+        0xac600014, 0x8f840018, 0x8c434448, 0x3c020800, 0xac830018, 0x944358ce,
+        0x8f840018, 0x3c024012, 0x00621825, 0xac83001c, 0x0e0014cc, 0x24040001,
+        0x00001021, 0x8fbf0014, 0x8fb00010, 0x03e00008, 0x27bd0018, 0x3c020800,
+        0x97430078, 0x9444002e, 0x00001021, 0x00641821, 0x3063fffe, 0x03e00008,
+        0xa7630010, 0x27bdfff0, 0x00001021, 0x03e00008, 0x27bd0010, 0x8f420100,
+        0x34420001, 0xaf4200a4, 0x03e00008, 0x00001021, 0x27bdffe0, 0xafbf0018,
+        0xafb10014, 0xafb00010, 0x9362007e, 0x30d000ff, 0x16020031, 0x00808821,
+        0x8f620178, 0x1602002e, 0x00000000, 0x9362007f, 0x1602002b, 0x00000000,
+        0x9362007a, 0x16020004, 0x00000000, 0x0000000d, 0x00000000, 0x240009d2,
+        0x0e0013e6, 0x00000000, 0x3c039000, 0x34630001, 0x3c048000, 0x02231825,
+        0xa370007a, 0xaf430020, 0x8f420020, 0x00441024, 0x1440fffd, 0x00000000,
+        0x9362007d, 0x3c038000, 0xa362007d, 0x8f640074, 0x34630001, 0x02231825,
+        0xaf430020, 0x04810006, 0x3c038000, 0x02202021, 0x0e000470, 0x240509dd,
+        0x0a001138, 0x8fbf0018, 0x8f4201f8, 0x00431024, 0x1440fffd, 0x24020002,
+        0x3c031000, 0xaf5101c0, 0xa34201c4, 0xaf4301f8, 0x0a001138, 0x8fbf0018,
+        0x0000000d, 0x00000000, 0x240009e2, 0x8fbf0018, 0x8fb10014, 0x8fb00010,
+        0x03e00008, 0x27bd0020, 0x27bdffe8, 0x30a500ff, 0x3c029000, 0x34420001,
+        0x00803821, 0x00e21025, 0x3c038000, 0xafbf0010, 0xaf420020, 0x8f420020,
+        0x00431024, 0x1440fffd, 0x00000000, 0x9362007d, 0x3c038000, 0x00a21025,
+        0xa362007d, 0x8f640074, 0x34630001, 0x00e31825, 0xaf430020, 0x04810006,
+        0x3c038000, 0x00e02021, 0x0e000470, 0x00c02821, 0x0a001161, 0x8fbf0010,
+        0x8f4201f8, 0x00431024, 0x1440fffd, 0x24020002, 0x3c031000, 0xaf4701c0,
+        0xa34201c4, 0xaf4301f8, 0x8fbf0010, 0x03e00008, 0x27bd0018, 0x3c020800,
         0x8c430020, 0x27bdffe8, 0xafb00010, 0x27500100, 0x10600024, 0xafbf0014,
-        0x0e001006, 0x00000000, 0x8f830018, 0x8e020000, 0xac620000, 0x8f840018,
+        0x0e00148e, 0x00000000, 0x8f830018, 0x8e020000, 0xac620000, 0x8f840018,
         0x8e020004, 0xac820004, 0x8f830018, 0x8e020018, 0xac620008, 0x8f840018,
         0x8e03001c, 0xac83000c, 0x9602000c, 0x9203000a, 0x8f840018, 0x00021400,
         0x00431025, 0xac820010, 0x8f830018, 0x3c026000, 0xac600014, 0x8f840018,
-        0x8c434448, 0xac830018, 0x96020008, 0x3c030800, 0x9464466e, 0x8f850018,
-        0x00021400, 0x00441025, 0x24040001, 0x0e001044, 0xaca2001c, 0x8fbf0014,
+        0x8c434448, 0xac830018, 0x96020008, 0x3c030800, 0x946458ce, 0x8f850018,
+        0x00021400, 0x00441025, 0x24040001, 0x0e0014cc, 0xaca2001c, 0x8fbf0014,
         0x8fb00010, 0x03e00008, 0x27bd0018, 0x3c020800, 0x8c430020, 0x27bdffe8,
-        0xafb00010, 0x27500100, 0x10600020, 0xafbf0014, 0x0e001006, 0x00000000,
+        0xafb00010, 0x27500100, 0x10600020, 0xafbf0014, 0x0e00148e, 0x00000000,
         0x8f820018, 0xac400000, 0x8f830018, 0xac600004, 0x8f820018, 0xac400008,
         0x8f830018, 0xac60000c, 0x9602000c, 0x9603000e, 0x8f840018, 0x00021400,
         0x00431025, 0xac820010, 0x8f830018, 0x3c026000, 0xac600014, 0x8f840018,
-        0x8c434448, 0xac830018, 0x96020008, 0x3c030800, 0x9464466e, 0x8f850018,
-        0x00021400, 0x00441025, 0x24040001, 0x0e001044, 0xaca2001c, 0x8fbf0014,
+        0x8c434448, 0xac830018, 0x96020008, 0x3c030800, 0x946458ce, 0x8f850018,
+        0x00021400, 0x00441025, 0x24040001, 0x0e0014cc, 0xaca2001c, 0x8fbf0014,
         0x8fb00010, 0x03e00008, 0x27bd0018, 0x27bdffe8, 0xafb00010, 0x27500100,
         0xafbf0014, 0x9602000c, 0x10400024, 0x00802821, 0x3c020800, 0x8c430020,
-        0x1060003a, 0x8fbf0014, 0x0e001006, 0x00000000, 0x8f840018, 0x8e030000,
+        0x1060003a, 0x8fbf0014, 0x0e00148e, 0x00000000, 0x8f840018, 0x8e030000,
         0xac830000, 0x9602000c, 0x8f840018, 0x00021400, 0xac820004, 0x8f830018,
         0xac600008, 0x8f820018, 0xac40000c, 0x8f830018, 0xac600010, 0x8f820018,
         0xac400014, 0x8f850018, 0x3c026000, 0x8c434448, 0x24040001, 0x3c020800,
-        0xaca30018, 0x9443466e, 0x8f850018, 0x3c02400b, 0x00621825, 0x0e001044,
-        0xaca3001c, 0x0a000d19, 0x8fbf0014, 0x93620005, 0x30420010, 0x14400015,
+        0xaca30018, 0x944358ce, 0x8f850018, 0x3c02400b, 0x00621825, 0x0e0014cc,
+        0xaca3001c, 0x0a0011ff, 0x8fbf0014, 0x93620005, 0x30420010, 0x14400015,
         0x3c029000, 0x34420001, 0x00a21025, 0xaf420020, 0x3c038000, 0x8f420020,
         0x00431024, 0x1440fffd, 0x00000000, 0x3c038000, 0x93620005, 0x34630001,
-        0x00a02021, 0x00a31825, 0x24055852, 0x34420010, 0xa3620005, 0x0e000553,
-        0xaf430020, 0x0a000d19, 0x8fbf0014, 0x0000000d, 0x8fbf0014, 0x8fb00010,
+        0x00a02021, 0x00a31825, 0x24055852, 0x34420010, 0xa3620005, 0x0e000766,
+        0xaf430020, 0x0a0011ff, 0x8fbf0014, 0x0000000d, 0x8fbf0014, 0x8fb00010,
         0x03e00008, 0x27bd0018, 0x3c020800, 0x8c430020, 0x27bdffe8, 0xafb00010,
-        0x27500100, 0x10600022, 0xafbf0014, 0x0e001006, 0x00000000, 0x8f840018,
+        0x27500100, 0x10600022, 0xafbf0014, 0x0e00148e, 0x00000000, 0x8f840018,
         0x8e020004, 0xac820000, 0x9603000c, 0x9762002c, 0x8f840018, 0x00031c00,
         0x00431025, 0xac820004, 0x8f830018, 0xac600008, 0x8f820018, 0xac40000c,
         0x8f830018, 0xac600010, 0x8f820018, 0xac400014, 0x8f850018, 0x3c026000,
-        0x8c434448, 0x24040001, 0x3c020800, 0xaca30018, 0x9443466e, 0x8f850018,
-        0x3c02400e, 0x00621825, 0x0e001044, 0xaca3001c, 0x0e000d48, 0x8e040000,
+        0x8c434448, 0x24040001, 0x3c020800, 0xaca30018, 0x944358ce, 0x8f850018,
+        0x3c02400e, 0x00621825, 0x0e0014cc, 0xaca3001c, 0x0e00122e, 0x8e040000,
         0x8fbf0014, 0x8fb00010, 0x03e00008, 0x27bd0018, 0x3c038000, 0x8f420278,
         0x00431024, 0x1440fffd, 0x24020002, 0x3c031000, 0xaf440240, 0xa3420244,
         0x03e00008, 0xaf430278, 0x3c020800, 0x8c430020, 0x27bdffe0, 0xafb10014,
         0x00808821, 0xafb20018, 0x00c09021, 0xafb00010, 0x30b0ffff, 0x1060001c,
-        0xafbf001c, 0x0e001006, 0x00000000, 0x8f820018, 0xac510000, 0x8f840018,
+        0xafbf001c, 0x0e00148e, 0x00000000, 0x8f820018, 0xac510000, 0x8f840018,
         0x00101400, 0xac820004, 0x8f830018, 0xac600008, 0x8f820018, 0xac40000c,
         0x8f830018, 0xac600010, 0x8f820018, 0xac520014, 0x8f840018, 0x3c026000,
-        0x8c434448, 0x3c020800, 0xac830018, 0x9443466e, 0x8f840018, 0x3c024019,
-        0x00621825, 0xac83001c, 0x0e001044, 0x24040001, 0x8fbf001c, 0x8fb20018,
+        0x8c434448, 0x3c020800, 0xac830018, 0x944358ce, 0x8f840018, 0x3c024019,
+        0x00621825, 0xac83001c, 0x0e0014cc, 0x24040001, 0x8fbf001c, 0x8fb20018,
         0x8fb10014, 0x8fb00010, 0x03e00008, 0x27bd0020, 0x27bdffe8, 0x27450100,
-        0xafbf0010, 0x94a3000c, 0x240200c1, 0x14620029, 0x00803021, 0x3c029000,
+        0xafbf0010, 0x94a3000c, 0x240200c1, 0x14620031, 0x00803021, 0x3c029000,
         0x34420001, 0x00c21025, 0xaf420020, 0x3c038000, 0x8f420020, 0x00431024,
         0x1440fffd, 0x3c028000, 0x34420001, 0x3c049000, 0x34840001, 0x3c058000,
         0x24030012, 0x00c21025, 0x00c42025, 0xa363003f, 0xaf420020, 0xaf440020,
-        0x8f420020, 0x00451024, 0x1440fffd, 0x3c038000, 0x9362007d, 0x34630001,
-        0x3c048000, 0x00c31825, 0x34420020, 0xa362007d, 0xaf430020, 0x8f4201f8,
-        0x00441024, 0x1440fffd, 0x24020002, 0x3c031000, 0xaf4601c0, 0xa34201c4,
-        0xaf4301f8, 0x0a000db3, 0x8fbf0010, 0x00c02021, 0x94a5000c, 0x24060001,
-        0x0e000f78, 0x240706d8, 0x8fbf0010, 0x03e00008, 0x27bd0018, 0x3c020800,
-        0x8c430020, 0x27bdffe0, 0xafb00010, 0x00808021, 0xafb20018, 0x00a09021,
-        0xafb10014, 0x30d100ff, 0x1060001c, 0xafbf001c, 0x0e001006, 0x00000000,
-        0x8f820018, 0xac500000, 0x8f840018, 0x24020001, 0xac820004, 0x8f830018,
-        0xac600008, 0x8f820018, 0xac40000c, 0x8f830018, 0xac600010, 0x8f820018,
-        0xac520014, 0x8f840018, 0x3c026000, 0x8c434448, 0x3c020800, 0xac830018,
-        0x9443466e, 0x8f840018, 0x3c024010, 0x00621825, 0xac83001c, 0x0e001044,
-        0x02202021, 0x8fbf001c, 0x8fb20018, 0x8fb10014, 0x8fb00010, 0x03e00008,
-        0x27bd0020, 0x27bdffe8, 0xafbf0014, 0xafb00010, 0x93620005, 0x30420001,
-        0x10400033, 0x00808021, 0x3c029000, 0x34420001, 0x02021025, 0xaf420020,
-        0x3c038000, 0x8f420020, 0x00431024, 0x1440fffd, 0x00000000, 0x93620005,
-        0x3c048000, 0x3c030800, 0x304200fe, 0xa3620005, 0x8c620020, 0x34840001,
-        0x02042025, 0xaf440020, 0x10400020, 0x8fbf0014, 0x0e001006, 0x00000000,
-        0x8f820018, 0xac500000, 0x93630082, 0x9362003f, 0x8f840018, 0x00031a00,
-        0x00431025, 0xac820004, 0x8f830018, 0xac600008, 0x8f820018, 0xac40000c,
-        0x8f830018, 0xac600010, 0x8f820018, 0xac400014, 0x8f840018, 0x3c026000,
-        0x8c434448, 0x3c020800, 0xac830018, 0x9443466e, 0x8f840018, 0x3c02400a,
-        0x00621825, 0xac83001c, 0x0e001044, 0x24040001, 0x8fbf0014, 0x8fb00010,
-        0x03e00008, 0x27bd0018, 0x27bdffe8, 0xafbf0010, 0x8f420188, 0x00803021,
-        0x9364003f, 0x24030012, 0x00021402, 0x1483001c, 0x304500ff, 0x3c029000,
-        0x34420001, 0x3c038000, 0x00c21025, 0xa3650080, 0xa365007a, 0xaf420020,
-        0x8f420020, 0x00431024, 0x1440fffd, 0x3c028000, 0x9363007d, 0x34420001,
-        0x3c048000, 0x00c21025, 0xa363007d, 0xaf420020, 0x8f4201f8, 0x00441024,
-        0x1440fffd, 0x24020002, 0x3c031000, 0xaf4601c0, 0xa34201c4, 0xaf4301f8,
-        0x0a000e54, 0x8fbf0010, 0x9362007e, 0x1445000e, 0x00000000, 0x93620080,
-        0x1045000b, 0x00000000, 0xa3650080, 0x8f820000, 0x93660080, 0x8f440180,
-        0x8f65004c, 0x8c430000, 0x0060f809, 0x00000000, 0x0a000e54, 0x8fbf0010,
-        0xa3650080, 0x8fbf0010, 0x03e00008, 0x27bd0018, 0x3c020800, 0x8c430020,
-        0x27bdffe0, 0xafb10014, 0x00808821, 0xafb20018, 0x00a09021, 0xafb00010,
-        0x30d000ff, 0x1060002f, 0xafbf001c, 0x0e001006, 0x00000000, 0x8f820018,
-        0xac510000, 0x8f830018, 0xac700004, 0x8f820018, 0xac520008, 0x8f830018,
-        0xac60000c, 0x8f820018, 0xac400010, 0x9763006a, 0x00032880, 0x50a00001,
-        0x24050001, 0x97630068, 0x93640081, 0x3c020800, 0x8c46004c, 0x00652821,
-        0x00852804, 0x00c5102b, 0x54400001, 0x00a03021, 0x3c020800, 0x8c440050,
-        0x00c4182b, 0x54600001, 0x00c02021, 0x8f830018, 0x2402fffe, 0x00822824,
-        0x3c026000, 0xac650014, 0x8f840018, 0x8c434448, 0x3c020800, 0xac830018,
-        0x9443466e, 0x8f840018, 0x3c024011, 0x00621825, 0xac83001c, 0x0e001044,
-        0x24040001, 0x8fbf001c, 0x8fb20018, 0x8fb10014, 0x8fb00010, 0x03e00008,
-        0x27bd0020, 0x27bdffe8, 0xafbf0014, 0xafb00010, 0x8f440100, 0x27500100,
-        0x8f650050, 0x0e000c45, 0x9206001b, 0x3c020800, 0x8c430020, 0x1060001d,
-        0x8e100018, 0x0e001006, 0x00000000, 0x8f840018, 0x8f420100, 0xac820000,
-        0x8f830018, 0xac700004, 0x8f840018, 0x8f620050, 0xac820008, 0x8f830018,
-        0xac60000c, 0x8f820018, 0xac400010, 0x8f830018, 0x3c026000, 0xac600014,
-        0x8f850018, 0x8c434448, 0x24040001, 0x3c020800, 0xaca30018, 0x9443466e,
-        0x8f850018, 0x3c02401c, 0x00621825, 0x0e001044, 0xaca3001c, 0x8fbf0014,
-        0x8fb00010, 0x03e00008, 0x27bd0018, 0x3c029000, 0x8f460140, 0x34420001,
-        0x3c038000, 0x00c21025, 0xaf420020, 0x8f420020, 0x00431024, 0x1440fffd,
-        0x3c048000, 0x34840001, 0x3c059000, 0x34a50001, 0x3c078000, 0x24020012,
-        0x24030080, 0x00c42025, 0x00c52825, 0xa362003f, 0xa3630082, 0xaf440020,
-        0xaf450020, 0x8f420020, 0x00471024, 0x1440fffd, 0x3c038000, 0x9362007d,
-        0x34630001, 0x3c048000, 0x00c31825, 0x34420020, 0xa362007d, 0xaf430020,
-        0x8f4201f8, 0x00441024, 0x1440fffd, 0x24020002, 0x3c031000, 0xaf4601c0,
-        0xa34201c4, 0x03e00008, 0xaf4301f8, 0x8f430238, 0x3c020800, 0x04610013,
-        0x8c44009c, 0x2406fffe, 0x3c050800, 0x3c038000, 0x2484ffff, 0x14800009,
-        0x00000000, 0x97420078, 0x8ca3007c, 0x24420001, 0x00461024, 0x24630001,
-        0xa7620010, 0x03e00008, 0xaca3007c, 0x8f420238, 0x00431024, 0x1440fff3,
-        0x2484ffff, 0x8f420140, 0x3c031000, 0xaf420200, 0x03e00008, 0xaf430238,
-        0x3c029000, 0x8f440140, 0x34420001, 0x3c038000, 0x00821025, 0xaf420020,
-        0x8f420020, 0x00431024, 0x1440fffd, 0x00000000, 0x3c038000, 0x9362007d,
-        0x34630001, 0x3c058000, 0x00831825, 0x34420001, 0xa362007d, 0xaf430020,
-        0x8f4201f8, 0x00451024, 0x1440fffd, 0x24020002, 0x3c031000, 0xaf4401c0,
-        0xa34201c4, 0x03e00008, 0xaf4301f8, 0x0000000d, 0x03e00008, 0x00000000,
-        0x0000000d, 0x03e00008, 0x00000000, 0x24020001, 0x03e00008, 0xa7620010,
-        0x9362003f, 0x304400ff, 0x3883000e, 0x2c630001, 0x38820010, 0x2c420001,
-        0x00621825, 0x14600003, 0x24020012, 0x14820003, 0x00000000, 0x03e00008,
-        0x00001021, 0x9363007e, 0x9362007a, 0x14620006, 0x00000000, 0x9363007e,
-        0x24020001, 0x24630001, 0x03e00008, 0xa363007e, 0x9363007e, 0x93620080,
-        0x14620004, 0x24020001, 0xa362000b, 0x03e00008, 0x24020001, 0x03e00008,
-        0x00001021, 0x9362000b, 0x10400021, 0x00001021, 0xa360000b, 0x9362003f,
-        0x304400ff, 0x3883000e, 0x2c630001, 0x38820010, 0x2c420001, 0x00621825,
-        0x14600015, 0x00001821, 0x24020012, 0x10820012, 0x00000000, 0x9363007e,
-        0x9362007a, 0x14620007, 0x00000000, 0x9362007e, 0x24030001, 0x24420001,
-        0xa362007e, 0x03e00008, 0x00601021, 0x9363007e, 0x93620080, 0x14620004,
-        0x00001821, 0x24020001, 0xa362000b, 0x24030001, 0x03e00008, 0x00601021,
-        0x03e00008, 0x00000000, 0x24040001, 0xaf64000c, 0x8f6300dc, 0x8f6200cc,
-        0x50620001, 0xa7640010, 0xa7640012, 0xa7640014, 0x03e00008, 0xa7640016,
-        0x27bdffd8, 0xafb00010, 0x00808021, 0xafb3001c, 0x00c09821, 0xafbf0020,
-        0xafb20018, 0xafb10014, 0x93620023, 0x00e09021, 0x30420040, 0x10400020,
-        0x30b1ffff, 0x3c020800, 0x8c430020, 0x1060001c, 0x00000000, 0x0e001006,
-        0x00000000, 0x8f820018, 0xac500000, 0x8f840018, 0x3c02008d, 0xac820004,
-        0x8f830018, 0xac600008, 0x8f820018, 0xac40000c, 0x8f830018, 0xac600010,
-        0x8f820018, 0xac520014, 0x8f850018, 0x3c026000, 0x8c434448, 0x24040001,
-        0x3c020800, 0xaca30018, 0x9443466e, 0x8f850018, 0x3c024019, 0x00621825,
-        0x0e001044, 0xaca3001c, 0x93620023, 0x30420020, 0x14400003, 0x3c020800,
-        0x52600020, 0x3c029000, 0x8c430020, 0x1060001d, 0x3c029000, 0x0e001006,
-        0x00000000, 0x8f820018, 0xac500000, 0x8f840018, 0x00111400, 0xac820004,
-        0x8f830018, 0xac720008, 0x8f820018, 0xac40000c, 0x8f830018, 0xac600010,
-        0x8f820018, 0xac400014, 0x8f850018, 0x3c026000, 0x8c434448, 0x24040001,
-        0x3c020800, 0xaca30018, 0x9443466e, 0x8f850018, 0x3c02401b, 0x00621825,
-        0x0e001044, 0xaca3001c, 0x3c029000, 0x34420001, 0x02021025, 0xaf420020,
-        0x3c038000, 0x8f420020, 0x00431024, 0x1440fffd, 0x00000000, 0x93630023,
-        0x3c028000, 0x34420001, 0x02021025, 0x8fbf0020, 0x8fb3001c, 0x8fb20018,
-        0x8fb10014, 0x8fb00010, 0x3063009f, 0xa3630023, 0xaf420020, 0x03e00008,
-        0x27bd0028, 0x3c020800, 0x8c430020, 0x27bdffe8, 0xafb00010, 0x27500100,
-        0x1060001d, 0xafbf0014, 0x0e001006, 0x00000000, 0x8f830018, 0x8e020004,
-        0xac620000, 0x8f840018, 0x8e020018, 0xac820004, 0x8f850018, 0x8e020000,
-        0xaca20008, 0x8f830018, 0xac60000c, 0x8f820018, 0xac400010, 0x8f830018,
-        0xac600014, 0x8f820018, 0xac400018, 0x96030008, 0x3c020800, 0x9444466e,
-        0x8f850018, 0x00031c00, 0x00641825, 0x24040001, 0x0e001044, 0xaca3001c,
-        0x8fbf0014, 0x8fb00010, 0x03e00008, 0x27bd0018, 0x3c060800, 0x24c54660,
-        0x3c02000a, 0x03421821, 0x94640006, 0x94a2000a, 0x00441023, 0x00021400,
-        0x00021c03, 0x04610006, 0xa4a40006, 0x0000000d, 0x00000000, 0x2400005a,
-        0x0a00101b, 0x24020001, 0x8f820014, 0x0062102b, 0x14400002, 0x00001021,
-        0x24020001, 0x304200ff, 0x1040001c, 0x274a0400, 0x3c07000a, 0x3c020800,
-        0x24454660, 0x94a9000a, 0x8f880014, 0x03471021, 0x94430006, 0x00402021,
-        0xa4a30006, 0x94820006, 0xa4a20006, 0x01221023, 0x00021400, 0x00021403,
-        0x04410006, 0x0048102b, 0x0000000d, 0x00000000, 0x2400005a, 0x0a001036,
-        0x24020001, 0x14400002, 0x00001021, 0x24020001, 0x304200ff, 0x1440ffec,
-        0x03471021, 0x24c44660, 0x8c820010, 0xaf420038, 0x8c830014, 0x3c020005,
-        0xaf43003c, 0xaf420030, 0xaf800010, 0xaf8a0018, 0x03e00008, 0x00000000,
-        0x27bdffe0, 0x8f820010, 0x8f850018, 0x3c070800, 0x24e84660, 0xafbf001c,
-        0xafb20018, 0xafb10014, 0xafb00010, 0x9503000a, 0x8d060014, 0x00009021,
-        0x309000ff, 0x00e08821, 0x24420001, 0x24a50020, 0x24630001, 0xaf820010,
-        0xaf850018, 0xa503000a, 0x24c30020, 0x3c028000, 0x04c10007, 0xad030014,
-        0x00621024, 0x14400005, 0x26224660, 0x8d020010, 0x24420001, 0xad020010,
-        0x26224660, 0x9444000a, 0x94450018, 0x0010102b, 0x00a41826, 0x2c630001,
-        0x00621825, 0x1060001c, 0x3c030006, 0x8f820010, 0x24120001, 0x00021140,
-        0x00431025, 0xaf420030, 0x00000000, 0x00000000, 0x00000000, 0x27450400,
-        0x8f420000, 0x30420010, 0x1040fffd, 0x26224660, 0x9444000a, 0x94430018,
-        0xaf800010, 0xaf850018, 0x14830012, 0x26274660, 0x0e0010d2, 0x00000000,
-        0x1600000e, 0x26274660, 0x0e001006, 0x00000000, 0x0a00108f, 0x26274660,
-        0x00041c00, 0x00031c03, 0x00051400, 0x00021403, 0x00621823, 0x18600002,
-        0x3c026000, 0xac400808, 0x26274660, 0x94e2000e, 0x94e3000c, 0x24420001,
-        0xa4e2000e, 0x3042ffff, 0x50430001, 0xa4e0000e, 0x12000005, 0x3c02000a,
-        0x94e2000a, 0xa74200a2, 0x0a0010cc, 0x02401021, 0x03421821, 0x94640006,
-        0x94e2000a, 0x00441023, 0x00021400, 0x00021c03, 0x04610006, 0xa4e40006,
-        0x0000000d, 0x00000000, 0x2400005a, 0x0a0010ae, 0x24020001, 0x8f820014,
-        0x0062102b, 0x14400002, 0x00001021, 0x24020001, 0x304200ff, 0x1040001b,
-        0x3c020800, 0x3c06000a, 0x24454660, 0x94a8000a, 0x8f870014, 0x03461021,
-        0x94430006, 0x00402021, 0xa4a30006, 0x94820006, 0xa4a20006, 0x01021023,
-        0x00021400, 0x00021403, 0x04410006, 0x0047102b, 0x0000000d, 0x00000000,
-        0x2400005a, 0x0a0010c8, 0x24020001, 0x14400002, 0x00001021, 0x24020001,
-        0x304200ff, 0x1440ffec, 0x03461021, 0x02401021, 0x8fbf001c, 0x8fb20018,
-        0x8fb10014, 0x8fb00010, 0x03e00008, 0x27bd0020, 0x3c020800, 0x24454660,
-        0x94a3001a, 0x8ca40024, 0x00403021, 0x000318c0, 0x00832021, 0xaf44003c,
-        0x8ca20020, 0xaf420038, 0x3c020050, 0x34420008, 0xaf420030, 0x00000000,
-        0x00000000, 0x00000000, 0x8f420000, 0x30420020, 0x1040fffd, 0x00000000,
-        0x8f430400, 0x24c64660, 0xacc30010, 0x8f420404, 0x3c030020, 0xacc20014,
-        0xaf430030, 0x94c40018, 0x94c3001c, 0x94c2001a, 0x94c5001e, 0x00832021,
-        0x24420001, 0xa4c2001a, 0x3042ffff, 0x14450002, 0xa4c40018, 0xa4c0001a,
-        0x03e00008, 0x00000000, 0x8f820010, 0x3c030006, 0x00021140, 0x00431025,
-        0xaf420030, 0x00000000, 0x00000000, 0x00000000, 0x27430400, 0x8f420000,
-        0x30420010, 0x1040fffd, 0x00000000, 0xaf800010, 0xaf830018, 0x03e00008,
-        0x00000000, 0x27bdffe8, 0xafb00010, 0x3c100800, 0x26104660, 0x3c05000a,
-        0x02002021, 0x03452821, 0xafbf0014, 0x0e001128, 0x2406000a, 0x96020002,
-        0x9603001e, 0x3042000f, 0x24420003, 0x00431804, 0x24027fff, 0x0043102b,
-        0xaf830014, 0x10400004, 0x00000000, 0x0000000d, 0x00000000, 0x24000043,
-        0x0e0010d2, 0x00000000, 0x8fbf0014, 0x8fb00010, 0x03e00008, 0x27bd0018,
-        0x10c00007, 0x00000000, 0x8ca20000, 0x24c6ffff, 0x24a50004, 0xac820000,
-        0x14c0fffb, 0x24840004, 0x03e00008, 0x00000000, 0x0a001137, 0x00a01021,
-        0xac860000, 0x24840004, 0x00a01021, 0x1440fffc, 0x24a5ffff, 0x03e00008,
-        0x00000000, 0x3c036000, 0x8c642b7c, 0x3c036010, 0x8c6553fc, 0x00041582,
-        0x00042302, 0x308403ff, 0x00052d82, 0x00441026, 0x0002102b, 0x0005282b,
-        0x00451025, 0x1440000d, 0x3c020050, 0x34420004, 0xaf400038, 0xaf40003c,
-        0xaf420030, 0x00000000, 0x00000000, 0x8f420000, 0x30420020, 0x1040fffd,
-        0x3c020020, 0xaf420030, 0x0000000d, 0x03e00008, 0x00000000, 0x3c020050,
-        0x34420004, 0xaf440038, 0xaf45003c, 0xaf420030, 0x00000000, 0x00000000,
-        0x8f420000, 0x30420020, 0x1040fffd, 0x3c020020, 0xaf420030, 0x03e00008,
-        0x00000000, 0x00000000 };
-
-static u32 bnx2_COM_b06FwData[(0x0/4) + 1] = { 0x00000000 };
-static u32 bnx2_COM_b06FwRodata[(0x18/4) + 1] = {
-        0x08002318, 0x08002348, 0x08002378, 0x080023a8, 0x080023d8, 0x00000000,
-        0x00000000 };
+        0x8f420020, 0x00451024, 0x1440fffd, 0x00000000, 0x9362007d, 0x3c038000,
+        0x34420020, 0xa362007d, 0x8f640074, 0x34630001, 0x00c31825, 0xaf430020,
+        0x04810006, 0x3c038000, 0x00c02021, 0x0e000470, 0x24050906, 0x0a0012a1,
+        0x8fbf0010, 0x8f4201f8, 0x00431024, 0x1440fffd, 0x24020002, 0x3c031000,
+        0xaf4601c0, 0xa34201c4, 0xaf4301f8, 0x0a0012a1, 0x8fbf0010, 0x00c02021,
+        0x94a5000c, 0x24060001, 0x0e000fb1, 0x2407090e, 0x8fbf0010, 0x03e00008,
+        0x27bd0018, 0x3c020800, 0x8c430020, 0x27bdffe0, 0xafb00010, 0x00808021,
+        0xafb20018, 0x00a09021, 0xafb10014, 0x30d100ff, 0x1060001c, 0xafbf001c,
+        0x0e00148e, 0x00000000, 0x8f820018, 0xac500000, 0x8f840018, 0x24020001,
+        0xac820004, 0x8f830018, 0xac600008, 0x8f820018, 0xac40000c, 0x8f830018,
+        0xac600010, 0x8f820018, 0xac520014, 0x8f840018, 0x3c026000, 0x8c434448,
+        0x3c020800, 0xac830018, 0x944358ce, 0x8f840018, 0x3c024010, 0x00621825,
+        0xac83001c, 0x0e0014cc, 0x02202021, 0x8fbf001c, 0x8fb20018, 0x8fb10014,
+        0x8fb00010, 0x03e00008, 0x27bd0020, 0x27bdffe8, 0xafbf0014, 0xafb00010,
+        0x93620005, 0x30420001, 0x10400036, 0x00808021, 0x3c029000, 0x34420001,
+        0x02021025, 0xaf420020, 0x3c038000, 0x8f420020, 0x00431024, 0x1440fffd,
+        0x00000000, 0x93620023, 0x34420004, 0xa3620023, 0x93630005, 0x3c048000,
+        0x3c020800, 0x306300fe, 0xa3630005, 0x8c430020, 0x34840001, 0x02042025,
+        0xaf440020, 0x10600020, 0x8fbf0014, 0x0e00148e, 0x00000000, 0x8f820018,
+        0xac500000, 0x93630082, 0x9362003f, 0x8f840018, 0x00031a00, 0x00431025,
+        0xac820004, 0x8f830018, 0xac600008, 0x8f820018, 0xac40000c, 0x8f830018,
+        0xac600010, 0x8f820018, 0xac400014, 0x8f840018, 0x3c026000, 0x8c434448,
+        0x3c020800, 0xac830018, 0x944358ce, 0x8f840018, 0x3c02400a, 0x00621825,
+        0xac83001c, 0x0e0014cc, 0x24040001, 0x8fbf0014, 0x8fb00010, 0x03e00008,
+        0x27bd0018, 0x3c020800, 0x8c430020, 0x27bdffe0, 0xafb10014, 0x00808821,
+        0xafb20018, 0x00a09021, 0xafb00010, 0x30d000ff, 0x1060002f, 0xafbf001c,
+        0x0e00148e, 0x00000000, 0x8f820018, 0xac510000, 0x8f830018, 0xac700004,
+        0x8f820018, 0xac520008, 0x8f830018, 0xac60000c, 0x8f820018, 0xac400010,
+        0x9763006a, 0x00032880, 0x50a00001, 0x24050001, 0x97630068, 0x93640081,
+        0x3c020800, 0x8c46004c, 0x00652821, 0x00852804, 0x00c5102b, 0x54400001,
+        0x00a03021, 0x3c020800, 0x8c440050, 0x00c4182b, 0x54600001, 0x00c02021,
+        0x8f830018, 0x2402fffe, 0x00822824, 0x3c026000, 0xac650014, 0x8f840018,
+        0x8c434448, 0x3c020800, 0xac830018, 0x944358ce, 0x8f840018, 0x3c024011,
+        0x00621825, 0xac83001c, 0x0e0014cc, 0x24040001, 0x8fbf001c, 0x8fb20018,
+        0x8fb10014, 0x8fb00010, 0x03e00008, 0x27bd0020, 0x27bdffe8, 0xafbf0014,
+        0xafb00010, 0x8f440100, 0x27500100, 0x8f650050, 0x0e0010fc, 0x9206001b,
+        0x3c020800, 0x8c430020, 0x1060001d, 0x8e100018, 0x0e00148e, 0x00000000,
+        0x8f840018, 0x8f420100, 0xac820000, 0x8f830018, 0xac700004, 0x8f840018,
+        0x8f620050, 0xac820008, 0x8f830018, 0xac60000c, 0x8f820018, 0xac400010,
+        0x8f830018, 0x3c026000, 0xac600014, 0x8f850018, 0x8c434448, 0x24040001,
+        0x3c020800, 0xaca30018, 0x944358ce, 0x8f850018, 0x3c02401c, 0x00621825,
+        0x0e0014cc, 0xaca3001c, 0x8fbf0014, 0x8fb00010, 0x03e00008, 0x27bd0018,
+        0x8f430238, 0x3c020800, 0x04610013, 0x8c44009c, 0x2406fffe, 0x3c050800,
+        0x3c038000, 0x2484ffff, 0x14800009, 0x00000000, 0x97420078, 0x8ca3007c,
+        0x24420001, 0x00461024, 0x24630001, 0xa7620010, 0x03e00008, 0xaca3007c,
+        0x8f420238, 0x00431024, 0x1440fff3, 0x2484ffff, 0x8f420140, 0x3c031000,
+        0xaf420200, 0x03e00008, 0xaf430238, 0x27bdffe8, 0x3c029000, 0xafbf0010,
+        0x8f450140, 0x34420001, 0x3c038000, 0x00a21025, 0xaf420020, 0x8f420020,
+        0x00431024, 0x1440fffd, 0x00000000, 0x9362007d, 0x3c038000, 0x34420001,
+        0xa362007d, 0x8f640074, 0x34630001, 0x00a31825, 0xaf430020, 0x04810006,
+        0x3c038000, 0x00a02021, 0x0e000470, 0x24050ac7, 0x0a0013b9, 0x8fbf0010,
+        0x8f4201f8, 0x00431024, 0x1440fffd, 0x24020002, 0x3c031000, 0xaf4501c0,
+        0xa34201c4, 0xaf4301f8, 0x8fbf0010, 0x03e00008, 0x27bd0018, 0x0000000d,
+        0x03e00008, 0x00000000, 0x0000000d, 0x03e00008, 0x00000000, 0x24020001,
+        0x03e00008, 0xa7620010, 0x9362003f, 0x304400ff, 0x3883000e, 0x2c630001,
+        0x38820010, 0x2c420001, 0x00621825, 0x14600003, 0x24020012, 0x14820003,
+        0x00000000, 0x03e00008, 0x00001021, 0x9363007e, 0x9362007a, 0x14620006,
+        0x00000000, 0x9363007e, 0x24020001, 0x24630001, 0x03e00008, 0xa363007e,
+        0x9362007e, 0x8f630178, 0x304200ff, 0x14430006, 0x00000000, 0x9363000b,
+        0x24020001, 0x24630001, 0x03e00008, 0xa363000b, 0x03e00008, 0x00001021,
+        0x9362000b, 0x10400023, 0x00001021, 0xa360000b, 0x9362003f, 0x304400ff,
+        0x3883000e, 0x2c630001, 0x38820010, 0x2c420001, 0x00621825, 0x14600017,
+        0x00001821, 0x24020012, 0x10820014, 0x00000000, 0x9363007e, 0x9362007a,
+        0x14620007, 0x00000000, 0x9362007e, 0x24030001, 0x24420001, 0xa362007e,
+        0x03e00008, 0x00601021, 0x9362007e, 0x8f630178, 0x304200ff, 0x14430005,
+        0x00001821, 0x9362000b, 0x24030001, 0x24420001, 0xa362000b, 0x03e00008,
+        0x00601021, 0x03e00008, 0x00000000, 0x24040001, 0xaf64000c, 0x8f6300dc,
+        0x8f6200cc, 0x50620001, 0xa7640010, 0xa7640012, 0xa7640014, 0x03e00008,
+        0xa7640016, 0x3c020800, 0x8c430020, 0x27bdffe8, 0x1060001b, 0xafbf0010,
+        0x0e00148e, 0x00000000, 0x8f820018, 0xac400000, 0x8f830018, 0xac600004,
+        0x8f820018, 0xac400008, 0x8f830018, 0xac60000c, 0x8f820018, 0xac400010,
+        0x8f830018, 0x3c026000, 0xac600014, 0x8f840018, 0x8c434448, 0x3c020800,
+        0xac830018, 0x944358ce, 0x8f840018, 0x3c024020, 0x00621825, 0xac83001c,
+        0x0e0014cc, 0x24040001, 0x8fbf0010, 0x03e00008, 0x27bd0018, 0x3c020800,
+        0x8c430020, 0x27bdffe0, 0xafb00010, 0x00a08021, 0xafb10014, 0x00c08821,
+        0xafb20018, 0x00e09021, 0x1060001e, 0xafbf001c, 0x0e00148e, 0x00000000,
+        0x8f840018, 0x8f420100, 0xac820000, 0x8f830018, 0xac700004, 0x8f820018,
+        0xac510008, 0x8f830018, 0xac72000c, 0x8f840018, 0x8fa20030, 0xac820010,
+        0x8f830018, 0x8fa20034, 0xac620014, 0x8f840018, 0x3c026000, 0x8c434448,
+        0x3c020800, 0xac830018, 0x944358ce, 0x8f840018, 0x3c0240c9, 0x00621825,
+        0xac83001c, 0x0e0014cc, 0x24040001, 0x8fbf001c, 0x8fb20018, 0x8fb10014,
+        0x8fb00010, 0x03e00008, 0x27bd0020, 0x3c020800, 0x8c430020, 0x27bdffe8,
+        0xafb00010, 0x27500100, 0x1060001d, 0xafbf0014, 0x0e00148e, 0x00000000,
+        0x8f830018, 0x8e020004, 0xac620000, 0x8f840018, 0x8e020018, 0xac820004,
+        0x8f850018, 0x8e020000, 0xaca20008, 0x8f830018, 0xac60000c, 0x8f820018,
+        0xac400010, 0x8f830018, 0xac600014, 0x8f820018, 0xac400018, 0x96030008,
+        0x3c020800, 0x944458ce, 0x8f850018, 0x00031c00, 0x00641825, 0x24040001,
+        0x0e0014cc, 0xaca3001c, 0x8fbf0014, 0x8fb00010, 0x03e00008, 0x27bd0018,
+        0x3c060800, 0x24c558c0, 0x3c02000a, 0x03421821, 0x94640006, 0x94a2000a,
+        0x00441023, 0x00021400, 0x00021c03, 0x04610006, 0xa4a40006, 0x0000000d,
+        0x00000000, 0x2400005a, 0x0a0014a3, 0x24020001, 0x8f820014, 0x0062102b,
+        0x14400002, 0x00001021, 0x24020001, 0x304200ff, 0x1040001c, 0x274a0400,
+        0x3c07000a, 0x3c020800, 0x244558c0, 0x94a9000a, 0x8f880014, 0x03471021,
+        0x94430006, 0x00402021, 0xa4a30006, 0x94820006, 0xa4a20006, 0x01221023,
+        0x00021400, 0x00021403, 0x04410006, 0x0048102b, 0x0000000d, 0x00000000,
+        0x2400005a, 0x0a0014be, 0x24020001, 0x14400002, 0x00001021, 0x24020001,
+        0x304200ff, 0x1440ffec, 0x03471021, 0x24c458c0, 0x8c820010, 0xaf420038,
+        0x8c830014, 0x3c020005, 0xaf43003c, 0xaf420030, 0xaf800010, 0xaf8a0018,
+        0x03e00008, 0x00000000, 0x27bdffe0, 0x8f820010, 0x8f850018, 0x3c070800,
+        0x24e858c0, 0xafbf001c, 0xafb20018, 0xafb10014, 0xafb00010, 0x9503000a,
+        0x8d060014, 0x00009021, 0x309000ff, 0x00e08821, 0x24420001, 0x24a50020,
+        0x24630001, 0xaf820010, 0xaf850018, 0xa503000a, 0x24c30020, 0x3c028000,
+        0x04c10007, 0xad030014, 0x00621024, 0x14400005, 0x262258c0, 0x8d020010,
+        0x24420001, 0xad020010, 0x262258c0, 0x9444000a, 0x94450018, 0x0010102b,
+        0x00a41826, 0x2c630001, 0x00621825, 0x1060001c, 0x3c030006, 0x8f820010,
+        0x24120001, 0x00021140, 0x00431025, 0xaf420030, 0x00000000, 0x00000000,
+        0x00000000, 0x27450400, 0x8f420000, 0x30420010, 0x1040fffd, 0x262258c0,
+        0x9444000a, 0x94430018, 0xaf800010, 0xaf850018, 0x14830012, 0x262758c0,
+        0x0e00155a, 0x00000000, 0x1600000e, 0x262758c0, 0x0e00148e, 0x00000000,
+        0x0a001517, 0x262758c0, 0x00041c00, 0x00031c03, 0x00051400, 0x00021403,
+        0x00621823, 0x18600002, 0x3c026000, 0xac400808, 0x262758c0, 0x94e2000e,
+        0x94e3000c, 0x24420001, 0xa4e2000e, 0x3042ffff, 0x50430001, 0xa4e0000e,
+        0x12000005, 0x3c02000a, 0x94e2000a, 0xa74200a2, 0x0a001554, 0x02401021,
+        0x03421821, 0x94640006, 0x94e2000a, 0x00441023, 0x00021400, 0x00021c03,
+        0x04610006, 0xa4e40006, 0x0000000d, 0x00000000, 0x2400005a, 0x0a001536,
+        0x24020001, 0x8f820014, 0x0062102b, 0x14400002, 0x00001021, 0x24020001,
+        0x304200ff, 0x1040001b, 0x3c020800, 0x3c06000a, 0x244558c0, 0x94a8000a,
+        0x8f870014, 0x03461021, 0x94430006, 0x00402021, 0xa4a30006, 0x94820006,
+        0xa4a20006, 0x01021023, 0x00021400, 0x00021403, 0x04410006, 0x0047102b,
+        0x0000000d, 0x00000000, 0x2400005a, 0x0a001550, 0x24020001, 0x14400002,
+        0x00001021, 0x24020001, 0x304200ff, 0x1440ffec, 0x03461021, 0x02401021,
+        0x8fbf001c, 0x8fb20018, 0x8fb10014, 0x8fb00010, 0x03e00008, 0x27bd0020,
+        0x3c020800, 0x244558c0, 0x94a3001a, 0x8ca40024, 0x00403021, 0x000318c0,
+        0x00832021, 0xaf44003c, 0x8ca20020, 0xaf420038, 0x3c020050, 0x34420008,
+        0xaf420030, 0x00000000, 0x00000000, 0x00000000, 0x8f420000, 0x30420020,
+        0x1040fffd, 0x00000000, 0x8f430400, 0x24c658c0, 0xacc30010, 0x8f420404,
+        0x3c030020, 0xacc20014, 0xaf430030, 0x94c40018, 0x94c3001c, 0x94c2001a,
+        0x94c5001e, 0x00832021, 0x24420001, 0xa4c2001a, 0x3042ffff, 0x14450002,
+        0xa4c40018, 0xa4c0001a, 0x03e00008, 0x00000000, 0x8f820010, 0x3c030006,
+        0x00021140, 0x00431025, 0xaf420030, 0x00000000, 0x00000000, 0x00000000,
+        0x27430400, 0x8f420000, 0x30420010, 0x1040fffd, 0x00000000, 0xaf800010,
+        0xaf830018, 0x03e00008, 0x00000000, 0x27bdffe8, 0xafb00010, 0x3c100800,
+        0x261058c0, 0x3c05000a, 0x02002021, 0x03452821, 0xafbf0014, 0x0e0015b0,
+        0x2406000a, 0x96020002, 0x9603001e, 0x3042000f, 0x24420003, 0x00431804,
+        0x24027fff, 0x0043102b, 0xaf830014, 0x10400004, 0x00000000, 0x0000000d,
+        0x00000000, 0x24000043, 0x0e00155a, 0x00000000, 0x8fbf0014, 0x8fb00010,
+        0x03e00008, 0x27bd0018, 0x10c00007, 0x00000000, 0x8ca20000, 0x24c6ffff,
+        0x24a50004, 0xac820000, 0x14c0fffb, 0x24840004, 0x03e00008, 0x00000000,
+        0x0a0015c1, 0x00a01021, 0xac860000, 0x00000000, 0x00000000, 0x24840004,
+        0x00a01021, 0x1440fffa, 0x24a5ffff, 0x03e00008, 0x00000000, 0x3c036000,
+        0x8c642b7c, 0x3c036010, 0x8c6553fc, 0x00041582, 0x00042302, 0x308403ff,
+        0x00052d82, 0x00441026, 0x0002102b, 0x0005282b, 0x00451025, 0x1440000d,
+        0x3c020050, 0x34420004, 0xaf400038, 0xaf40003c, 0xaf420030, 0x00000000,
+        0x00000000, 0x8f420000, 0x30420020, 0x1040fffd, 0x3c020020, 0xaf420030,
+        0x0000000d, 0x03e00008, 0x00000000, 0x3c020050, 0x34420004, 0xaf440038,
+        0xaf45003c, 0xaf420030, 0x00000000, 0x00000000, 0x8f420000, 0x30420020,
+        0x1040fffd, 0x3c020020, 0xaf420030, 0x03e00008, 0x00000000, 0x00000000};
 
-static u32 bnx2_COM_b06FwBss[(0x88/4) + 1] = { 0x00000000 };
-static u32 bnx2_COM_b06FwSbss[(0x1c/4) + 1] = { 0x00000000 };
+static u32 bnx2_COM_b06FwData[(0x0/4) + 1] = { 0x0 };
+static u32 bnx2_COM_b06FwRodata[(0x58/4) + 1] = {
+        0x08002428, 0x0800245c, 0x0800245c, 0x0800245c, 0x0800245c, 0x0800245c,
+        0x08002380, 0x0800245c, 0x080023e4, 0x0800245c, 0x0800231c, 0x0800245c,
+        0x0800245c, 0x0800245c, 0x08002328, 0x00000000, 0x08003240, 0x08003270,
+        0x080032a0, 0x080032d0, 0x08003300, 0x00000000, 0x00000000 };
+static u32 bnx2_COM_b06FwBss[(0x88/4) + 1] = { 0x0 };
+static u32 bnx2_COM_b06FwSbss[(0x1c/4) + 1] = { 0x0 };
 
-static int bnx2_RXP_b06FwReleaseMajor = 0x0;
+static int bnx2_RXP_b06FwReleaseMajor = 0x1;
 static int bnx2_RXP_b06FwReleaseMinor = 0x0;
 static int bnx2_RXP_b06FwReleaseFix = 0x0;
-static u32 bnx2_RXP_b06FwStartAddr = 0x08000060;
+static u32 bnx2_RXP_b06FwStartAddr = 0x08003104;
 static u32 bnx2_RXP_b06FwTextAddr = 0x08000000;
-static int bnx2_RXP_b06FwTextLen = 0x20b8;
-static u32 bnx2_RXP_b06FwDataAddr = 0x080020e0;
+static int bnx2_RXP_b06FwTextLen = 0x562c;
+static u32 bnx2_RXP_b06FwDataAddr = 0x08005660;
 static int bnx2_RXP_b06FwDataLen = 0x0;
 static u32 bnx2_RXP_b06FwRodataAddr = 0x00000000;
 static int bnx2_RXP_b06FwRodataLen = 0x0;
-static u32 bnx2_RXP_b06FwBssAddr = 0x08002100;
-static int bnx2_RXP_b06FwBssLen = 0x239c;
-static u32 bnx2_RXP_b06FwSbssAddr = 0x080020e0;
-static int bnx2_RXP_b06FwSbssLen = 0x14;
-
-static u32 bnx2_RXP_b06FwText[(0x20b8/4) + 1] = {
-        0x0a000018, 0x00000000, 0x00000000, 0x0000000d, 0x72787020, 0x302e362e,
-        0x39000000, 0x00060903, 0x00000000, 0x0000000d, 0x00000000, 0x00000000,
+static u32 bnx2_RXP_b06FwBssAddr = 0x08005680;
+static int bnx2_RXP_b06FwBssLen = 0x1394;
+static u32 bnx2_RXP_b06FwSbssAddr = 0x08005660;
+static int bnx2_RXP_b06FwSbssLen = 0x18;
+static u32 bnx2_RXP_b06FwText[(0x562c/4) + 1] = {
+        0x0a000c41, 0x00000000, 0x00000000, 0x0000000d, 0x72787020, 0x322e352e,
+        0x38000000, 0x02050803, 0x00000000, 0x0000000d, 0x00000000, 0x00000000,
         0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
         0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-        0x00000000, 0x10000003, 0x00000000, 0x0000000d, 0x0000000d, 0x3c020800,
-        0x244220e0, 0x3c030800, 0x2463449c, 0xac400000, 0x0043202b, 0x1480fffd,
-        0x24420004, 0x3c1d0800, 0x37bd3ffc, 0x03a0f021, 0x3c100800, 0x26100060,
-        0x3c1c0800, 0x279c20e0, 0x0e000329, 0x00000000, 0x0000000d, 0x8f870008,
-        0x2ce20080, 0x10400018, 0x3c030800, 0x24633490, 0x8f460100, 0x00072140,
-        0x00831021, 0xac460000, 0x8f450104, 0x00641021, 0xac450004, 0x8f460108,
-        0xac460008, 0x8f45010c, 0xac45000c, 0x8f460114, 0xac460010, 0x8f450118,
-        0xac450014, 0x8f460124, 0xac460018, 0x8f450128, 0x00641821, 0x24e20001,
-        0xaf820008, 0xac65001c, 0x03e00008, 0x00000000, 0x00804021, 0x8f830000,
-        0x24070001, 0x3c020001, 0x00621024, 0x10400037, 0x00603021, 0x9742010e,
-        0x3c038000, 0x3045ffff, 0x8f4201b8, 0x00431024, 0x1440fffd, 0x24020003,
-        0xa342018b, 0x8f840004, 0x24020080, 0x24030002, 0xaf420180, 0xa743018c,
-        0x10800005, 0xa745018e, 0x9743011c, 0x9742011e, 0x0a000069, 0x00021400,
-        0x9743011e, 0x9742011c, 0x00021400, 0x00621825, 0xaf4301a8, 0x8f84000c,
-        0x24020003, 0x30838000, 0x1060000d, 0xa7420188, 0x93420116, 0x304200fc,
-        0x005a1021, 0x24424004, 0x8c430000, 0x3063ffff, 0x14600005, 0x00000000,
-        0x3c02ffff, 0x34427fff, 0x00821024, 0xaf82000c, 0x9782000e, 0x9743010c,
-        0x8f440104, 0x3042bfff, 0x00031c00, 0x3084ffff, 0x00641825, 0xa74201a6,
-        0xaf4301ac, 0x3c021000, 0xaf4201b8, 0x03e00008, 0x00001021, 0x30c21000,
-        0x1040000f, 0x00000000, 0x9742010c, 0x3042fc00, 0x5440000b, 0x24070005,
-        0x3c021000, 0x00c21024, 0x10400007, 0x3c030dff, 0x3463ffff, 0x3c020e00,
-        0x00c21024, 0x0062182b, 0x54600001, 0x24070005, 0x8f82000c, 0x30434000,
-        0x10600016, 0x00404821, 0x3c020f00, 0x00c21024, 0x14400012, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x10000003, 0x00000000, 0x0000000d, 0x0000000d, 0x3c020800, 0x24425660,
+        0x3c030800, 0x24636a14, 0xac400000, 0x0043202b, 0x1480fffd, 0x24420004,
+        0x3c1d0800, 0x37bd7ffc, 0x03a0f021, 0x3c100800, 0x26103104, 0x3c1c0800,
+        0x279c5660, 0x0e001035, 0x00000000, 0x0000000d, 0x3c080800, 0x8d023100,
+        0x2c420080, 0x50400001, 0xad003100, 0x8d073100, 0x3c040800, 0x24840100,
+        0x8f460100, 0x00071840, 0x00671821, 0x00031940, 0x00641021, 0xac460000,
+        0x8f450104, 0x00831021, 0xac450004, 0x8f460108, 0xac460008, 0x8f45010c,
+        0xac45000c, 0x8f460114, 0xac460010, 0x8f450118, 0xac450014, 0x8f460124,
+        0xac460018, 0x8f450128, 0xac45001c, 0x8f464010, 0xac460020, 0x8f454014,
+        0xac450024, 0x8f464018, 0xac460028, 0x8f45401c, 0xac45002c, 0x8f464020,
+        0xac460030, 0x8f454024, 0xac450034, 0x8f464028, 0xac460038, 0x8f45402c,
+        0xac45003c, 0x8f464030, 0xac460040, 0x8f454034, 0xac450044, 0x8f464038,
+        0xac460048, 0x8f45403c, 0xac45004c, 0x8f464040, 0xac460050, 0x8f454044,
+        0xac450054, 0x8f464048, 0xac460058, 0x8f45404c, 0x24e70001, 0x00402021,
+        0xad073100, 0x03e00008, 0xac85005c, 0x8f820004, 0x9743010c, 0x00804821,
+        0x00403021, 0x30421000, 0x10400010, 0x306affff, 0x30c20020, 0x1440000e,
+        0x24070005, 0x3c021000, 0x00c21024, 0x10400009, 0x3c030dff, 0x3463ffff,
+        0x3c020e00, 0x00c21024, 0x0062182b, 0x50600004, 0x24070001, 0x0a000cb1,
+        0x3c020800, 0x24070001, 0x3c020800, 0x8c430034, 0x1460001d, 0x00405821,
+        0x8f820010, 0x30424000, 0x1440001a, 0x3c020001, 0x3c021f01, 0x00c24024,
+        0x3c031000, 0x15030015, 0x3c020001, 0x31420200, 0x54400012, 0x3c020001,
+        0x9744010e, 0x24020003, 0xa342018b, 0x97850012, 0x24020002, 0x34e30002,
+        0xaf400180, 0xa742018c, 0xa7430188, 0x24840004, 0x30a5bfff, 0xa744018e,
+        0xa74501a6, 0xaf4801b8, 0x03e00008, 0x00001021, 0x3c020001, 0x00c21024,
+        0x10400039, 0x00000000, 0x9742010e, 0x3c038000, 0x3046ffff, 0x8f4201b8,
+        0x00431024, 0x1440fffd, 0x24020003, 0xa342018b, 0x97840006, 0x8f85000c,
+        0x24020080, 0x24030002, 0xaf420180, 0xa743018c, 0xa746018e, 0x10a00005,
+        0xa7440190, 0x9743011c, 0x9742011e, 0x0a000cec, 0x00021400, 0x9743011e,
+        0x9742011c, 0x00021400, 0x00621825, 0xaf4301a8, 0x8f840010, 0x24020003,
+        0x30838000, 0x1060000d, 0xa7420188, 0x93420116, 0x304200fc, 0x005a1021,
+        0x24424004, 0x8c430000, 0x3063ffff, 0x14600005, 0x00000000, 0x3c02ffff,
+        0x34427fff, 0x00821024, 0xaf820010, 0x97820012, 0x9743010c, 0x8f440104,
+        0x3042bfff, 0x00031c00, 0x3084ffff, 0x00641825, 0xa74201a6, 0xaf4301ac,
+        0x3c021000, 0xaf4201b8, 0x03e00008, 0x00001021, 0x8f820010, 0x30434000,
+        0x10600016, 0x00404021, 0x3c020f00, 0x00c21024, 0x14400012, 0x00000000,
         0x93420116, 0x34424000, 0x03421821, 0x94650002, 0x2ca21389, 0x1040000b,
-        0x3c020800, 0x24422100, 0x00051942, 0x00031880, 0x00621821, 0x30a5001f,
-        0x8c640000, 0x24020001, 0x00a21004, 0x00822024, 0x01044025, 0x11000037,
-        0x3c021000, 0x9742010e, 0x34e60002, 0x3c038000, 0x24420004, 0x3045ffff,
-        0x8f4201b8, 0x00431024, 0x1440fffd, 0x24020003, 0xa342018b, 0x8f840004,
-        0x24020180, 0x24030002, 0xaf420180, 0xa743018c, 0x10800005, 0xa745018e,
-        0x9743011c, 0x9742011e, 0x0a0000cd, 0x00021400, 0x9743011e, 0x9742011c,
-        0x00021400, 0x00621825, 0xaf4301a8, 0x8f84000c, 0x30828000, 0x1040000c,
-        0xa7460188, 0x93420116, 0x304200fc, 0x005a1021, 0x24424004, 0x8c430000,
-        0x3063ffff, 0x14600004, 0x3c02ffff, 0x34427fff, 0x00821024, 0xaf82000c,
-        0x9782000e, 0x9743010c, 0x8f440104, 0x3042bfff, 0x00031c00, 0x3084ffff,
-        0x00641825, 0xa74201a6, 0xaf4301ac, 0x3c021000, 0xaf4201b8, 0x03e00008,
-        0x00001021, 0x00c21024, 0x104000ba, 0x3c020800, 0x8c430030, 0x1060003e,
-        0x31224000, 0x1040003c, 0x3c030f00, 0x00c31824, 0x3c020100, 0x0043102b,
-        0x14400038, 0x3c030800, 0x9742010e, 0x34e60002, 0x3c038000, 0x24420004,
-        0x3045ffff, 0x8f4201b8, 0x00431024, 0x1440fffd, 0x24020003, 0xa342018b,
-        0x8f840004, 0x24020080, 0x24030002, 0xaf420180, 0xa743018c, 0x10800005,
-        0xa745018e, 0x9743011c, 0x9742011e, 0x0a000110, 0x00021400, 0x9743011e,
-        0x9742011c, 0x00021400, 0x00621825, 0xaf4301a8, 0x8f84000c, 0x30828000,
-        0x1040000c, 0xa7460188, 0x93420116, 0x304200fc, 0x005a1021, 0x24424004,
-        0x8c430000, 0x3063ffff, 0x14600004, 0x3c02ffff, 0x34427fff, 0x00821024,
-        0xaf82000c, 0x9782000e, 0x9743010c, 0x8f440104, 0x3042bfff, 0x00031c00,
-        0x3084ffff, 0x00641825, 0xa74201a6, 0xaf4301ac, 0x3c021000, 0xaf4201b8,
-        0x03e00008, 0x00001021, 0x3c030800, 0x8c620024, 0x30420008, 0x1040003d,
-        0x34e80002, 0x3c020f00, 0x00c21024, 0x5440003a, 0x3107ffff, 0x9742010c,
-        0x30420200, 0x50400036, 0x3107ffff, 0x9742010e, 0x30e6fffb, 0x3c038000,
-        0x24420004, 0x3045ffff, 0x8f4201b8, 0x00431024, 0x1440fffd, 0x24020003,
-        0xa342018b, 0x8f840004, 0x24020180, 0x24030002, 0xaf420180, 0xa743018c,
-        0x10800005, 0xa745018e, 0x9743011c, 0x9742011e, 0x0a000153, 0x00021400,
-        0x9743011e, 0x9742011c, 0x00021400, 0x00621825, 0xaf4301a8, 0x8f84000c,
-        0x30828000, 0x1040000c, 0xa7460188, 0x93420116, 0x304200fc, 0x005a1021,
-        0x24424004, 0x8c430000, 0x3063ffff, 0x14600004, 0x3c02ffff, 0x34427fff,
-        0x00821024, 0xaf82000c, 0x9782000e, 0x9743010c, 0x8f440104, 0x3042bfff,
-        0x00031c00, 0x3084ffff, 0x00641825, 0xa74201a6, 0xaf4301ac, 0x3c021000,
-        0xaf4201b8, 0x3107ffff, 0x8f820000, 0x3c068000, 0x9743010e, 0x00021442,
-        0x30440780, 0x24630004, 0x3065ffff, 0x8f4201b8, 0x00461024, 0x1440fffd,
-        0x24020003, 0xa342018b, 0x8f830004, 0x24020002, 0xaf440180, 0xa742018c,
-        0x10600005, 0xa745018e, 0x9743011c, 0x9742011e, 0x0a000189, 0x00021400,
-        0x9743011e, 0x9742011c, 0x00021400, 0x00621825, 0xaf4301a8, 0x8f84000c,
+        0x3c020800, 0x24425680, 0x00051942, 0x00031880, 0x00621821, 0x30a5001f,
+        0x8c640000, 0x24020001, 0x00a21004, 0x00822024, 0x01244825, 0x11200039,
+        0x3c021000, 0x9742010e, 0x34e70002, 0x3c038000, 0x24420004, 0x3046ffff,
+        0x8f4201b8, 0x00431024, 0x1440fffd, 0x24020003, 0xa342018b, 0x97840006,
+        0x8f85000c, 0x24020180, 0x24030002, 0xaf420180, 0xa743018c, 0xa746018e,
+        0x10a00005, 0xa7440190, 0x9743011c, 0x9742011e, 0x0a000d41, 0x00021400,
+        0x9743011e, 0x9742011c, 0x00021400, 0x00621825, 0xaf4301a8, 0x8f840010,
         0x30828000, 0x1040000c, 0xa7470188, 0x93420116, 0x304200fc, 0x005a1021,
         0x24424004, 0x8c430000, 0x3063ffff, 0x14600004, 0x3c02ffff, 0x34427fff,
-        0x00821024, 0xaf82000c, 0x9782000e, 0x9743010c, 0x8f440104, 0x3042bfff,
+        0x00821024, 0xaf820010, 0x97820012, 0x9743010c, 0x8f440104, 0x3042bfff,
         0x00031c00, 0x3084ffff, 0x00641825, 0xa74201a6, 0xaf4301ac, 0x3c021000,
-        0xaf4201b8, 0x03e00008, 0x00001021, 0x8f424000, 0x30420100, 0x104000ef,
-        0x3c020800, 0x8c440024, 0x24030001, 0x14830036, 0x00404021, 0x9742010e,
-        0x34e50002, 0x3c038000, 0x24420004, 0x3044ffff, 0x8f4201b8, 0x00431024,
-        0x1440fffd, 0x24020003, 0xa342018b, 0x8f830004, 0x24020002, 0xaf400180,
-        0xa742018c, 0x10600005, 0xa744018e, 0x9743011c, 0x9742011e, 0x0a0001c6,
+        0xaf4201b8, 0x03e00008, 0x00001021, 0x00c21024, 0x104000e3, 0x3c020800,
+        0x8c430030, 0x10600040, 0x31024000, 0x1040003e, 0x3c030f00, 0x00c31824,
+        0x3c020100, 0x0043102b, 0x1440003a, 0x3c030800, 0x9742010e, 0x34e70002,
+        0x3c038000, 0x24420004, 0x3046ffff, 0x8f4201b8, 0x00431024, 0x1440fffd,
+        0x24020003, 0xa342018b, 0x97840006, 0x8f85000c, 0x24020080, 0x24030002,
+        0xaf420180, 0xa743018c, 0xa746018e, 0x10a00005, 0xa7440190, 0x9743011c,
+        0x9742011e, 0x0a000d86, 0x00021400, 0x9743011e, 0x9742011c, 0x00021400,
+        0x00621825, 0xaf4301a8, 0x8f840010, 0x30828000, 0x1040000c, 0xa7470188,
+        0x93420116, 0x304200fc, 0x005a1021, 0x24424004, 0x8c430000, 0x3063ffff,
+        0x14600004, 0x3c02ffff, 0x34427fff, 0x00821024, 0xaf820010, 0x97820012,
+        0x9743010c, 0x8f440104, 0x3042bfff, 0x00031c00, 0x3084ffff, 0x00641825,
+        0xa74201a6, 0xaf4301ac, 0x3c021000, 0xaf4201b8, 0x03e00008, 0x00001021,
+        0x3c030800, 0x8c620024, 0x30420008, 0x1040003e, 0x34e80002, 0x3c020f00,
+        0x00c21024, 0x1440003b, 0x8d620034, 0x31420200, 0x10400038, 0x8d620034,
+        0x9742010e, 0x30e7fffb, 0x3c038000, 0x24420004, 0x3046ffff, 0x8f4201b8,
+        0x00431024, 0x1440fffd, 0x24020003, 0xa342018b, 0x97840006, 0x8f85000c,
+        0x24020180, 0x24030002, 0xaf420180, 0xa743018c, 0xa746018e, 0x10a00005,
+        0xa7440190, 0x9743011c, 0x9742011e, 0x0a000dca, 0x00021400, 0x9743011e,
+        0x9742011c, 0x00021400, 0x00621825, 0xaf4301a8, 0x8f840010, 0x30828000,
+        0x1040000c, 0xa7470188, 0x93420116, 0x304200fc, 0x005a1021, 0x24424004,
+        0x8c430000, 0x3063ffff, 0x14600004, 0x3c02ffff, 0x34427fff, 0x00821024,
+        0xaf820010, 0x97820012, 0x9743010c, 0x8f440104, 0x3042bfff, 0x00031c00,
+        0x3084ffff, 0x00641825, 0xa74201a6, 0xaf4301ac, 0x3c021000, 0xaf4201b8,
+        0x8d620034, 0x8f860004, 0x1040001a, 0x30c20100, 0x10400018, 0x3c020f00,
+        0x00c21024, 0x3c030200, 0x10430014, 0x00000000, 0x8f82000c, 0x10400004,
+        0x00000000, 0x9742011c, 0x0a000df8, 0x3044ffff, 0x9742011e, 0x3044ffff,
+        0x3c030800, 0x8c620038, 0x3c030800, 0x2463003c, 0x2442ffff, 0x00822024,
+        0x00831821, 0x90620000, 0x24420004, 0x0a000e0d, 0x000229c0, 0x00000000,
+        0x00061602, 0x3042000f, 0x000229c0, 0x3c04fc00, 0x00441021, 0x3c030300,
+        0x0062182b, 0x50600001, 0x24050800, 0x9742010e, 0x3107ffff, 0x3c038000,
+        0x24420004, 0x3046ffff, 0x8f4201b8, 0x00431024, 0x1440fffd, 0x24020003,
+        0xa342018b, 0x97830006, 0x8f84000c, 0x24020002, 0xaf450180, 0xa742018c,
+        0xa746018e, 0x10800005, 0xa7430190, 0x9743011c, 0x9742011e, 0x0a000e26,
         0x00021400, 0x9743011e, 0x9742011c, 0x00021400, 0x00621825, 0xaf4301a8,
-        0x8f84000c, 0x30828000, 0x1040000c, 0xa7450188, 0x93420116, 0x304200fc,
+        0x8f840010, 0x30828000, 0x1040000c, 0xa7470188, 0x93420116, 0x304200fc,
         0x005a1021, 0x24424004, 0x8c430000, 0x3063ffff, 0x14600004, 0x3c02ffff,
-        0x34427fff, 0x00821024, 0xaf82000c, 0x9782000e, 0x9743010c, 0x8f440104,
+        0x34427fff, 0x00821024, 0xaf820010, 0x97820012, 0x9743010c, 0x8f440104,
         0x3042bfff, 0x00031c00, 0x3084ffff, 0x00641825, 0xa74201a6, 0xaf4301ac,
-        0x3c021000, 0xaf4201b8, 0x03e00008, 0x00001021, 0x30820001, 0x10400035,
-        0x30e90004, 0x9742010e, 0x30e6fffb, 0x3c038000, 0x24420004, 0x3044ffff,
-        0x8f4201b8, 0x00431024, 0x1440fffd, 0x24020003, 0xa342018b, 0x8f830004,
-        0x24020002, 0xaf400180, 0xa742018c, 0x10600005, 0xa744018e, 0x9743011c,
-        0x9742011e, 0x0a0001fe, 0x00021400, 0x9743011e, 0x9742011c, 0x00021400,
-        0x00621825, 0xaf4301a8, 0x8f84000c, 0x30828000, 0x1040000c, 0xa7470188,
-        0x93420116, 0x304200fc, 0x005a1021, 0x24424004, 0x8c430000, 0x3063ffff,
-        0x14600004, 0x3c02ffff, 0x34427fff, 0x00821024, 0xaf82000c, 0x9782000e,
-        0x9743010c, 0x8f440104, 0x3042bfff, 0x00031c00, 0x3084ffff, 0x00641825,
-        0xa74201a6, 0xaf4301ac, 0x3c021000, 0xaf4201b8, 0x30c7ffff, 0x8d020024,
-        0x30420004, 0x10400037, 0x8d020024, 0x9742010e, 0x30e6fffb, 0x3c038000,
-        0x24420004, 0x3045ffff, 0x8f4201b8, 0x00431024, 0x1440fffd, 0x24020003,
-        0xa342018b, 0x8f840004, 0x24020100, 0x24030002, 0xaf420180, 0xa743018c,
-        0x10800005, 0xa745018e, 0x9743011c, 0x9742011e, 0x0a000237, 0x00021400,
-        0x9743011e, 0x9742011c, 0x00021400, 0x00621825, 0xaf4301a8, 0x8f84000c,
-        0x30828000, 0x1040000c, 0xa7470188, 0x93420116, 0x304200fc, 0x005a1021,
-        0x24424004, 0x8c430000, 0x3063ffff, 0x14600004, 0x3c02ffff, 0x34427fff,
-        0x00821024, 0xaf82000c, 0x9782000e, 0x9743010c, 0x8f440104, 0x3042bfff,
-        0x00031c00, 0x3084ffff, 0x00641825, 0xa74201a6, 0xaf4301ac, 0x3c021000,
-        0xaf4201b8, 0x30c7ffff, 0x8d020024, 0x30420008, 0x10400034, 0x00000000,
-        0x9742010e, 0x3c038000, 0x24420004, 0x3045ffff, 0x8f4201b8, 0x00431024,
-        0x1440fffd, 0x24020003, 0xa342018b, 0x8f840004, 0x24020180, 0x24030002,
-        0xaf420180, 0xa743018c, 0x10800005, 0xa745018e, 0x9743011c, 0x9742011e,
-        0x0a00026f, 0x00021400, 0x9743011e, 0x9742011c, 0x00021400, 0x00621825,
-        0xaf4301a8, 0x8f84000c, 0x30828000, 0x1040000c, 0xa7470188, 0x93420116,
+        0x3c021000, 0xaf4201b8, 0x03e00008, 0x00001021, 0x8f424000, 0x30420100,
+        0x104000f9, 0x3c020800, 0x8c440024, 0x24030001, 0x14830038, 0x00404821,
+        0x9742010e, 0x34e60002, 0x3c038000, 0x24420004, 0x3045ffff, 0x8f4201b8,
+        0x00431024, 0x1440fffd, 0x24020003, 0xa342018b, 0x97830006, 0x8f84000c,
+        0x24020002, 0xaf400180, 0xa742018c, 0xa745018e, 0x10800005, 0xa7430190,
+        0x9743011c, 0x9742011e, 0x0a000e65, 0x00021400, 0x9743011e, 0x9742011c,
+        0x00021400, 0x00621825, 0xaf4301a8, 0x8f840010, 0x30828000, 0x1040000c,
+        0xa7460188, 0x93420116, 0x304200fc, 0x005a1021, 0x24424004, 0x8c430000,
+        0x3063ffff, 0x14600004, 0x3c02ffff, 0x34427fff, 0x00821024, 0xaf820010,
+        0x97820012, 0x9743010c, 0x8f440104, 0x3042bfff, 0x00031c00, 0x3084ffff,
+        0x00641825, 0xa74201a6, 0xaf4301ac, 0x3c021000, 0xaf4201b8, 0x03e00008,
+        0x00001021, 0x30820001, 0x10400037, 0x30ea0004, 0x9742010e, 0x30e8fffb,
+        0x3c038000, 0x24420004, 0x3045ffff, 0x8f4201b8, 0x00431024, 0x1440fffd,
+        0x24020003, 0xa342018b, 0x97830006, 0x8f84000c, 0x24020002, 0xaf400180,
+        0xa742018c, 0xa745018e, 0x10800005, 0xa7430190, 0x9743011c, 0x9742011e,
+        0x0a000e9f, 0x00021400, 0x9743011e, 0x9742011c, 0x00021400, 0x00621825,
+        0xaf4301a8, 0x8f840010, 0x30828000, 0x1040000c, 0xa7470188, 0x93420116,
         0x304200fc, 0x005a1021, 0x24424004, 0x8c430000, 0x3063ffff, 0x14600004,
-        0x3c02ffff, 0x34427fff, 0x00821024, 0xaf82000c, 0x9782000e, 0x9743010c,
+        0x3c02ffff, 0x34427fff, 0x00821024, 0xaf820010, 0x97820012, 0x9743010c,
         0x8f440104, 0x3042bfff, 0x00031c00, 0x3084ffff, 0x00641825, 0xa74201a6,
-        0xaf4301ac, 0x3c021000, 0xaf4201b8, 0x15200046, 0x00001021, 0x3c038000,
-        0x8f4201b8, 0x00431024, 0x1440fffd, 0x24020002, 0x24032000, 0xa342018b,
-        0xa7430188, 0x3c021000, 0xaf4201b8, 0x03e00008, 0x00001021, 0x3c030800,
-        0x8c620024, 0x30420001, 0x10400035, 0x00001021, 0x9742010e, 0x34e50002,
-        0x3c038000, 0x24420004, 0x3044ffff, 0x8f4201b8, 0x00431024, 0x1440fffd,
-        0x24020003, 0xa342018b, 0x8f830004, 0x24020002, 0xaf400180, 0xa742018c,
-        0x10600005, 0xa744018e, 0x9743011c, 0x9742011e, 0x0a0002b5, 0x00021400,
-        0x9743011e, 0x9742011c, 0x00021400, 0x00621825, 0xaf4301a8, 0x8f84000c,
-        0x30828000, 0x1040000c, 0xa7450188, 0x93420116, 0x304200fc, 0x005a1021,
-        0x24424004, 0x8c430000, 0x3063ffff, 0x14600004, 0x3c02ffff, 0x34427fff,
-        0x00821024, 0xaf82000c, 0x9782000e, 0x9743010c, 0x8f440104, 0x3042bfff,
-        0x00031c00, 0x3084ffff, 0x00641825, 0xa74201a6, 0xaf4301ac, 0x3c021000,
-        0xaf4201b8, 0x00001021, 0x03e00008, 0x00000000, 0x27bdffe0, 0xafbf0018,
-        0xafb10014, 0xafb00010, 0x8f420140, 0xaf420020, 0x8f430148, 0x3c027000,
-        0x00621824, 0x3c024000, 0x1062000c, 0x0043102b, 0x14400006, 0x3c025000,
-        0x3c023000, 0x1062000b, 0x3c024000, 0x0a00031f, 0x00000000, 0x10620034,
-        0x3c024000, 0x0a00031f, 0x00000000, 0x0e00067c, 0x00000000, 0x0a00031f,
+        0xaf4301ac, 0x3c021000, 0xaf4201b8, 0x3107ffff, 0x8d220024, 0x30420004,
+        0x10400039, 0x8d220024, 0x9742010e, 0x30e8fffb, 0x3c038000, 0x24420004,
+        0x3046ffff, 0x8f4201b8, 0x00431024, 0x1440fffd, 0x24020003, 0xa342018b,
+        0x97840006, 0x8f85000c, 0x24020100, 0x24030002, 0xaf420180, 0xa743018c,
+        0xa746018e, 0x10a00005, 0xa7440190, 0x9743011c, 0x9742011e, 0x0a000eda,
+        0x00021400, 0x9743011e, 0x9742011c, 0x00021400, 0x00621825, 0xaf4301a8,
+        0x8f840010, 0x30828000, 0x1040000c, 0xa7470188, 0x93420116, 0x304200fc,
+        0x005a1021, 0x24424004, 0x8c430000, 0x3063ffff, 0x14600004, 0x3c02ffff,
+        0x34427fff, 0x00821024, 0xaf820010, 0x97820012, 0x9743010c, 0x8f440104,
+        0x3042bfff, 0x00031c00, 0x3084ffff, 0x00641825, 0xa74201a6, 0xaf4301ac,
+        0x3c021000, 0xaf4201b8, 0x3107ffff, 0x8d220024, 0x30420008, 0x10400036,
+        0x00000000, 0x9742010e, 0x3c038000, 0x24420004, 0x3046ffff, 0x8f4201b8,
+        0x00431024, 0x1440fffd, 0x24020003, 0xa342018b, 0x97840006, 0x8f85000c,
+        0x24020180, 0x24030002, 0xaf420180, 0xa743018c, 0xa746018e, 0x10a00005,
+        0xa7440190, 0x9743011c, 0x9742011e, 0x0a000f14, 0x00021400, 0x9743011e,
+        0x9742011c, 0x00021400, 0x00621825, 0xaf4301a8, 0x8f840010, 0x30828000,
+        0x1040000c, 0xa7470188, 0x93420116, 0x304200fc, 0x005a1021, 0x24424004,
+        0x8c430000, 0x3063ffff, 0x14600004, 0x3c02ffff, 0x34427fff, 0x00821024,
+        0xaf820010, 0x97820012, 0x9743010c, 0x8f440104, 0x3042bfff, 0x00031c00,
+        0x3084ffff, 0x00641825, 0xa74201a6, 0xaf4301ac, 0x3c021000, 0xaf4201b8,
+        0x1540004a, 0x00001021, 0x27440180, 0x3c038000, 0x8f4201b8, 0x00431024,
+        0x1440fffd, 0x24022000, 0x24030002, 0xa4820008, 0xa083000b, 0xa4800010,
+        0x3c021000, 0xaf4201b8, 0x03e00008, 0x00001021, 0x3c030800, 0x8c620024,
+        0x30420001, 0x10400037, 0x00001021, 0x9742010e, 0x34e60002, 0x3c038000,
+        0x24420004, 0x3045ffff, 0x8f4201b8, 0x00431024, 0x1440fffd, 0x24020003,
+        0xa342018b, 0x97830006, 0x8f84000c, 0x24020002, 0xaf400180, 0xa742018c,
+        0xa745018e, 0x10800005, 0xa7430190, 0x9743011c, 0x9742011e, 0x0a000f5e,
+        0x00021400, 0x9743011e, 0x9742011c, 0x00021400, 0x00621825, 0xaf4301a8,
+        0x8f840010, 0x30828000, 0x1040000c, 0xa7460188, 0x93420116, 0x304200fc,
+        0x005a1021, 0x24424004, 0x8c430000, 0x3063ffff, 0x14600004, 0x3c02ffff,
+        0x34427fff, 0x00821024, 0xaf820010, 0x97820012, 0x9743010c, 0x8f440104,
+        0x3042bfff, 0x00031c00, 0x3084ffff, 0x00641825, 0xa74201a6, 0xaf4301ac,
+        0x3c021000, 0xaf4201b8, 0x00001021, 0x03e00008, 0x00000000, 0x27bdffe8,
+        0xafbf0010, 0x8f460128, 0x8f84000c, 0xaf460020, 0x8f450104, 0x8f420100,
+        0x24030800, 0xaf850004, 0xaf820010, 0xaf4301b8, 0x1080000a, 0x3c020800,
+        0x8c430034, 0x10600007, 0x30a22000, 0x10400005, 0x34a30100, 0x8f820008,
+        0xaf830004, 0x24420001, 0xaf820008, 0x3c020800, 0x8c4300c0, 0x10600006,
+        0x3c030800, 0x8c6200c4, 0x24040001, 0x24420001, 0x0a000fc0, 0xac6200c4,
+        0x8f820004, 0x3c030010, 0x00431024, 0x14400009, 0x3c02001f, 0x3c030800,
+        0x8c620020, 0x00002021, 0x24420001, 0x0e000c99, 0xac620020, 0x0a000fc0,
+        0x00402021, 0x3442ff00, 0x14c20009, 0x2403bfff, 0x3c030800, 0x8c620020,
+        0x24040001, 0x24420001, 0x0e000c99, 0xac620020, 0x0a000fc0, 0x00402021,
+        0x8f820010, 0x00431024, 0x14400006, 0x00000000, 0xaf400048, 0x0e001144,
+        0xaf400040, 0x0a000fc0, 0x00402021, 0x0e0014c9, 0x00000000, 0x00402021,
+        0x10800005, 0x3c024000, 0x8f430124, 0x3c026020, 0xac430014, 0x3c024000,
+        0xaf420138, 0x00000000, 0x8fbf0010, 0x03e00008, 0x27bd0018, 0x27bdffe0,
+        0xafbf0018, 0xafb10014, 0xafb00010, 0x8f420140, 0xaf420020, 0x8f430148,
+        0x3c027000, 0x00621824, 0x3c023000, 0x10620021, 0x0043102b, 0x14400006,
+        0x3c024000, 0x3c022000, 0x10620009, 0x3c024000, 0x0a00102b, 0x00000000,
+        0x10620045, 0x3c025000, 0x10620047, 0x3c024000, 0x0a00102b, 0x00000000,
+        0x27440180, 0x3c038000, 0x8f4201b8, 0x00431024, 0x1440fffd, 0x00000000,
+        0x8f420148, 0x24030002, 0xa083000b, 0x00021402, 0xa4820008, 0x8f430148,
+        0xa4830010, 0x8f420144, 0x3c031000, 0xac820024, 0xaf4301b8, 0x0a00102b,
         0x3c024000, 0x8f420148, 0x24030002, 0x3044ffff, 0x00021402, 0x305000ff,
         0x1203000c, 0x27510180, 0x2a020003, 0x10400005, 0x24020003, 0x0600001d,
-        0x36053000, 0x0a00030a, 0x3c038000, 0x12020007, 0x00000000, 0x0a000317,
-        0x00000000, 0x0e000423, 0x00000000, 0x0a000308, 0x00402021, 0x0e000435,
+        0x36053000, 0x0a001012, 0x3c038000, 0x12020007, 0x00000000, 0x0a00101f,
+        0x00000000, 0x0e00111f, 0x00000000, 0x0a001010, 0x00402021, 0x0e001131,
         0x00000000, 0x00402021, 0x36053000, 0x3c038000, 0x8f4201b8, 0x00431024,
         0x1440fffd, 0x24020002, 0xa6250008, 0xa222000b, 0xa6240010, 0x8f420144,
-        0x3c031000, 0xae220024, 0xaf4301b8, 0x0a00031f, 0x3c024000, 0x0000000d,
-        0x00000000, 0x240001c3, 0x0a00031f, 0x3c024000, 0x0e0007f7, 0x00000000,
-        0x3c024000, 0xaf420178, 0x00000000, 0x8fbf0018, 0x8fb10014, 0x8fb00010,
-        0x03e00008, 0x27bd0020, 0x24020800, 0x03e00008, 0xaf4201b8, 0x27bdffe8,
-        0x3c04600c, 0xafbf0014, 0xafb00010, 0x8c825000, 0x3c1a8000, 0x2403ff7f,
-        0x3c106000, 0x00431024, 0x3442380c, 0x24030003, 0xac825000, 0x3c040008,
-        0xaf430008, 0x8e020808, 0x3c030800, 0xac600020, 0x3042fff0, 0x2c420001,
-        0xaf820004, 0x0e000819, 0x0344d825, 0x0e000781, 0x00000000, 0x3c020400,
-        0x3442000c, 0x3c03ffff, 0x34630806, 0xae021948, 0xae03194c, 0x8e021980,
-        0x34420200, 0xae021980, 0x8f500000, 0x32020003, 0x1040fffd, 0x32020001,
-        0x10400004, 0x32020002, 0x0e0003bd, 0x00000000, 0x32020002, 0x1040fff6,
-        0x00000000, 0x0e0002d4, 0x00000000, 0x0a00034a, 0x00000000, 0x27bdffe8,
-        0x3c04600c, 0xafbf0014, 0xafb00010, 0x8c825000, 0x3c1a8000, 0x2403ff7f,
-        0x3c106000, 0x00431024, 0x3442380c, 0x24030003, 0xac825000, 0x3c040008,
-        0xaf430008, 0x8e020808, 0x3c030800, 0xac600020, 0x3042fff0, 0x2c420001,
-        0xaf820004, 0x0e000819, 0x0344d825, 0x0e000781, 0x00000000, 0x3c020400,
-        0x3442000c, 0x3c03ffff, 0x34630806, 0xae021948, 0xae03194c, 0x8e021980,
-        0x8fbf0014, 0x34420200, 0xae021980, 0x8fb00010, 0x03e00008, 0x27bd0018,
-        0x30a5ffff, 0x30c6ffff, 0x30e7ffff, 0x3c038000, 0x8f4201b8, 0x00431024,
-        0x1440fffd, 0x24020003, 0xa342018b, 0x8f830004, 0xaf440180, 0xa745018c,
-        0x10600005, 0xa746018e, 0x9743011c, 0x9742011e, 0x0a000393, 0x00021400,
-        0x9743011e, 0x9742011c, 0x00021400, 0x00621825, 0xaf4301a8, 0x8f84000c,
+        0x3c031000, 0xae220024, 0xaf4301b8, 0x0a00102b, 0x3c024000, 0x0000000d,
+        0x00000000, 0x24000295, 0x0a00102b, 0x3c024000, 0x0e0013a7, 0x00000000,
+        0x0a00102b, 0x3c024000, 0x0e001552, 0x00000000, 0x3c024000, 0xaf420178,
+        0x00000000, 0x8fbf0018, 0x8fb10014, 0x8fb00010, 0x03e00008, 0x27bd0020,
+        0x24020800, 0x03e00008, 0xaf4201b8, 0x27bdffe8, 0x3c04600c, 0xafbf0014,
+        0xafb00010, 0x8c825000, 0x3c1a8000, 0x2403ff7f, 0x3c106000, 0x00431024,
+        0x3442380c, 0x24030003, 0xac825000, 0x3c020008, 0xaf430008, 0x8e040808,
+        0x0342d825, 0x8e020808, 0x3c030800, 0xac600020, 0x3084fff0, 0x2c840001,
+        0x3042fff0, 0x38420010, 0x2c420001, 0xaf84000c, 0xaf820000, 0x0e001574,
+        0x00000000, 0x0e0014c7, 0x00000000, 0x3c020400, 0x3442000c, 0x3c03ffff,
+        0x34630806, 0xae021948, 0xae03194c, 0x8e021980, 0x34420200, 0xae021980,
+        0x8f500000, 0x32020003, 0x1040fffd, 0x32020001, 0x10400004, 0x32020002,
+        0x0e000f7d, 0x00000000, 0x32020002, 0x1040fff6, 0x00000000, 0x0e000fcb,
+        0x00000000, 0x0a00105c, 0x00000000, 0x27bdffe8, 0x3c04600c, 0xafbf0014,
+        0xafb00010, 0x8c825000, 0x3c1a8000, 0x2403ff7f, 0x3c106000, 0x00431024,
+        0x3442380c, 0x24030003, 0xac825000, 0x3c020008, 0xaf430008, 0x8e040808,
+        0x0342d825, 0x8e020808, 0x3c030800, 0xac600020, 0x3084fff0, 0x2c840001,
+        0x3042fff0, 0x38420010, 0x2c420001, 0xaf84000c, 0xaf820000, 0x0e001574,
+        0x00000000, 0x0e0014c7, 0x00000000, 0x3c020400, 0x3442000c, 0x3c03ffff,
+        0x34630806, 0xae021948, 0xae03194c, 0x8e021980, 0x8fbf0014, 0x34420200,
+        0xae021980, 0x8fb00010, 0x03e00008, 0x27bd0018, 0x30a5ffff, 0x30c6ffff,
+        0x30e7ffff, 0x3c038000, 0x8f4201b8, 0x00431024, 0x1440fffd, 0x24020003,
+        0xa342018b, 0x97830006, 0x8f82000c, 0xaf440180, 0xa745018c, 0xa746018e,
+        0x10400005, 0xa7430190, 0x9743011c, 0x9742011e, 0x0a0010ad, 0x00021400,
+        0x9743011e, 0x9742011c, 0x00021400, 0x00621825, 0xaf4301a8, 0x8f840010,
         0x30828000, 0x1040000c, 0xa7470188, 0x93420116, 0x304200fc, 0x005a1021,
         0x24424004, 0x8c430000, 0x3063ffff, 0x14600004, 0x3c02ffff, 0x34427fff,
-        0x00821024, 0xaf82000c, 0x9782000e, 0x9743010c, 0x8f440104, 0x3042bfff,
+        0x00821024, 0xaf820010, 0x97820012, 0x9743010c, 0x8f440104, 0x3042bfff,
         0x00031c00, 0x3084ffff, 0x00641825, 0xa74201a6, 0xaf4301ac, 0x3c021000,
-        0xaf4201b8, 0x03e00008, 0x00000000, 0x3c038000, 0x8f4201b8, 0x00431024,
-        0x1440fffd, 0x24020002, 0x24032000, 0xa342018b, 0xa7430188, 0x3c021000,
-        0xaf4201b8, 0x03e00008, 0x00000000, 0x27bdffe8, 0xafbf0010, 0x8f460128,
-        0xaf460020, 0x8f420104, 0x8f450100, 0x24030800, 0x3c040010, 0xaf820000,
-        0x00441024, 0xaf85000c, 0xaf4301b8, 0x14400005, 0x3c02001f, 0x3c030800,
-        0x8c620020, 0x0a0003d5, 0x00002021, 0x3442ff00, 0x14c20009, 0x2402bfff,
-        0x3c030800, 0x8c620020, 0x24040001, 0x24420001, 0x0e00004c, 0xac620020,
-        0x0a0003e4, 0x00000000, 0x00a21024, 0x14400006, 0x00000000, 0xaf400048,
-        0x0e000448, 0xaf400040, 0x0a0003e4, 0x00000000, 0x0e000783, 0x00000000,
-        0x10400005, 0x3c024000, 0x8f430124, 0x3c026020, 0xac430014, 0x3c024000,
-        0xaf420138, 0x00000000, 0x8fbf0010, 0x03e00008, 0x27bd0018, 0x27bdffe0,
+        0xaf4201b8, 0x03e00008, 0x00000000, 0x27440180, 0x3c038000, 0x8f4201b8,
+        0x00431024, 0x1440fffd, 0x24022000, 0x24030002, 0xa4820008, 0xa083000b,
+        0xa4800010, 0x3c021000, 0xaf4201b8, 0x03e00008, 0x00000000, 0x27440180,
+        0x3c038000, 0x8f4201b8, 0x00431024, 0x1440fffd, 0x00000000, 0x8f420148,
+        0x24030002, 0xa083000b, 0x00021402, 0xa4820008, 0x8f430148, 0xa4830010,
+        0x8f420144, 0x3c031000, 0xac820024, 0x03e00008, 0xaf4301b8, 0x27bdffe0,
         0xafbf0018, 0xafb10014, 0xafb00010, 0x8f420148, 0x24030002, 0x3044ffff,
         0x00021402, 0x305000ff, 0x1203000c, 0x27510180, 0x2a020003, 0x10400005,
-        0x24020003, 0x0600001d, 0x36053000, 0x0a00040e, 0x3c038000, 0x12020007,
-        0x00000000, 0x0a00041b, 0x00000000, 0x0e000423, 0x00000000, 0x0a00040c,
-        0x00402021, 0x0e000435, 0x00000000, 0x00402021, 0x36053000, 0x3c038000,
+        0x24020003, 0x0600001d, 0x36053000, 0x0a00110a, 0x3c038000, 0x12020007,
+        0x00000000, 0x0a001117, 0x00000000, 0x0e00111f, 0x00000000, 0x0a001108,
+        0x00402021, 0x0e001131, 0x00000000, 0x00402021, 0x36053000, 0x3c038000,
         0x8f4201b8, 0x00431024, 0x1440fffd, 0x24020002, 0xa6250008, 0xa222000b,
-        0xa6240010, 0x8f420144, 0x3c031000, 0xae220024, 0xaf4301b8, 0x0a00041f,
-        0x8fbf0018, 0x0000000d, 0x00000000, 0x240001c3, 0x8fbf0018, 0x8fb10014,
+        0xa6240010, 0x8f420144, 0x3c031000, 0xae220024, 0xaf4301b8, 0x0a00111b,
+        0x8fbf0018, 0x0000000d, 0x00000000, 0x24000295, 0x8fbf0018, 0x8fb10014,
         0x8fb00010, 0x03e00008, 0x27bd0020, 0x3084ffff, 0x2c821389, 0x1040000d,
-        0x00001021, 0x3c030800, 0x24632100, 0x00042942, 0x00052880, 0x00a32821,
+        0x00001021, 0x3c030800, 0x24635680, 0x00042942, 0x00052880, 0x00a32821,
         0x3086001f, 0x8ca40000, 0x24030001, 0x00c31804, 0x00832025, 0x03e00008,
         0xaca40000, 0x03e00008, 0x24020091, 0x3084ffff, 0x2c821389, 0x1040000e,
-        0x00001021, 0x3c030800, 0x24632100, 0x00042942, 0x00052880, 0x00a32821,
+        0x00001021, 0x3c030800, 0x24635680, 0x00042942, 0x00052880, 0x00a32821,
         0x3086001f, 0x24030001, 0x8ca40000, 0x00c31804, 0x00031827, 0x00832024,
-        0x03e00008, 0xaca40000, 0x03e00008, 0x24020091, 0x27bdffb0, 0x3c026000,
-        0xafbf0048, 0x8c434448, 0xaf630140, 0x93620005, 0x30420001, 0x14400005,
-        0x00000000, 0x0e0007ed, 0x00000000, 0x0a00067a, 0x8fbf0048, 0x93420116,
-        0x93430112, 0x8f430104, 0x3c040020, 0x34424000, 0x00641824, 0x1060000d,
-        0x03426021, 0x8f430128, 0x27420180, 0xac430000, 0x8f650040, 0x24040008,
-        0x240340c1, 0xa4430008, 0x24030002, 0xa043000b, 0x3c031000, 0x0a000563,
-        0xa044000a, 0x8f420104, 0x3c030040, 0x00431024, 0x10400007, 0x00000000,
-        0x8f430128, 0x27420180, 0xac430000, 0x8f650040, 0x0a00055c, 0x24040010,
-        0xaf400048, 0xaf400054, 0xaf400040, 0x8f630048, 0x8f620040, 0x00624823,
-        0x05210004, 0x00000000, 0x0000000d, 0x00000000, 0x24000132, 0x9742011a,
-        0x3046ffff, 0x10c00004, 0x8d880004, 0x01061021, 0x0a000487, 0x2445ffff,
-        0x01002821, 0x918a000d, 0xa7a00020, 0xafa00028, 0x9364003f, 0x3c026000,
-        0x8c434448, 0x308700ff, 0x31420004, 0x10400033, 0xaf630144, 0x24090012,
-        0x14e90006, 0x3c040800, 0x8c830028, 0x24020001, 0x24630001, 0x0a00054e,
-        0xac830028, 0x8f620044, 0x15020012, 0x97a20020, 0x27a60010, 0x27450180,
-        0x3442001a, 0xa7a20020, 0x8f630040, 0x3c048000, 0x24020020, 0xa3a70022,
-        0xa3a90023, 0xa3a2001a, 0xafa30028, 0x8f4201b8, 0x00441024, 0x1440fffd,
-        0x00000000, 0x0a000533, 0x00000000, 0x8f620044, 0x01021023, 0x0440009e,
-        0x24020001, 0x8f620048, 0x01021023, 0x0441009a, 0x24020001, 0x97a20020,
-        0x27a60010, 0x34420001, 0xa7a20020, 0x8f630040, 0x27450180, 0x3c048000,
-        0xafa30028, 0x8f4201b8, 0x00441024, 0x1440fffd, 0x00000000, 0x0a000533,
-        0x00000000, 0x3c026000, 0x8c424448, 0xaf620148, 0x8f630040, 0x00685823,
-        0x19600013, 0x00cb102a, 0x54400007, 0x314a00fe, 0x5566000c, 0x010b4021,
-        0x31420001, 0x54400009, 0x010b4021, 0x314a00fe, 0x24020001, 0xa7a20020,
-        0x8f630040, 0x00c05821, 0x00003021, 0x0a0004dd, 0xafa30028, 0x00cb1023,
-        0x0a0004dd, 0x3046ffff, 0x00005821, 0x8f620048, 0x2442ffff, 0x00a21823,
-        0x18600019, 0x0066102a, 0x14400013, 0x24020001, 0xa7a20020, 0x8f630040,
-        0xafa30028, 0x8f620040, 0x55020005, 0x27a60010, 0x55200003, 0x27a60010,
-        0x0a0004f6, 0x00c01821, 0x27450180, 0x3c038000, 0x8f4201b8, 0x00431024,
-        0x1440fffd, 0x00000000, 0x0a000533, 0x00000000, 0x8f650048, 0x00c31023,
-        0x3046ffff, 0x314a00f6, 0x3c046000, 0x8c824448, 0x31430002, 0x1060001e,
-        0xaf62014c, 0x8f620044, 0x1502000e, 0x97a20020, 0x27a60010, 0x34420200,
-        0xa7a20020, 0x8f630040, 0x27450180, 0x3c048000, 0xafa30028, 0x8f4201b8,
-        0x00441024, 0x1440fffd, 0x00000000, 0x0a000533, 0x00000000, 0x27a60010,
-        0x34420001, 0xa7a20020, 0x8f630040, 0x27450180, 0x3c048000, 0xafa30028,
-        0x8f4201b8, 0x00441024, 0x1440fffd, 0x00000000, 0x0a000533, 0x00000000,
-        0x3c026000, 0x8c424448, 0x31430010, 0xaf620150, 0x54600003, 0x8d890008,
-        0x0a00054e, 0x24020001, 0x8f630054, 0x2522ffff, 0x00431023, 0x1840002a,
-        0x24020001, 0x27a60010, 0xa7a20020, 0x8f630040, 0x27450180, 0x3c048000,
-        0xafa30028, 0x8f4201b8, 0x00441024, 0x1440fffd, 0x00000000, 0x8f420128,
-        0xaca20000, 0x8cc30018, 0x240240c1, 0xa4a20008, 0xaca30018, 0x90c4000a,
-        0x24020002, 0xa0a2000b, 0xa0a4000a, 0x94c20010, 0xa4a20010, 0x90c30012,
-        0xa0a30012, 0x90c20013, 0xa0a20013, 0x8cc30014, 0xaca30014, 0x8cc20024,
-        0xaca20024, 0x8cc30028, 0xaca30028, 0x8cc4002c, 0x24020001, 0x3c031000,
-        0xaca4002c, 0xaf4301b8, 0xaf400044, 0xaf400050, 0x0a00067a, 0x8fbf0048,
-        0x3c026000, 0x8c424448, 0x31430020, 0x10600019, 0xaf620154, 0x8f430128,
-        0x27420180, 0xac430000, 0x8f650040, 0x24040004, 0x240340c1, 0xa4430008,
-        0x24030002, 0xa044000a, 0x24040008, 0xa043000b, 0x3c031000, 0xa4440010,
-        0xa0400012, 0xa0400013, 0xac400014, 0xac400024, 0xac400028, 0xac40002c,
-        0xac450018, 0x0e0007ed, 0xaf4301b8, 0x0a00067a, 0x8fbf0048, 0x8f430104,
-        0x8c824448, 0x38e3000a, 0x2c630001, 0xaf620158, 0x38e2000c, 0x2c420001,
-        0x00621825, 0x14600003, 0x2402000e, 0x14e2002a, 0x00000000, 0x50c00008,
-        0x9584000e, 0x10c00004, 0xa7a60040, 0x01061021, 0x0a000583, 0x2445ffff,
-        0x01002821, 0x9584000e, 0x93630035, 0x8f62004c, 0x00642004, 0x00892021,
-        0x00821023, 0x1840001f, 0x3c026000, 0x8f620018, 0x01021023, 0x1c40000f,
-        0x97a20020, 0x8f620018, 0x15020018, 0x3c026000, 0x8f62001c, 0x01221023,
-        0x1c400008, 0x97a20020, 0x8f62001c, 0x15220011, 0x3c026000, 0x8f620058,
-        0x00821023, 0x1840000c, 0x97a20020, 0xafa50028, 0xafa80034, 0xafa90038,
-        0xafa4003c, 0x34420020, 0x0a0005a8, 0xa7a20020, 0x8f680040, 0x00003021,
-        0x8f640058, 0x01002821, 0x3c026000, 0x8c434448, 0xaf63015c, 0x8f62004c,
-        0x01221023, 0x18400009, 0x00000000, 0x8f620054, 0x01221023, 0x1c400005,
-        0x97a20020, 0xafa50028, 0xafa90024, 0x0a0005c3, 0x34420040, 0x9742011a,
-        0x1440000c, 0x24020014, 0x8f620058, 0x14820009, 0x24020014, 0x8f63004c,
-        0x8f620054, 0x10620004, 0x97a20020, 0xafa50028, 0x34420080, 0xa7a20020,
-        0x24020014, 0x10e2000a, 0x28e20015, 0x10400005, 0x2402000c, 0x10e20006,
-        0x3c026000, 0x0a000600, 0x00000000, 0x24020016, 0x14e20031, 0x3c026000,
-        0x8f620054, 0x24420001, 0x1522002d, 0x3c026000, 0x24020014, 0x10e2001e,
-        0x28e20015, 0x10400005, 0x2402000c, 0x10e20008, 0x3c026000, 0x0a000600,
-        0x00000000, 0x24020016, 0x10e2000c, 0x97a20020, 0x0a000600, 0x3c026000,
-        0x97a30020, 0x2402000e, 0xafa50028, 0xa3a70022, 0xa3a20023, 0xafa90024,
-        0x34630054, 0x0a0005ff, 0xa7a30020, 0x24030010, 0x24040002, 0xafa50028,
-        0xa3a70022, 0xa3a30023, 0xa3a4001a, 0xafa90024, 0x0a0005fe, 0x3442005d,
-        0x97a20020, 0x24030012, 0x24040002, 0xafa50028, 0xa3a70022, 0xa3a30023,
-        0xa3a4001a, 0xafa90024, 0x3042fffe, 0x3442005c, 0xa7a20020, 0x3c026000,
-        0x8c434448, 0x31420001, 0xaf630160, 0x1040002c, 0x2402000c, 0x10e20014,
-        0x28e2000d, 0x10400005, 0x2402000a, 0x10e20008, 0x97a20020, 0x0a000631,
-        0x3c026000, 0x2402000e, 0x10e20018, 0x3c026000, 0x0a000631, 0x00000000,
-        0x24030008, 0x24040002, 0xafa50028, 0xa3a70022, 0xa3a30023, 0xa3a4001a,
-        0x0a00062f, 0x34420013, 0x97a30020, 0x30620004, 0x1440000b, 0x97a20020,
-        0x3462001b, 0xa7a20020, 0x24020016, 0x24030002, 0xafa50028, 0xa3a70022,
-        0xa3a20023, 0x0a000630, 0xa3a3001a, 0x97a20020, 0x24030010, 0x24040002,
-        0xafa50028, 0xa3a70022, 0xa3a30023, 0xa3a4001a, 0x3442001b, 0xa7a20020,
-        0x3c026000, 0x8c434448, 0x31420009, 0x0002102b, 0x00021023, 0x30420007,
-        0x34440003, 0xaf630164, 0x10c00016, 0x24030800, 0x8f820010, 0x27450180,
-        0x24420001, 0xaf820010, 0x24020004, 0xaf4301b8, 0xa4a40008, 0xa0a2000b,
-        0x93440120, 0x3c031000, 0xa4a6000e, 0xaca90024, 0xaca80028, 0x008b2021,
-        0xa4a4000c, 0xaf4301b8, 0x97a20020, 0x00003021, 0x3042ffbf, 0x0a000650,
-        0xa7a20020, 0x24060001, 0x3c026000, 0x8c434448, 0xaf630168, 0x97a20020,
-        0x10400020, 0x27450180, 0x3c038000, 0x8f4201b8, 0x00431024, 0x1440fffd,
-        0x00000000, 0x8f420128, 0xaca20000, 0x8fa30028, 0x240240c1, 0xa4a20008,
-        0xaca30018, 0x93a4001a, 0x24020002, 0xa0a2000b, 0xa0a4000a, 0x97a20020,
-        0xa4a20010, 0x93a30022, 0xa0a30012, 0x93a20023, 0xa0a20013, 0x8fa30024,
-        0xaca30014, 0x8fa20034, 0xaca20024, 0x8fa30038, 0xaca30028, 0x8fa2003c,
-        0x3c031000, 0xaca2002c, 0xaf4301b8, 0x3c026000, 0x8c434448, 0x00c01021,
-        0xaf63016c, 0x8fbf0048, 0x03e00008, 0x27bd0050, 0x8f460140, 0x8f470148,
-        0x3c028000, 0x00e24024, 0x00072c02, 0x30a300ff, 0x2402000b, 0x1062008f,
-        0x27440180, 0x2862000c, 0x10400011, 0x24020006, 0x1062005a, 0x28620007,
-        0x10400007, 0x24020008, 0x10600024, 0x24020001, 0x10620037, 0x00000000,
-        0x0a00077e, 0x00000000, 0x106200a9, 0x24020009, 0x106200bb, 0x00071c02,
-        0x0a00077e, 0x00000000, 0x2402001b, 0x106200c7, 0x2862001c, 0x10400007,
-        0x2402000e, 0x106200b1, 0x24020019, 0x106200c2, 0x00071c02, 0x0a00077e,
-        0x00000000, 0x24020080, 0x10620060, 0x28620081, 0x10400005, 0x2402001c,
-        0x10620094, 0x00071c02, 0x0a00077e, 0x00000000, 0x240200c2, 0x106200c5,
-        0x00a01821, 0x0a00077e, 0x00000000, 0x00a01821, 0x3c058000, 0x8f4201b8,
-        0x00451024, 0x1440fffd, 0x24020001, 0xa4830008, 0x24030002, 0xac860000,
-        0xac800004, 0xa082000a, 0xa083000b, 0xa4870010, 0x8f430144, 0x3c021000,
+        0x03e00008, 0xaca40000, 0x03e00008, 0x24020091, 0x27bdffb0, 0xafbf0048,
+        0x93620023, 0x30420010, 0x1440025b, 0x24020001, 0x93420116, 0x93630005,
+        0x34424000, 0x30630001, 0x14600005, 0x03425821, 0x0e001548, 0x00000000,
+        0x0a0013a5, 0x8fbf0048, 0x93420112, 0x8f430104, 0x3c040020, 0x34424000,
+        0x00641824, 0x10600012, 0x03422821, 0x27450180, 0x3c038000, 0x8f4201b8,
+        0x00431024, 0x1440fffd, 0x00000000, 0x8f420128, 0xaca20000, 0x8f640040,
+        0x24030008, 0x240240c1, 0xa4a20008, 0x24020002, 0xa0a2000b, 0x3c021000,
+        0x0a001181, 0xa0a3000a, 0x8f420104, 0x3c030040, 0x00431024, 0x1040001d,
+        0x3c038000, 0x27450180, 0x8f4201b8, 0x00431024, 0x1440fffd, 0x00000000,
+        0x8f420128, 0xaca20000, 0x8f640040, 0x24030010, 0x240240c1, 0xa4a20008,
+        0x24020002, 0xa0a3000a, 0x24030008, 0xa0a2000b, 0x3c021000, 0xa4a30010,
+        0xa0a00012, 0xa0a00013, 0xaca00014, 0xaca00024, 0xaca00028, 0xaca0002c,
+        0xaca40018, 0x0e001548, 0xaf4201b8, 0x0a0013a5, 0x8fbf0048, 0x8f820000,
+        0x10400016, 0x00000000, 0x8f420104, 0x3c030001, 0x00431024, 0x10400011,
+        0x00000000, 0x8ca3000c, 0x8f620030, 0x1462020c, 0x24020001, 0x8ca30010,
+        0x8f62002c, 0x14620208, 0x24020001, 0x9763003a, 0x95620000, 0x14430204,
+        0x24020001, 0x97630038, 0x95620002, 0x14430200, 0x24020001, 0xaf400048,
+        0xaf400054, 0xaf400040, 0x8f690040, 0x8f6a0048, 0x01497023, 0x05c10004,
+        0x00000000, 0x0000000d, 0x00000000, 0x24000169, 0x9742011a, 0x3046ffff,
+        0x10c00004, 0x8d680004, 0x01061021, 0x0a0011b8, 0x2445ffff, 0x01002821,
+        0x916c000d, 0xa7a00020, 0xa3a0001a, 0xafa00028, 0x9362003f, 0x31830004,
+        0x1060003a, 0x304700ff, 0x24040012, 0x14e40006, 0x24020001, 0x3c040800,
+        0x8c830028, 0x24630001, 0x0a00128d, 0xac830028, 0x8f620044, 0x15020010,
+        0x27a60010, 0x27450180, 0x3c038000, 0x2402001a, 0xa7a20020, 0x24020020,
+        0xafa90028, 0xa3a70022, 0xa3a40023, 0xa3a2001a, 0x8f4201b8, 0x00431024,
+        0x1440fffd, 0x00000000, 0x0a001272, 0x00000000, 0x8f620044, 0x01021023,
+        0x0440001a, 0x010a1023, 0x044100ae, 0x24020001, 0x3c020800, 0x8c4300d8,
+        0x10600004, 0x24020001, 0xa7a20020, 0x0a0011ee, 0xafa90028, 0x2402001a,
+        0xa7a20020, 0x24020020, 0xafa90028, 0xa3a70022, 0xa3a40023, 0xa3a2001a,
+        0x27a60010, 0x27450180, 0x3c038000, 0x8f4201b8, 0x00431024, 0x1440fffd,
+        0x00000000, 0x0a001272, 0x00000000, 0x0a00128d, 0x24020001, 0x01286823,
+        0x19a00016, 0x00cd102a, 0x54400007, 0x318c00fe, 0x55a6000f, 0x010d4021,
+        0x31820001, 0x5440000c, 0x010d4021, 0x318c00fe, 0x00c06821, 0x3c040800,
+        0x8c8300c8, 0x00003021, 0x24020001, 0xa7a20020, 0xafa90028, 0x24630001,
+        0x0a001212, 0xac8300c8, 0x00cd1023, 0x0a001212, 0x3046ffff, 0x00006821,
+        0x2542ffff, 0x00a21823, 0x1860001e, 0x0066102a, 0x14400018, 0x01402821,
+        0x97a20020, 0x3c040800, 0x8c8300cc, 0xafa90028, 0x34420001, 0x24630001,
+        0xa7a20020, 0x01091026, 0x2c420001, 0xac8300cc, 0x2dc30001, 0x00431024,
+        0x1440000a, 0x00c01821, 0x27a60010, 0x27450180, 0x3c038000, 0x8f4201b8,
+        0x00431024, 0x1440fffd, 0x00000000, 0x0a001272, 0x00000000, 0x00c31023,
+        0x3046ffff, 0x0a00123d, 0x318c00f6, 0x01091023, 0x18400008, 0x97a20020,
+        0x3c040800, 0x8c8300d4, 0xafa80028, 0x34420400, 0x24630001, 0xa7a20020,
+        0xac8300d4, 0x31820002, 0x1040001c, 0x31820010, 0x8f620044, 0x1502000d,
+        0x27a60010, 0x97a20020, 0x27450180, 0x3c038000, 0xafa90028, 0x34420001,
+        0xa7a20020, 0x8f4201b8, 0x00431024, 0x1440fffd, 0x00000000, 0x0a001272,
+        0x00000000, 0x97a20020, 0x27450180, 0x3c038000, 0xafa90028, 0x34420001,
+        0xa7a20020, 0x8f4201b8, 0x00431024, 0x1440fffd, 0x00000000, 0x0a001272,
+        0x00000000, 0x54400003, 0x8d6a0008, 0x0a00128d, 0x24020001, 0x8f630054,
+        0x2542ffff, 0x00431023, 0x1840002e, 0x97a20020, 0x27a60010, 0x3c040800,
+        0x8c8300d0, 0x27450180, 0x3c078000, 0xafa90028, 0x34420001, 0x24630001,
+        0xa7a20020, 0xac8300d0, 0x8f4201b8, 0x00471024, 0x1440fffd, 0x00000000,
+        0x8f420128, 0xaca20000, 0x8cc30018, 0x240240c1, 0xa4a20008, 0xaca30018,
+        0x90c4000a, 0x24020002, 0xa0a2000b, 0xa0a4000a, 0x94c20010, 0xa4a20010,
+        0x90c30012, 0xa0a30012, 0x90c20013, 0xa0a20013, 0x8cc30014, 0xaca30014,
+        0x8cc20024, 0xaca20024, 0x8cc30028, 0xaca30028, 0x8cc4002c, 0x24020001,
+        0x3c031000, 0xaca4002c, 0xaf4301b8, 0xaf400044, 0xaf400050, 0x0a0013a5,
+        0x8fbf0048, 0x31820020, 0x10400011, 0x00000000, 0x95620012, 0x0046102b,
+        0x10400008, 0x97a20020, 0x95660012, 0x10c00003, 0x01061021, 0x0a00129e,
+        0x2445ffff, 0x01002821, 0x97a20020, 0x93a3001a, 0x34420008, 0x34630004,
+        0xa7a20020, 0xa3a3001a, 0x8f420104, 0x38e3000a, 0x2c630001, 0x38e2000c,
+        0x2c420001, 0x00621825, 0x14600003, 0x2402000e, 0x54e2002a, 0x00003021,
+        0x50c00008, 0x9564000e, 0x10c00004, 0xa7a60040, 0x01061021, 0x0a0012b6,
+        0x2445ffff, 0x01002821, 0x9564000e, 0x93630035, 0x8f62004c, 0x00642004,
+        0x008a2021, 0x00821023, 0x1840001d, 0x00000000, 0x8f620018, 0x01021023,
+        0x1c40000f, 0x97a20020, 0x8f620018, 0x15020016, 0x00000000, 0x8f62001c,
+        0x01421023, 0x1c400008, 0x97a20020, 0x8f62001c, 0x1542000f, 0x00000000,
+        0x8f620058, 0x00821023, 0x1840000b, 0x97a20020, 0xafa50028, 0xafa80034,
+        0xafaa0038, 0xafa4003c, 0x34420020, 0x0a0012da, 0xa7a20020, 0x01204021,
+        0x01002821, 0x8f640058, 0x8f62004c, 0x01421023, 0x18400009, 0x00000000,
+        0x8f620054, 0x01421023, 0x1c400005, 0x97a20020, 0xafa50028, 0xafaa0024,
+        0x0a0012f2, 0x34420040, 0x9742011a, 0x1440000c, 0x24020014, 0x8f620058,
+        0x14820009, 0x24020014, 0x8f63004c, 0x8f620054, 0x10620004, 0x97a20020,
+        0xafa50028, 0x34420080, 0xa7a20020, 0x24020014, 0x10e2000a, 0x28e20015,
+        0x10400005, 0x2402000c, 0x10e20006, 0x31820001, 0x0a001333, 0x00000000,
+        0x24020016, 0x14e20035, 0x31820001, 0x8f620084, 0x24420001, 0x15420031,
+        0x31820001, 0x24020014, 0x10e20021, 0x28e20015, 0x10400005, 0x2402000c,
+        0x10e20008, 0x31820001, 0x0a001333, 0x00000000, 0x24020016, 0x10e2000c,
+        0x31820001, 0x0a001333, 0x00000000, 0x97a30020, 0x2402000e, 0xafa50028,
+        0xa3a70022, 0xa3a20023, 0xafaa0024, 0x34630054, 0x0a001332, 0xa7a30020,
+        0x97a20020, 0x93a4001a, 0x24030010, 0xafa50028, 0xa3a70022, 0xa3a30023,
+        0xafaa0024, 0x3442005d, 0x34840002, 0xa7a20020, 0x0a001332, 0xa3a4001a,
+        0x97a20020, 0x24030012, 0xa3a30023, 0x93a3001a, 0xafa50028, 0xa3a70022,
+        0xafaa0024, 0x3042fffe, 0x3442005c, 0x34630002, 0xa7a20020, 0xa3a3001a,
+        0x31820001, 0x10400030, 0x2402000c, 0x10e20013, 0x28e2000d, 0x10400005,
+        0x2402000a, 0x10e20008, 0x97a20020, 0x0a001365, 0x31820009, 0x2402000e,
+        0x10e2001b, 0x31820009, 0x0a001366, 0x0002102b, 0x93a4001a, 0x24030008,
+        0xafa50028, 0xa3a70022, 0xa3a30023, 0x0a001361, 0x34420013, 0x97a30020,
+        0x30620004, 0x14400005, 0x93a2001a, 0x3463001b, 0xa7a30020, 0x0a001354,
+        0x24030016, 0x3463001b, 0xa7a30020, 0x24030010, 0xafa50028, 0xa3a70022,
+        0xa3a30023, 0x34420002, 0x0a001364, 0xa3a2001a, 0x97a20020, 0x93a4001a,
+        0x24030010, 0xafa50028, 0xa3a70022, 0xa3a30023, 0x3442001b, 0x34840002,
+        0xa7a20020, 0xa3a4001a, 0x31820009, 0x0002102b, 0x00021023, 0x30420007,
+        0x10c00017, 0x34440003, 0x8f820014, 0x24030800, 0x27450180, 0x24420001,
+        0xaf820014, 0x24020004, 0xaf4301b8, 0xa4a40008, 0xa0a2000b, 0x93440120,
+        0x3c031000, 0xa4a6000e, 0xacaa0024, 0xaca80028, 0x008d2021, 0xa4a4000c,
+        0xaf4301b8, 0x97a20020, 0x00003021, 0x3042ffbf, 0x0a001381, 0xa7a20020,
+        0x24060001, 0x97a20020, 0x10400020, 0x27450180, 0x3c038000, 0x8f4201b8,
+        0x00431024, 0x1440fffd, 0x00000000, 0x8f420128, 0xaca20000, 0x8fa30028,
+        0x240240c1, 0xa4a20008, 0xaca30018, 0x93a4001a, 0x24020002, 0xa0a2000b,
+        0xa0a4000a, 0x97a20020, 0xa4a20010, 0x93a30022, 0xa0a30012, 0x93a20023,
+        0xa0a20013, 0x8fa30024, 0xaca30014, 0x8fa20034, 0xaca20024, 0x8fa30038,
+        0xaca30028, 0x8fa2003c, 0x3c031000, 0xaca2002c, 0xaf4301b8, 0x00c01021,
+        0x8fbf0048, 0x03e00008, 0x27bd0050, 0x8f470140, 0x8f460148, 0x3c028000,
+        0x00c24024, 0x00062c02, 0x30a300ff, 0x24020019, 0x106200e7, 0x27440180,
+        0x2862001a, 0x1040001f, 0x24020008, 0x106200be, 0x28620009, 0x1040000d,
+        0x24020001, 0x10620046, 0x28620002, 0x50400005, 0x24020006, 0x1060002e,
+        0x00a01821, 0x0a0014c4, 0x00000000, 0x1062005b, 0x00a01821, 0x0a0014c4,
+        0x00000000, 0x2402000b, 0x10620084, 0x2862000c, 0x10400005, 0x24020009,
+        0x106200bc, 0x00061c02, 0x0a0014c4, 0x00000000, 0x2402000e, 0x106200b7,
+        0x00061c02, 0x0a0014c4, 0x00000000, 0x28620021, 0x10400009, 0x2862001f,
+        0x104000c1, 0x2402001b, 0x106200bf, 0x2402001c, 0x1062009a, 0x00061c02,
+        0x0a0014c4, 0x00000000, 0x240200c2, 0x106200ca, 0x286200c3, 0x10400005,
+        0x24020080, 0x1062005a, 0x00a01821, 0x0a0014c4, 0x00000000, 0x240200c9,
+        0x106200cd, 0x30c5ffff, 0x0a0014c4, 0x00000000, 0x3c058000, 0x8f4201b8,
+        0x00451024, 0x1440fffd, 0x24020001, 0xa4830008, 0x24030002, 0xac870000,
+        0xac800004, 0xa082000a, 0xa083000b, 0xa4860010, 0x8f430144, 0x3c021000,
         0xac800028, 0xac830024, 0x3c036000, 0xaf4201b8, 0x03e00008, 0xac600808,
-        0x11000009, 0x00a01821, 0x3c020800, 0x24030002, 0xa0434490, 0x24424490,
-        0xac460008, 0x8f430144, 0x03e00008, 0xac430004, 0x3c058000, 0x8f4201b8,
-        0x00451024, 0x1440fffd, 0x24020002, 0xac800000, 0xac860004, 0xa4830008,
-        0xa082000a, 0xa082000b, 0xa4870010, 0xac800024, 0x8f420144, 0x3c031000,
-        0xac820028, 0x3c026000, 0xaf4301b8, 0x03e00008, 0xac400808, 0x00a01821,
-        0x3c080800, 0x3c058000, 0x8f4201b8, 0x00451024, 0x1440fffd, 0x00000000,
-        0xac860000, 0x91024490, 0x00002821, 0x10400002, 0x25064490, 0x8cc50008,
-        0xac850004, 0xa4830008, 0x91034490, 0x24020002, 0xa082000b, 0xa4870010,
-        0x34630001, 0xa083000a, 0x8f420144, 0xac820024, 0x91034490, 0x10600002,
-        0x00001021, 0x8cc20004, 0xac820028, 0x3c021000, 0xaf4201b8, 0x3c026000,
-        0xa1004490, 0x03e00008, 0xac400808, 0x00a01821, 0x3c058000, 0x8f4201b8,
-        0x00451024, 0x1440fffd, 0x24020002, 0xa082000b, 0xa4830008, 0xa4870010,
-        0x8f420144, 0x3c031000, 0xa4820012, 0x03e00008, 0xaf4301b8, 0x30e2ffff,
-        0x14400028, 0x00071c02, 0x93620005, 0x30420004, 0x14400020, 0x3c029000,
-        0x34420001, 0x00c21025, 0xaf420020, 0x3c038000, 0x8f420020, 0x00431024,
-        0x1440fffd, 0x00000000, 0x93620005, 0x3c038000, 0x34630001, 0x00c31825,
-        0x34420004, 0xa3620005, 0xaf430020, 0x93620005, 0x30420004, 0x14400003,
-        0x3c038000, 0x0000000d, 0x3c038000, 0x8f4201b8, 0x00431024, 0x1440fffd,
-        0x24020005, 0x3c031000, 0xac860000, 0xa082000b, 0xaf4301b8, 0x0a00073d,
-        0x00071c02, 0x0000000d, 0x03e00008, 0x00000000, 0x00071c02, 0x3c058000,
-        0x8f4201b8, 0x00451024, 0x1440fffd, 0x24020001, 0xa4830008, 0x24030002,
-        0xac860000, 0xac800004, 0xa082000a, 0xa083000b, 0xa4870010, 0x8f430144,
-        0x3c021000, 0xac800028, 0xac830024, 0x03e00008, 0xaf4201b8, 0x00071c02,
-        0x3c058000, 0x8f4201b8, 0x00451024, 0x1440fffd, 0x24020002, 0xac800000,
-        0xac860004, 0xa4830008, 0xa082000a, 0xa082000b, 0xa4870010, 0xac800024,
-        0x8f420144, 0x3c031000, 0xac820028, 0x03e00008, 0xaf4301b8, 0x00071c02,
-        0x3c058000, 0x8f4201b8, 0x00451024, 0x1440fffd, 0x24020001, 0xa4830008,
-        0x24030002, 0xa082000a, 0x3c021000, 0xac860000, 0xac800004, 0xa083000b,
-        0xa4870010, 0xac800024, 0xac800028, 0x03e00008, 0xaf4201b8, 0x3c058000,
-        0x8f4201b8, 0x00451024, 0x1440fffd, 0x24020002, 0xac860000, 0xac800004,
-        0xa4830008, 0xa080000a, 0x0a000748, 0xa082000b, 0x0000000d, 0x03e00008,
-        0x00000000, 0x03e00008, 0x00000000, 0x8f420100, 0x3042003e, 0x14400011,
-        0x24020001, 0xaf400048, 0x8f420100, 0x304207c0, 0x10400005, 0x00000000,
-        0xaf40004c, 0xaf400050, 0x03e00008, 0x24020001, 0xaf400054, 0xaf400040,
-        0x8f420100, 0x30423800, 0x54400001, 0xaf400044, 0x24020001, 0x03e00008,
-        0x00000000, 0x3c029000, 0x34420001, 0x00822025, 0xaf440020, 0x3c038000,
-        0x8f420020, 0x00431024, 0x1440fffd, 0x00000000, 0x03e00008, 0x00000000,
-        0x3c028000, 0x34420001, 0x00822025, 0x03e00008, 0xaf440020, 0x8f430128,
-        0x27420180, 0xac430000, 0x8f650040, 0x240340c1, 0xa4430008, 0x24030002,
-        0xa044000a, 0x24040008, 0xa043000b, 0x3c031000, 0xa4440010, 0xa0400012,
-        0xa0400013, 0xac400014, 0xac400024, 0xac400028, 0xac40002c, 0xac450018,
-        0x03e00008, 0xaf4301b8, 0x24020001, 0xacc40000, 0x03e00008, 0xa4e50000,
-        0x03e00008, 0x24020001, 0x24020001, 0xaf400044, 0x03e00008, 0xaf400050,
-        0x00803021, 0x27450180, 0x3c038000, 0x8f4201b8, 0x00431024, 0x1440fffd,
-        0x00000000, 0x8f420128, 0xaca20000, 0x8cc30018, 0x240240c1, 0xa4a20008,
-        0xaca30018, 0x90c4000a, 0x24020002, 0xa0a2000b, 0xa0a4000a, 0x94c20010,
-        0xa4a20010, 0x90c30012, 0xa0a30012, 0x90c20013, 0xa0a20013, 0x8cc30014,
-        0xaca30014, 0x8cc20024, 0xaca20024, 0x8cc30028, 0xaca30028, 0x8cc2002c,
-        0x3c031000, 0xaca2002c, 0x24020001, 0xaf4301b8, 0xaf400044, 0x03e00008,
-        0xaf400050, 0x27bdffe8, 0xafbf0010, 0x0e000326, 0x00000000, 0x00002021,
-        0x0e00004c, 0xaf400180, 0x8fbf0010, 0x03e00008, 0x27bd0018, 0x8f460148,
-        0x27450180, 0x3c038000, 0x00061402, 0x304700ff, 0x8f4201b8, 0x00431024,
-        0x1440fffd, 0x00000000, 0x8f440140, 0x00061202, 0x304200ff, 0x00061c02,
-        0xaca20004, 0x24020002, 0xa4a30008, 0x30c300ff, 0xa0a2000b, 0xaca30024,
-        0x10e0000a, 0xaca40000, 0x28e20004, 0x14400005, 0x24020001, 0x24020005,
-        0x54e20005, 0xa0a0000a, 0x24020001, 0x0a000816, 0xa0a2000a, 0xa0a0000a,
-        0x3c021000, 0x03e00008, 0xaf4201b8, 0x03e00008, 0x00001021, 0x10c00007,
-        0x00000000, 0x8ca20000, 0x24c6ffff, 0x24a50004, 0xac820000, 0x14c0fffb,
-        0x24840004, 0x03e00008, 0x00000000, 0x0a00082a, 0x00a01021, 0xac860000,
-        0x24840004, 0x00a01021, 0x1440fffc, 0x24a5ffff, 0x03e00008, 0x00000000,
-        0x00000000 }; 
+        0x11000009, 0x00a01821, 0x3c020800, 0x24030002, 0xa0436a08, 0x24426a08,
+        0xac470008, 0x8f430144, 0x03e00008, 0xac430004, 0x3c058000, 0x8f4201b8,
+        0x00451024, 0x1440fffd, 0x24020002, 0xac800000, 0xac870004, 0xa4830008,
+        0xa082000a, 0xa082000b, 0xa4860010, 0xac800024, 0x8f420144, 0x3c031000,
+        0xac820028, 0x3c026000, 0xaf4301b8, 0x03e00008, 0xac400808, 0x3c080800,
+        0x3c058000, 0x8f4201b8, 0x00451024, 0x1440fffd, 0x00000000, 0xac870000,
+        0x91026a08, 0x00002821, 0x10400002, 0x25076a08, 0x8ce50008, 0xac850004,
+        0xa4830008, 0x91036a08, 0x24020002, 0xa082000b, 0xa4860010, 0x34630001,
+        0xa083000a, 0x8f420144, 0xac820024, 0x91036a08, 0x10600002, 0x00001021,
+        0x8ce20004, 0xac820028, 0x3c021000, 0xaf4201b8, 0x3c026000, 0xa1006a08,
+        0x03e00008, 0xac400808, 0x3c058000, 0x8f4201b8, 0x00451024, 0x1440fffd,
+        0x24020002, 0xa082000b, 0xa4830008, 0xa4860010, 0x8f420144, 0x3c031000,
+        0xa4820012, 0x03e00008, 0xaf4301b8, 0x30c2ffff, 0x14400028, 0x00061c02,
+        0x93620005, 0x30420004, 0x14400020, 0x3c029000, 0x34420001, 0x00e21025,
+        0xaf420020, 0x3c038000, 0x8f420020, 0x00431024, 0x1440fffd, 0x00000000,
+        0x93620005, 0x3c038000, 0x34630001, 0x00e31825, 0x34420004, 0xa3620005,
+        0xaf430020, 0x93620005, 0x30420004, 0x14400003, 0x3c038000, 0x0000000d,
+        0x3c038000, 0x8f4201b8, 0x00431024, 0x1440fffd, 0x24020005, 0x3c031000,
+        0xac870000, 0xa082000b, 0xaf4301b8, 0x0a001473, 0x00061c02, 0x0000000d,
+        0x03e00008, 0x00000000, 0x00061c02, 0x3c058000, 0x8f4201b8, 0x00451024,
+        0x1440fffd, 0x24020001, 0xa4830008, 0x24030002, 0xac870000, 0xac800004,
+        0xa082000a, 0xa083000b, 0xa4860010, 0x8f430144, 0x3c021000, 0xac800028,
+        0xac830024, 0x03e00008, 0xaf4201b8, 0x3c058000, 0x8f4201b8, 0x00451024,
+        0x1440fffd, 0x24020002, 0xac800000, 0xac870004, 0xa4830008, 0xa082000a,
+        0xa082000b, 0xa4860010, 0xac800024, 0x8f420144, 0x3c031000, 0xac820028,
+        0x03e00008, 0xaf4301b8, 0x00061c02, 0x3c058000, 0x8f4201b8, 0x00451024,
+        0x1440fffd, 0x24020001, 0xa4830008, 0x24030002, 0xa082000a, 0x3c021000,
+        0xac870000, 0xac800004, 0xa083000b, 0xa4860010, 0xac800024, 0xac800028,
+        0x03e00008, 0xaf4201b8, 0x00a01821, 0x3c058000, 0x8f4201b8, 0x00451024,
+        0x1440fffd, 0x24020002, 0xac870000, 0xac800004, 0xa4830008, 0xa080000a,
+        0x0a00147e, 0xa082000b, 0x8f440144, 0x3c038000, 0x8f4201b8, 0x00431024,
+        0x1440fffd, 0x24020002, 0x240340c9, 0xaf470180, 0xa342018b, 0x3c021000,
+        0xa7430188, 0xaf4401a4, 0xaf4501a8, 0xaf4001ac, 0x03e00008, 0xaf4201b8,
+        0x0000000d, 0x03e00008, 0x00000000, 0x03e00008, 0x00000000, 0x8f420100,
+        0x3042003e, 0x14400011, 0x24020001, 0xaf400048, 0x8f420100, 0x304207c0,
+        0x10400005, 0x00000000, 0xaf40004c, 0xaf400050, 0x03e00008, 0x24020001,
+        0xaf400054, 0xaf400040, 0x8f420100, 0x30423800, 0x54400001, 0xaf400044,
+        0x24020001, 0x03e00008, 0x00000000, 0x3c038000, 0x8f4201b8, 0x00431024,
+        0x1440fffd, 0x24020002, 0x240340c9, 0xaf440180, 0xa342018b, 0x3c021000,
+        0xa7430188, 0xaf4501a4, 0xaf4601a8, 0xaf4701ac, 0x03e00008, 0xaf4201b8,
+        0x3c029000, 0x34420001, 0x00822025, 0xaf440020, 0x3c038000, 0x8f420020,
+        0x00431024, 0x1440fffd, 0x00000000, 0x03e00008, 0x00000000, 0x3c028000,
+        0x34420001, 0x00822025, 0x03e00008, 0xaf440020, 0x308600ff, 0x27450180,
+        0x3c038000, 0x8f4201b8, 0x00431024, 0x1440fffd, 0x00000000, 0x8f420128,
+        0xaca20000, 0x8f640040, 0x24030008, 0x240240c1, 0xa4a20008, 0x24020002,
+        0xa0a2000b, 0x3c021000, 0xa0a6000a, 0xa4a30010, 0xa0a00012, 0xa0a00013,
+        0xaca00014, 0xaca00024, 0xaca00028, 0xaca0002c, 0xaca40018, 0x03e00008,
+        0xaf4201b8, 0x24020001, 0xacc40000, 0x03e00008, 0xa4e50000, 0x03e00008,
+        0x24020001, 0x24020001, 0xaf400044, 0x03e00008, 0xaf400050, 0x00803021,
+        0x27450180, 0x3c038000, 0x8f4201b8, 0x00431024, 0x1440fffd, 0x00000000,
+        0x8f420128, 0xaca20000, 0x8cc30018, 0x240240c1, 0xa4a20008, 0xaca30018,
+        0x90c4000a, 0x24020002, 0xa0a2000b, 0xa0a4000a, 0x94c20010, 0xa4a20010,
+        0x90c30012, 0xa0a30012, 0x90c20013, 0xa0a20013, 0x8cc30014, 0xaca30014,
+        0x8cc20024, 0xaca20024, 0x8cc30028, 0xaca30028, 0x8cc2002c, 0x3c031000,
+        0xaca2002c, 0x24020001, 0xaf4301b8, 0xaf400044, 0x03e00008, 0xaf400050,
+        0x27bdffe8, 0xafbf0010, 0x0e001032, 0x00000000, 0x00002021, 0x0e000c99,
+        0xaf400180, 0x8fbf0010, 0x03e00008, 0x27bd0018, 0x8f460148, 0x27450180,
+        0x3c038000, 0x00061402, 0x304700ff, 0x8f4201b8, 0x00431024, 0x1440fffd,
+        0x00000000, 0x8f440140, 0x00061202, 0x304200ff, 0x00061c02, 0xaca20004,
+        0x24020002, 0xa4a30008, 0x30c300ff, 0xa0a2000b, 0xaca30024, 0x10e0000a,
+        0xaca40000, 0x28e20004, 0x14400005, 0x24020001, 0x24020005, 0x54e20005,
+        0xa0a0000a, 0x24020001, 0x0a001571, 0xa0a2000a, 0xa0a0000a, 0x3c021000,
+        0x03e00008, 0xaf4201b8, 0x03e00008, 0x00001021, 0x10c00007, 0x00000000,
+        0x8ca20000, 0x24c6ffff, 0x24a50004, 0xac820000, 0x14c0fffb, 0x24840004,
+        0x03e00008, 0x00000000, 0x0a001587, 0x00a01021, 0xac860000, 0x00000000,
+        0x00000000, 0x24840004, 0x00a01021, 0x1440fffa, 0x24a5ffff, 0x03e00008,
+        0x00000000, 0x00000000 };
 
-static u32 bnx2_RXP_b06FwData[(0x0/4) + 1] = { 0x00000000 };
-static u32 bnx2_RXP_b06FwRodata[(0x0/4) + 1] = { 0x00000000 };
-static u32 bnx2_RXP_b06FwBss[(0x239c/4) + 1] = { 0x00000000 };
-static u32 bnx2_RXP_b06FwSbss[(0x14/4) + 1] = { 0x00000000 };
+static u32 bnx2_RXP_b06FwData[(0x0/4) + 1] = { 0x0 };
+static u32 bnx2_RXP_b06FwRodata[(0x0/4) + 1] = { 0x0 };
+static u32 bnx2_RXP_b06FwBss[(0x1394/4) + 1] = { 0x0 };
+static u32 bnx2_RXP_b06FwSbss[(0x18/4) + 1] = { 0x0 };
 
 static u32 bnx2_rv2p_proc1[] = {
         0x00000008, 0xac000001, 0x0000000c, 0x2f800001, 0x00000010, 0x213f0004,
@@ -1536,249 +2298,346 @@ static u32 bnx2_rv2p_proc2[] = {
         0x0000000c, 0x29520000, 0x00000018, 0x80000002, 0x0000000c, 0x29800000,
         0x00000018, 0x00570000 };
 
-static int bnx2_TPAT_b06FwReleaseMajor = 0x0;
+static int bnx2_TPAT_b06FwReleaseMajor = 0x1;
 static int bnx2_TPAT_b06FwReleaseMinor = 0x0;
 static int bnx2_TPAT_b06FwReleaseFix = 0x0;
-static u32 bnx2_TPAT_b06FwStartAddr = 0x08000858;
+static u32 bnx2_TPAT_b06FwStartAddr = 0x08000860;
 static u32 bnx2_TPAT_b06FwTextAddr = 0x08000800;
-static int bnx2_TPAT_b06FwTextLen = 0x1314;
-static u32 bnx2_TPAT_b06FwDataAddr = 0x08001b40;
+static int bnx2_TPAT_b06FwTextLen = 0x122c;
+static u32 bnx2_TPAT_b06FwDataAddr = 0x08001a60;
 static int bnx2_TPAT_b06FwDataLen = 0x0;
 static u32 bnx2_TPAT_b06FwRodataAddr = 0x00000000;
 static int bnx2_TPAT_b06FwRodataLen = 0x0;
-static u32 bnx2_TPAT_b06FwBssAddr = 0x08001b90;
-static int bnx2_TPAT_b06FwBssLen = 0x80;
-static u32 bnx2_TPAT_b06FwSbssAddr = 0x08001b40;
-static int bnx2_TPAT_b06FwSbssLen = 0x48;
-
-static u32 bnx2_TPAT_b06FwText[(0x1314/4) + 1] = {
-        0x0a000216, 0x00000000, 0x00000000, 0x0000000d, 0x74706174, 0x20302e36,
-        0x2e390000, 0x00060901, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x10000003,
-        0x00000000, 0x0000000d, 0x0000000d, 0x3c020800, 0x24421b40, 0x3c030800,
-        0x24631c10, 0xac400000, 0x0043202b, 0x1480fffd, 0x24420004, 0x3c1d0800,
-        0x37bd3ffc, 0x03a0f021, 0x3c100800, 0x26100858, 0x3c1c0800, 0x279c1b40,
-        0x0e00051f, 0x00000000, 0x0000000d, 0x8f820024, 0x27bdffe8, 0xafbf0014,
-        0x10400004, 0xafb00010, 0x0000000d, 0x00000000, 0x2400015f, 0x8f82001c,
+static u32 bnx2_TPAT_b06FwBssAddr = 0x08001aa0;
+static int bnx2_TPAT_b06FwBssLen = 0x250;
+static u32 bnx2_TPAT_b06FwSbssAddr = 0x08001a60;
+static int bnx2_TPAT_b06FwSbssLen = 0x34;
+static u32 bnx2_TPAT_b06FwText[(0x122c/4) + 1] = {
+        0x0a000218, 0x00000000, 0x00000000, 0x0000000d, 0x74706174, 0x20322e35,
+        0x2e313100, 0x02050b01, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x10000003, 0x00000000, 0x0000000d, 0x0000000d, 0x3c020800,
+        0x24421a60, 0x3c030800, 0x24631cf0, 0xac400000, 0x0043202b, 0x1480fffd,
+        0x24420004, 0x3c1d0800, 0x37bd2ffc, 0x03a0f021, 0x3c100800, 0x26100860,
+        0x3c1c0800, 0x279c1a60, 0x0e000546, 0x00000000, 0x0000000d, 0x8f820010,
         0x8c450008, 0x24030800, 0xaf430178, 0x97430104, 0x3c020008, 0xaf420140,
-        0x8f820034, 0x30420001, 0x10400006, 0x3070ffff, 0x24020002, 0x2603fffe,
-        0xa7420146, 0x0a000246, 0xa7430148, 0xa7400146, 0x8f850034, 0x30a20020,
-        0x0002102b, 0x00021023, 0x30460009, 0x30a30c00, 0x24020400, 0x14620002,
-        0x34c40001, 0x34c40005, 0xa744014a, 0x3c020800, 0x8c440820, 0x3c030048,
-        0x24020002, 0x00832025, 0x30a30006, 0x1062000d, 0x2c620003, 0x50400005,
-        0x24020004, 0x10600012, 0x3c020001, 0x0a000271, 0x00000000, 0x10620007,
-        0x24020006, 0x1462000f, 0x3c020111, 0x0a000269, 0x00821025, 0x0a000268,
-        0x3c020101, 0x3c020011, 0x00821025, 0x24030001, 0xaf421000, 0xaf830030,
-        0x0a000271, 0x00000000, 0x00821025, 0xaf421000, 0xaf800030, 0x00000000,
-        0x00000000, 0x00000000, 0x00000000, 0x8f830030, 0x1060003f, 0x3c048000,
-        0x8f421000, 0x00441024, 0x1040fffd, 0x00000000, 0x10600039, 0x00000000,
-        0x8f421000, 0x3c030020, 0x00431024, 0x10400034, 0x00000000, 0x97421014,
-        0x14400031, 0x00000000, 0x97421008, 0x8f84001c, 0x24420006, 0x00024082,
-        0x00081880, 0x00643821, 0x8ce50000, 0x30430003, 0x30420001, 0x10400004,
-        0x00000000, 0x0000000d, 0x0a0002b0, 0x00081080, 0x5460000f, 0x30a5ffff,
-        0x3c06ffff, 0x00a62824, 0x0005182b, 0x00a61026, 0x0002102b, 0x00621824,
-        0x10600004, 0x00000000, 0x0000000d, 0x00000000, 0x240001fc, 0x8ce20000,
-        0x0a0002af, 0x00462825, 0x0005182b, 0x38a2ffff, 0x0002102b, 0x00621824,
-        0x10600004, 0x00000000, 0x0000000d, 0x00000000, 0x24000206, 0x8ce20000,
-        0x3445ffff, 0x00081080, 0x00441021, 0x3c030800, 0xac450000, 0x8c620840,
-        0x24420001, 0xac620840, 0x8f820008, 0x10400003, 0x00000000, 0x0e000660,
-        0x00000000, 0x8f840028, 0x02002821, 0x24820008, 0x30421fff, 0x24434000,
-        0x0343d821, 0x30a30007, 0xaf840018, 0xaf820028, 0xaf420084, 0x10600002,
-        0x24a20007, 0x3045fff8, 0x8f820044, 0x8f840004, 0x00451821, 0xaf82002c,
-        0x0064102b, 0xaf830044, 0x14400002, 0x00641023, 0xaf820044, 0x8f840044,
-        0x34028000, 0x8fbf0014, 0x8fb00010, 0x00821021, 0x03421821, 0x3c021000,
-        0xaf83001c, 0xaf440080, 0xaf420178, 0x03e00008, 0x27bd0018, 0x8f820024,
-        0x27bdffe8, 0xafbf0014, 0x10400004, 0xafb00010, 0x0000000d, 0x00000000,
-        0x24000249, 0x8f85001c, 0x24020001, 0xaf820024, 0x8ca70008, 0xa3800023,
-        0x8f620004, 0x3c100800, 0x26041b90, 0x00021402, 0xa3820010, 0x304600ff,
-        0x24c60005, 0x0e00064a, 0x00063082, 0x8f640004, 0x8f430108, 0x3c021000,
-        0x00621824, 0xa7840020, 0x10600008, 0x00000000, 0x97420104, 0x93830023,
-        0x2442ffec, 0x34630002, 0xa3830023, 0x0a000304, 0x3045ffff, 0x97420104,
-        0x2442fff0, 0x3045ffff, 0x8f620004, 0x3042ffff, 0x2c420013, 0x14400004,
-        0x00000000, 0x93820023, 0x34420001, 0xa3820023, 0x93830023, 0x24020001,
-        0x10620009, 0x28620002, 0x14400014, 0x24020002, 0x10620012, 0x24020003,
-        0x1062000a, 0x00000000, 0x0a000325, 0x00000000, 0x8f82001c, 0x8c43000c,
-        0x3c04ffff, 0x00641824, 0x00651825, 0x0a000325, 0xac43000c, 0x8f82001c,
-        0x8c430010, 0x3c04ffff, 0x00641824, 0x00651825, 0xac430010, 0x8f620004,
-        0x3042ffff, 0x24420002, 0x00021083, 0xa3820038, 0x304500ff, 0x8f82001c,
-        0x3c04ffff, 0x00052880, 0x00a22821, 0x8ca70000, 0x97820020, 0x97430104,
-        0x00e42024, 0x24420002, 0x00621823, 0x00833825, 0xaca70000, 0x93840038,
-        0x26061b90, 0x00041080, 0x00461021, 0x90430000, 0x3063000f, 0x00832021,
-        0xa3840022, 0x308200ff, 0x3c04fff6, 0x24420003, 0x00021080, 0x00461021,
-        0x8c450000, 0x93830022, 0x8f82001c, 0x3484ffff, 0x00a43824, 0x00031880,
-        0x00621821, 0xaf850000, 0xac67000c, 0x93820022, 0x93830022, 0x8f84001c,
-        0x24420003, 0x00021080, 0x00461021, 0x24630004, 0x00031880, 0xac470000,
-        0x93820022, 0x00661821, 0x94670002, 0x00021080, 0x00441021, 0xac670000,
-        0x24030010, 0xac470010, 0xa7430140, 0x24030002, 0xa7400142, 0xa7400144,
-        0xa7430146, 0x97420104, 0x8f840034, 0x24030001, 0x2442fffe, 0x30840006,
-        0xa7420148, 0x24020002, 0xa743014a, 0x1082000d, 0x2c820003, 0x10400005,
-        0x24020004, 0x10800011, 0x3c020009, 0x0a000383, 0x00000000, 0x10820007,
-        0x24020006, 0x1482000d, 0x3c020119, 0x0a00037d, 0x24030001, 0x0a00037c,
-        0x3c020109, 0x3c020019, 0x24030001, 0xaf421000, 0xaf830030, 0x0a000383,
-        0x00000000, 0xaf421000, 0xaf800030, 0x00000000, 0x00000000, 0x00000000,
-        0x00000000, 0x93820010, 0x24030008, 0x8f840030, 0x24420002, 0x30420007,
-        0x00621823, 0x30630007, 0xaf83000c, 0x10800005, 0x3c038000, 0x8f421000,
-        0x00431024, 0x1040fffd, 0x00000000, 0x8f820028, 0xaf820018, 0x24420010,
-        0x30421fff, 0xaf820028, 0xaf420084, 0x97430104, 0x24424000, 0x0342d821,
-        0x3063ffff, 0x30620007, 0x10400002, 0x24620007, 0x3043fff8, 0x8f820044,
-        0x8f840004, 0x00431821, 0xaf82002c, 0x0064102b, 0xaf830044, 0x14400002,
-        0x00641023, 0xaf820044, 0x8f840044, 0x34028000, 0x8fbf0014, 0x8fb00010,
-        0x00821021, 0x03421821, 0x3c021000, 0xaf83001c, 0xaf440080, 0xaf420178,
-        0x03e00008, 0x27bd0018, 0x8f820024, 0x27bdffe8, 0xafbf0014, 0x14400004,
-        0xafb00010, 0x0000000d, 0x00000000, 0x240002db, 0x8f620004, 0x04410009,
-        0x3c050800, 0x93820022, 0x8f830000, 0x24a41b90, 0xaf800024, 0x24420003,
-        0x00021080, 0x00441021, 0xac430000, 0x93820038, 0x24a51b90, 0x93860010,
-        0x3c040001, 0x27700008, 0x24420001, 0x00021080, 0x00451021, 0x8c430000,
-        0x24c60005, 0x00063082, 0x00641821, 0x02002021, 0x0e00064a, 0xac430000,
-        0x93840022, 0x3c057fff, 0x8f620004, 0x00042080, 0x00902021, 0x8c830004,
-        0x34a5ffff, 0x00451024, 0x00621821, 0xac830004, 0x93850038, 0x3c07ffff,
-        0x93840010, 0x00052880, 0x00b02821, 0x8ca30000, 0x97420104, 0x97860020,
-        0x00671824, 0x00441021, 0x00461023, 0x3042ffff, 0x00621825, 0xaca30000,
-        0x93830023, 0x24020001, 0x10620009, 0x28620002, 0x1440001a, 0x24020002,
-        0x10620018, 0x24020003, 0x1062000d, 0x00000000, 0x0a000411, 0x00000000,
-        0x93820010, 0x97430104, 0x8e04000c, 0x00621821, 0x2463fff2, 0x3063ffff,
-        0x00872024, 0x00832025, 0x0a000411, 0xae04000c, 0x93820010, 0x97430104,
-        0x8e040010, 0x00621821, 0x2463ffee, 0x3063ffff, 0x00872024, 0x00832025,
-        0xae040010, 0x9783000e, 0x8f840034, 0x2402000a, 0xa7420140, 0xa7430142,
-        0x93820010, 0xa7420144, 0xa7400146, 0x97430104, 0x30840006, 0x24020001,
-        0xa7430148, 0xa742014a, 0x24020002, 0x1082000d, 0x2c820003, 0x10400005,
-        0x24020004, 0x10800011, 0x3c020041, 0x0a000437, 0x00000000, 0x10820007,
-        0x24020006, 0x1482000d, 0x3c020151, 0x0a000431, 0x24030001, 0x0a000430,
-        0x3c020141, 0x3c020051, 0x24030001, 0xaf421000, 0xaf830030, 0x0a000437,
-        0x00000000, 0xaf421000, 0xaf800030, 0x00000000, 0x00000000, 0x00000000,
-        0x00000000, 0x8f820030, 0x93840010, 0x8f850028, 0x10400005, 0x3c038000,
-        0x8f421000, 0x00431024, 0x1040fffd, 0x00000000, 0x2483000a, 0x30620007,
-        0x10400002, 0x24620007, 0x304303f8, 0x00a31021, 0x30421fff, 0xaf850018,
-        0xaf820028, 0xaf420084, 0x97430104, 0x24424000, 0x0342d821, 0x3063ffff,
-        0x30620007, 0x10400002, 0x24620007, 0x3043fff8, 0x8f820044, 0x8f840004,
-        0x00431821, 0xaf82002c, 0x0064102b, 0xaf830044, 0x14400002, 0x00641023,
-        0xaf820044, 0x8f840044, 0x34028000, 0x8fbf0014, 0x8fb00010, 0x00821021,
-        0x03421821, 0x3c021000, 0xaf83001c, 0xaf440080, 0xaf420178, 0x03e00008,
-        0x27bd0018, 0x3c026000, 0x8c444448, 0x3c030800, 0xac64082c, 0x8f620000,
-        0x97430104, 0x3c048000, 0x3046ffff, 0x3067ffff, 0x8f420178, 0x00441024,
-        0x1440fffd, 0x2402000a, 0x30c30007, 0xa7420140, 0x24020008, 0x00431023,
-        0x30420007, 0x24c3fffe, 0xa7420142, 0xa7430144, 0xa7400146, 0xa7470148,
-        0x8f420108, 0x3c036000, 0x8f850034, 0x30420020, 0x0002102b, 0x00021023,
-        0x30420009, 0x34420001, 0xa742014a, 0x8c644448, 0x3c020800, 0x30a50006,
-        0xac440830, 0x24020002, 0x10a2000d, 0x2ca20003, 0x10400005, 0x24020004,
-        0x10a00011, 0x3c020041, 0x0a0004a8, 0x00000000, 0x10a20007, 0x24020006,
-        0x14a2000d, 0x3c020151, 0x0a0004a2, 0x24030001, 0x0a0004a1, 0x3c020141,
-        0x3c020051, 0x24030001, 0xaf421000, 0xaf830030, 0x0a0004a8, 0x00000000,
-        0xaf421000, 0xaf800030, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-        0x8f820030, 0x24c30008, 0x10400006, 0x30e6ffff, 0x3c048000, 0x8f421000,
-        0x00441024, 0x1040fffd, 0x00000000, 0x3c026000, 0x8c444448, 0x3065ffff,
-        0x3c020800, 0x30a30007, 0x10600003, 0xac440834, 0x24a20007, 0x3045fff8,
-        0x8f840028, 0x00851021, 0x30421fff, 0x24434000, 0x0343d821, 0x30c30007,
-        0xaf840018, 0xaf820028, 0xaf420084, 0x10600002, 0x24c20007, 0x3046fff8,
-        0x8f820044, 0x8f840004, 0x00461821, 0xaf82002c, 0x0064102b, 0xaf830044,
-        0x14400002, 0x00641023, 0xaf820044, 0x8f840044, 0x34028000, 0x3c030800,
-        0x8c650844, 0x00821021, 0x03421821, 0xaf83001c, 0xaf440080, 0x10a00006,
-        0x2402000e, 0x93830043, 0x14620004, 0x3c021000, 0x2402043f, 0xa7420148,
-        0x3c021000, 0x3c036000, 0xaf420178, 0x8c644448, 0x3c020800, 0x03e00008,
-        0xac440838, 0x8f820034, 0x30424000, 0x10400005, 0x24020800, 0x0000000d,
-        0x00000000, 0x24000405, 0x24020800, 0xaf420178, 0x97440104, 0x3c030008,
-        0xaf430140, 0x8f820034, 0x30420001, 0x10400006, 0x3085ffff, 0x24020002,
-        0x24a3fffe, 0xa7420146, 0x0a0004ff, 0xa7430148, 0xa7400146, 0x8f840028,
-        0x2402000d, 0xa742014a, 0x24830008, 0x30631fff, 0x24624000, 0x0342d821,
-        0x30a20007, 0xaf840018, 0xaf830028, 0xaf430084, 0x10400002, 0x24a20007,
-        0x3045fff8, 0x8f820044, 0x8f840004, 0x00451821, 0xaf82002c, 0x0064102b,
-        0xaf830044, 0x14400002, 0x00641023, 0xaf820044, 0x8f840044, 0x34028000,
-        0x00821021, 0x03421821, 0x3c021000, 0xaf83001c, 0xaf440080, 0x03e00008,
-        0xaf420178, 0x27bdffe8, 0x3c046008, 0xafbf0014, 0xafb00010, 0x8c825000,
-        0x3c1a8000, 0x2403ff7f, 0x375b4000, 0x00431024, 0x3442380c, 0xac825000,
-        0x8f430008, 0x3c100800, 0x37428000, 0x34630001, 0xaf430008, 0xaf82001c,
-        0x3c02601c, 0xaf800028, 0xaf400080, 0xaf400084, 0x8c450008, 0x3c036000,
-        0x8c620808, 0x3c040800, 0x3c030080, 0xac830820, 0x3042fff0, 0x38420010,
-        0x2c420001, 0xaf850004, 0xaf820008, 0x0e00062f, 0x00000000, 0x8f420000,
-        0x30420001, 0x1040fffb, 0x00000000, 0x8f440108, 0x30822000, 0xaf840034,
-        0x10400004, 0x8e02083c, 0x24420001, 0x0a00059d, 0xae02083c, 0x30820200,
-        0x10400027, 0x00000000, 0x97420104, 0x1040001c, 0x30824000, 0x14400005,
-        0x00000000, 0x0e00022d, 0x00000000, 0x0a000592, 0x00000000, 0x8f620008,
-        0x8f630000, 0x24020030, 0x00031e02, 0x306300f0, 0x10620007, 0x28620031,
-        0x14400031, 0x24020040, 0x10620007, 0x00000000, 0x0a000592, 0x00000000,
-        0x0e0002dd, 0x00000000, 0x0a000592, 0x00000000, 0x0e0003b8, 0x00000000,
-        0x0a000592, 0x00000000, 0x30820040, 0x1440002d, 0x00000000, 0x0000000d,
-        0x00000000, 0x240004a6, 0x0a00059d, 0x00000000, 0x8f430100, 0x24020d00,
-        0x1462000f, 0x30820006, 0x97420104, 0x10400005, 0x30820040, 0x0e0004e9,
-        0x00000000, 0x0a000592, 0x00000000, 0x1440001b, 0x00000000, 0x0000000d,
-        0x00000000, 0x240004b8, 0x0a00059d, 0x00000000, 0x1040000e, 0x30821000,
-        0x10400005, 0x00000000, 0x0e00065d, 0x00000000, 0x0a000592, 0x00000000,
-        0x0e00046b, 0x00000000, 0x8f820040, 0x24420001, 0xaf820040, 0x0a00059d,
-        0x00000000, 0x30820040, 0x14400004, 0x00000000, 0x0000000d, 0x00000000,
-        0x240004cf, 0x8f420138, 0x3c034000, 0x00431025, 0xaf420138, 0x0a00053f,
-        0x00000000, 0x3c046008, 0x8c835000, 0x3c1a8000, 0x2402ff7f, 0x375b4000,
-        0x00621824, 0x3463380c, 0xac835000, 0x8f420008, 0x3c056000, 0x3c03601c,
-        0x34420001, 0xaf420008, 0x37428000, 0xaf800028, 0xaf82001c, 0xaf400080,
-        0xaf400084, 0x8c660008, 0x8ca20808, 0x3c040800, 0x3c030080, 0xac830820,
-        0x3042fff0, 0x38420010, 0x2c420001, 0xaf860004, 0xaf820008, 0x03e00008,
-        0x00000000, 0x3084ffff, 0x30820007, 0x10400002, 0x24820007, 0x3044fff8,
-        0x8f820028, 0x00441821, 0x30631fff, 0x24644000, 0x0344d821, 0xaf820018,
-        0xaf830028, 0x03e00008, 0xaf430084, 0x3084ffff, 0x30820007, 0x10400002,
-        0x24820007, 0x3044fff8, 0x8f820044, 0x8f830004, 0x00442021, 0xaf82002c,
-        0x0083102b, 0xaf840044, 0x14400002, 0x00831023, 0xaf820044, 0x8f820044,
-        0x34038000, 0x00431821, 0x03432021, 0xaf84001c, 0x03e00008, 0xaf420080,
-        0x8f830034, 0x24020002, 0x30630006, 0x1062000d, 0x2c620003, 0x50400005,
-        0x24020004, 0x10600012, 0x3c020001, 0x0a000601, 0x00000000, 0x10620007,
-        0x24020006, 0x1462000f, 0x3c020111, 0x0a0005f9, 0x00821025, 0x0a0005f8,
-        0x3c020101, 0x3c020011, 0x00821025, 0x24030001, 0xaf421000, 0xaf830030,
-        0x0a000601, 0x00000000, 0x00821025, 0xaf421000, 0xaf800030, 0x00000000,
-        0x00000000, 0x00000000, 0x03e00008, 0x00000000, 0x8f820030, 0x10400005,
-        0x3c038000, 0x8f421000, 0x00431024, 0x1040fffd, 0x00000000, 0x03e00008,
-        0x00000000, 0x8f820034, 0x27bdffe8, 0x30424000, 0x14400005, 0xafbf0010,
-        0x0e00022d, 0x00000000, 0x0a00062d, 0x8fbf0010, 0x8f620008, 0x8f630000,
-        0x24020030, 0x00031e02, 0x306300f0, 0x10620008, 0x28620031, 0x1440000d,
-        0x8fbf0010, 0x24020040, 0x10620007, 0x00000000, 0x0a00062d, 0x00000000,
-        0x0e0002dd, 0x00000000, 0x0a00062d, 0x8fbf0010, 0x0e0003b8, 0x00000000,
-        0x8fbf0010, 0x03e00008, 0x27bd0018, 0x8f84003c, 0x1080000f, 0x3c026000,
-        0x8c430c3c, 0x30630fff, 0xaf830014, 0x14600011, 0x3082000f, 0x10400005,
-        0x308200f0, 0x10400003, 0x30820f00, 0x14400006, 0x00000000, 0x0000000d,
-        0x00000000, 0x2400050e, 0x03e00008, 0x00000000, 0x0000000d, 0x00000000,
-        0x24000513, 0x03e00008, 0x00000000, 0xaf83003c, 0x03e00008, 0x00000000,
-        0x10c00007, 0x00000000, 0x8ca20000, 0x24c6ffff, 0x24a50004, 0xac820000,
-        0x14c0fffb, 0x24840004, 0x03e00008, 0x00000000, 0x0a000659, 0x00a01021,
-        0xac860000, 0x24840004, 0x00a01021, 0x1440fffc, 0x24a5ffff, 0x03e00008,
-        0x00000000, 0x0000000d, 0x03e00008, 0x00000000, 0x3c040800, 0x8c82084c,
-        0x54400007, 0xac80084c, 0x8f820034, 0x24030400, 0x30420c00, 0x1443005b,
-        0x00000000, 0xac80084c, 0x0000000d, 0x00000000, 0x2400003c, 0x3c026000,
-        0x8c444448, 0x3c030800, 0xac640850, 0x24000043, 0x97420104, 0x3045ffff,
-        0x000530c2, 0x24a2007f, 0x000239c2, 0x2400004e, 0x3c046020, 0x24030020,
-        0xac830000, 0x8c820000, 0x30420020, 0x10400005, 0x3c036020, 0x8c620000,
-        0x30420020, 0x1440fffd, 0x00000000, 0x3c026020, 0x8c430010, 0x24040001,
-        0x0087102b, 0x30ea007f, 0x24abfffe, 0x10400010, 0x00034240, 0x3c056020,
-        0x24090020, 0xaca90000, 0x8ca20000, 0x30420020, 0x10400006, 0x24840001,
-        0x3c036020, 0x8c620000, 0x30420020, 0x1440fffd, 0x00000000, 0x0087102b,
-        0x1440fff4, 0x00000000, 0x8f85001c, 0x3c026020, 0x8c430010, 0x3c046020,
-        0x34848000, 0x006a1825, 0x01034025, 0x2400006b, 0x10c0000b, 0x00000000,
-        0x8ca30000, 0x24a50004, 0x8ca20000, 0x24a50004, 0x24c6ffff, 0xac820000,
-        0x24840004, 0xac830000, 0x14c0fff7, 0x24840004, 0x24000077, 0x3c020007,
-        0x34427700, 0x3c036000, 0xac6223c8, 0xac6b23cc, 0xac6823e4, 0x24000086,
-        0x3c046000, 0x3c038000, 0x8c8223f8, 0x00431024, 0x1440fffd, 0x3c021000,
-        0x3c056000, 0x24030019, 0xaca223f8, 0xa743014a, 0x8ca44448, 0x3c020800,
-        0xac440854, 0x03e00008, 0x00000000, 0x00000000 };
+        0x8f820024, 0x30420001, 0x10400007, 0x3069ffff, 0x24020002, 0x2523fffe,
+        0xa7420146, 0xa7430148, 0x0a000242, 0x3c020800, 0xa7400146, 0x3c020800,
+        0x8c43083c, 0x1460000e, 0x24020f00, 0x8f820024, 0x30430020, 0x0003182b,
+        0x00031823, 0x30650009, 0x30420c00, 0x24030400, 0x14430002, 0x34a40001,
+        0x34a40005, 0xa744014a, 0x0a000264, 0x3c020800, 0x8f830014, 0x14620008,
+        0x00000000, 0x8f820024, 0x30420020, 0x0002102b, 0x00021023, 0x3042000d,
+        0x0a000262, 0x34420005, 0x8f820024, 0x30420020, 0x0002102b, 0x00021023,
+        0x30420009, 0x34420001, 0xa742014a, 0x3c020800, 0x8c430820, 0x8f840024,
+        0x3c020048, 0x00621825, 0x30840006, 0x24020002, 0x1082000d, 0x2c820003,
+        0x50400005, 0x24020004, 0x10800012, 0x3c020001, 0x0a000284, 0x00000000,
+        0x10820007, 0x24020006, 0x1482000f, 0x3c020111, 0x0a00027c, 0x00621025,
+        0x0a00027b, 0x3c020101, 0x3c020011, 0x00621025, 0x24030001, 0xaf421000,
+        0xaf830020, 0x0a000284, 0x00000000, 0x00621025, 0xaf421000, 0xaf800020,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x8f830020, 0x1060003f,
+        0x3c048000, 0x8f421000, 0x00441024, 0x1040fffd, 0x00000000, 0x10600039,
+        0x00000000, 0x8f421000, 0x3c030020, 0x00431024, 0x10400034, 0x00000000,
+        0x97421014, 0x14400031, 0x00000000, 0x97421008, 0x8f840010, 0x24420006,
+        0x00024082, 0x00081880, 0x00643821, 0x8ce50000, 0x30430003, 0x30420001,
+        0x10400004, 0x00000000, 0x0000000d, 0x0a0002c3, 0x00081080, 0x5460000f,
+        0x30a5ffff, 0x3c06ffff, 0x00a62824, 0x0005182b, 0x00a61026, 0x0002102b,
+        0x00621824, 0x10600004, 0x00000000, 0x0000000d, 0x00000000, 0x240001fb,
+        0x8ce20000, 0x0a0002c2, 0x00462825, 0x0005182b, 0x38a2ffff, 0x0002102b,
+        0x00621824, 0x10600004, 0x00000000, 0x0000000d, 0x00000000, 0x24000205,
+        0x8ce20000, 0x3445ffff, 0x00081080, 0x00441021, 0x3c030800, 0xac450000,
+        0x8c620830, 0x24420001, 0xac620830, 0x8f840018, 0x01202821, 0x24820008,
+        0x30421fff, 0x24434000, 0x0343d821, 0x30a30007, 0xaf84000c, 0xaf820018,
+        0xaf420084, 0x10600002, 0x24a20007, 0x3045fff8, 0x8f820030, 0x8f840000,
+        0x00451821, 0xaf82001c, 0x0064102b, 0xaf830030, 0x14400002, 0x00641023,
+        0xaf820030, 0x8f840030, 0x34028000, 0x00821021, 0x03421821, 0x3c021000,
+        0xaf830010, 0xaf440080, 0x03e00008, 0xaf420178, 0x8f830024, 0x27bdffe0,
+        0xafbf0018, 0xafb10014, 0x30620200, 0x14400004, 0xafb00010, 0x0000000d,
+        0x00000000, 0x24000242, 0x00031a82, 0x30630003, 0x000310c0, 0x00431021,
+        0x00021080, 0x00431021, 0x00021080, 0x3c030800, 0x24631aa0, 0x00438821,
+        0x8e240000, 0x10800004, 0x00000000, 0x0000000d, 0x00000000, 0x2400024d,
+        0x8f850010, 0x24020001, 0xae220000, 0x8ca70008, 0xa2200007, 0x8f620004,
+        0x26300014, 0x02002021, 0x00021402, 0xa2220004, 0x304600ff, 0x24c60005,
+        0x0e000673, 0x00063082, 0x8f620004, 0xa6220008, 0x8f430108, 0x3c021000,
+        0x00621824, 0x10600008, 0x00000000, 0x97420104, 0x92230007, 0x2442ffec,
+        0x3045ffff, 0x34630002, 0x0a000321, 0xa2230007, 0x97420104, 0x2442fff0,
+        0x3045ffff, 0x8f620004, 0x3042ffff, 0x2c420013, 0x54400005, 0x92230007,
+        0x92220007, 0x34420001, 0xa2220007, 0x92230007, 0x24020001, 0x10620009,
+        0x28620002, 0x14400014, 0x24020002, 0x10620012, 0x24020003, 0x1062000a,
+        0x00000000, 0x0a000342, 0x00000000, 0x8f820010, 0x8c43000c, 0x3c04ffff,
+        0x00641824, 0x00651825, 0x0a000342, 0xac43000c, 0x8f820010, 0x8c430010,
+        0x3c04ffff, 0x00641824, 0x00651825, 0xac430010, 0x8f620004, 0x3042ffff,
+        0x24420002, 0x00021083, 0xa2220005, 0x304500ff, 0x8f820010, 0x3c04ffff,
+        0x00052880, 0x00a22821, 0x8ca70000, 0x96220008, 0x97430104, 0x00e42024,
+        0x24420002, 0x00621823, 0x00833825, 0xaca70000, 0x92240005, 0x00041080,
+        0x02021021, 0x90430000, 0x3c05fff6, 0x34a5ffff, 0x3063000f, 0x00832021,
+        0xa2240006, 0x308200ff, 0x24420003, 0x00021080, 0x02021021, 0x8c460000,
+        0x308300ff, 0x8f820010, 0x3c04ff3f, 0x00031880, 0x00c53824, 0x00621821,
+        0xae26000c, 0xac67000c, 0x8e22000c, 0x92230006, 0x3484ffff, 0x00441024,
+        0x24630003, 0x00031880, 0x02031821, 0x00e42024, 0xae22000c, 0xac640000,
+        0x92220006, 0x24420004, 0x00021080, 0x02021021, 0x94470002, 0xac470000,
+        0x92230006, 0x8f820010, 0x00031880, 0x00621821, 0x24020010, 0xac670010,
+        0x24030002, 0xa7420140, 0xa7400142, 0xa7400144, 0xa7430146, 0x97420104,
+        0x24030001, 0x2442fffe, 0xa7420148, 0xa743014a, 0x8f820024, 0x24030002,
+        0x30440006, 0x1083000d, 0x2c820003, 0x10400005, 0x24020004, 0x10800011,
+        0x3c020009, 0x0a0003a5, 0x00000000, 0x10820007, 0x24020006, 0x1482000d,
+        0x3c020119, 0x0a00039f, 0x24030001, 0x0a00039e, 0x3c020109, 0x3c020019,
+        0x24030001, 0xaf421000, 0xaf830020, 0x0a0003a5, 0x00000000, 0xaf421000,
+        0xaf800020, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x92220004,
+        0x24030008, 0x8f840020, 0x24420002, 0x30420007, 0x00621823, 0x30630007,
+        0x10800006, 0xae230010, 0x3c038000, 0x8f421000, 0x00431024, 0x1040fffd,
+        0x00000000, 0x8f820018, 0xaf82000c, 0x24420010, 0x30421fff, 0xaf820018,
+        0xaf420084, 0x97430104, 0x24424000, 0x0342d821, 0x3063ffff, 0x30620007,
+        0x10400002, 0x24620007, 0x3043fff8, 0x8f820030, 0x8f840000, 0x00431821,
+        0xaf82001c, 0x0064102b, 0xaf830030, 0x14400002, 0x00641023, 0xaf820030,
+        0x8f840030, 0x34028000, 0x8fbf0018, 0x8fb10014, 0x8fb00010, 0x00821021,
+        0x03421821, 0x3c021000, 0xaf830010, 0xaf440080, 0xaf420178, 0x03e00008,
+        0x27bd0020, 0x8f830024, 0x27bdffe0, 0xafbf0018, 0xafb10014, 0x30620200,
+        0x14400004, 0xafb00010, 0x0000000d, 0x00000000, 0x240002e4, 0x00031a82,
+        0x30630003, 0x000310c0, 0x00431021, 0x00021080, 0x00431021, 0x00021080,
+        0x3c030800, 0x24631aa0, 0x00438021, 0x8e040000, 0x14800004, 0x00000000,
+        0x0000000d, 0x00000000, 0x240002e9, 0x8f620004, 0x04410008, 0x26050014,
+        0x92020006, 0x8e03000c, 0x24420003, 0x00021080, 0x00a21021, 0xac430000,
+        0xae000000, 0x92020005, 0x24420001, 0x00021080, 0x00a21021, 0x8c430000,
+        0x3c040001, 0x00641821, 0xac430000, 0x92060004, 0x27710008, 0x02202021,
+        0x24c60005, 0x0e000673, 0x00063082, 0x92040006, 0x3c057fff, 0x8f620004,
+        0x00042080, 0x00912021, 0x8c830004, 0x34a5ffff, 0x00451024, 0x00621821,
+        0xac830004, 0x92050005, 0x3c07ffff, 0x92040004, 0x00052880, 0x00b12821,
+        0x8ca30000, 0x97420104, 0x96060008, 0x00671824, 0x00441021, 0x00461023,
+        0x3042ffff, 0x00621825, 0xaca30000, 0x92030007, 0x24020001, 0x1062000a,
+        0x28620002, 0x1440001d, 0x2402000a, 0x24020002, 0x10620019, 0x24020003,
+        0x1062000e, 0x2402000a, 0x0a000447, 0x00000000, 0x92020004, 0x97430104,
+        0x8e24000c, 0x00621821, 0x2463fff2, 0x3063ffff, 0x00872024, 0x00832025,
+        0xae24000c, 0x0a000447, 0x2402000a, 0x92020004, 0x97430104, 0x8e240010,
+        0x00621821, 0x2463ffee, 0x3063ffff, 0x00872024, 0x00832025, 0xae240010,
+        0x2402000a, 0xa7420140, 0x96030012, 0x8f840024, 0xa7430142, 0x92020004,
+        0xa7420144, 0xa7400146, 0x97430104, 0x30840006, 0x24020001, 0xa7430148,
+        0xa742014a, 0x24020002, 0x1082000d, 0x2c820003, 0x10400005, 0x24020004,
+        0x10800011, 0x3c020041, 0x0a00046c, 0x00000000, 0x10820007, 0x24020006,
+        0x1482000d, 0x3c020151, 0x0a000466, 0x24030001, 0x0a000465, 0x3c020141,
+        0x3c020051, 0x24030001, 0xaf421000, 0xaf830020, 0x0a00046c, 0x00000000,
+        0xaf421000, 0xaf800020, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x8f820020, 0x8f840018, 0x10400006, 0x92030004, 0x3c058000, 0x8f421000,
+        0x00451024, 0x1040fffd, 0x00000000, 0x2463000a, 0x30620007, 0x10400002,
+        0x24620007, 0x304303f8, 0x00831021, 0x30421fff, 0xaf84000c, 0xaf820018,
+        0xaf420084, 0x97430104, 0x24424000, 0x0342d821, 0x3063ffff, 0x30620007,
+        0x10400002, 0x24620007, 0x3043fff8, 0x8f820030, 0x8f840000, 0x00431821,
+        0xaf82001c, 0x0064102b, 0xaf830030, 0x14400002, 0x00641023, 0xaf820030,
+        0x8f840030, 0x34028000, 0x8fbf0018, 0x8fb10014, 0x8fb00010, 0x00821021,
+        0x03421821, 0x3c021000, 0xaf830010, 0xaf440080, 0xaf420178, 0x03e00008,
+        0x27bd0020, 0x8f620000, 0x97430104, 0x3c048000, 0x3045ffff, 0x3066ffff,
+        0x8f420178, 0x00441024, 0x1440fffd, 0x2402000a, 0x30a30007, 0xa7420140,
+        0x24020008, 0x00431023, 0x30420007, 0x24a3fffe, 0xa7420142, 0xa7430144,
+        0xa7400146, 0xa7460148, 0x8f420108, 0x8f830024, 0x30420020, 0x0002102b,
+        0x00021023, 0x30420009, 0x34420001, 0x30630006, 0xa742014a, 0x24020002,
+        0x1062000d, 0x2c620003, 0x10400005, 0x24020004, 0x10600011, 0x3c020041,
+        0x0a0004d6, 0x00000000, 0x10620007, 0x24020006, 0x1462000d, 0x3c020151,
+        0x0a0004d0, 0x24030001, 0x0a0004cf, 0x3c020141, 0x3c020051, 0x24030001,
+        0xaf421000, 0xaf830020, 0x0a0004d6, 0x00000000, 0xaf421000, 0xaf800020,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x8f820020, 0x24a30008,
+        0x8f850018, 0x10400006, 0x30c6ffff, 0x3c048000, 0x8f421000, 0x00441024,
+        0x1040fffd, 0x00000000, 0x3063ffff, 0x30620007, 0x10400002, 0x24620007,
+        0x3043fff8, 0x00a31021, 0x30421fff, 0x24434000, 0x0343d821, 0x00c02021,
+        0x30830007, 0xaf85000c, 0xaf820018, 0xaf420084, 0x10600002, 0x24820007,
+        0x3044fff8, 0x8f820030, 0x8f850000, 0x00441821, 0xaf82001c, 0x0065102b,
+        0xaf830030, 0x14400002, 0x00651023, 0xaf820030, 0x8f840030, 0x34028000,
+        0x3c030800, 0x8c650834, 0x00821021, 0x03421821, 0xaf830010, 0xaf440080,
+        0x10a00006, 0x2402000e, 0x9383002f, 0x14620004, 0x3c021000, 0x2402043f,
+        0xa7420148, 0x3c021000, 0x03e00008, 0xaf420178, 0x8f820024, 0x30424000,
+        0x10400005, 0x24020800, 0x0000000d, 0x00000000, 0x2400040e, 0x24020800,
+        0xaf420178, 0x97440104, 0x3c030008, 0xaf430140, 0x8f820024, 0x30420001,
+        0x10400006, 0x3085ffff, 0x24020002, 0x24a3fffe, 0xa7420146, 0x0a000526,
+        0xa7430148, 0xa7400146, 0x8f840018, 0x2402000d, 0xa742014a, 0x24830008,
+        0x30631fff, 0x24624000, 0x0342d821, 0x30a20007, 0xaf84000c, 0xaf830018,
+        0xaf430084, 0x10400002, 0x24a20007, 0x3045fff8, 0x8f820030, 0x8f840000,
+        0x00451821, 0xaf82001c, 0x0064102b, 0xaf830030, 0x14400002, 0x00641023,
+        0xaf820030, 0x8f840030, 0x34028000, 0x00821021, 0x03421821, 0x3c021000,
+        0xaf830010, 0xaf440080, 0x03e00008, 0xaf420178, 0x27bdffe8, 0x3c046008,
+        0xafbf0014, 0xafb00010, 0x8c825000, 0x3c1a8000, 0x2403ff7f, 0x375b4000,
+        0x00431024, 0x3442380c, 0xac825000, 0x8f430008, 0x3c100800, 0x37428000,
+        0x34630001, 0xaf430008, 0xaf820010, 0x3c02601c, 0xaf800018, 0xaf400080,
+        0xaf400084, 0x8c450008, 0x3c036000, 0x8c620808, 0x3c040800, 0x3c030080,
+        0xac830820, 0x3042fff0, 0x38420010, 0x2c420001, 0xaf850000, 0xaf820004,
+        0x0e000658, 0x00000000, 0x8f420000, 0x30420001, 0x1040fffb, 0x00000000,
+        0x8f430108, 0x8f440100, 0x30622000, 0xaf830024, 0xaf840014, 0x10400004,
+        0x8e02082c, 0x24420001, 0x0a0005c6, 0xae02082c, 0x30620200, 0x14400003,
+        0x24020f00, 0x14820027, 0x24020d00, 0x97420104, 0x1040001c, 0x30624000,
+        0x14400005, 0x00000000, 0x0e00022f, 0x00000000, 0x0a0005bb, 0x00000000,
+        0x8f620008, 0x8f630000, 0x24020030, 0x00031e02, 0x306300f0, 0x10620007,
+        0x28620031, 0x1440002f, 0x24020040, 0x10620007, 0x00000000, 0x0a0005bb,
+        0x00000000, 0x0e0002e8, 0x00000000, 0x0a0005bb, 0x00000000, 0x0e0003db,
+        0x00000000, 0x0a0005bb, 0x00000000, 0x30620040, 0x1440002b, 0x00000000,
+        0x0000000d, 0x00000000, 0x240004b2, 0x0a0005c6, 0x00000000, 0x1482000f,
+        0x30620006, 0x97420104, 0x10400005, 0x30620040, 0x0e000510, 0x00000000,
+        0x0a0005bb, 0x00000000, 0x1440001b, 0x00000000, 0x0000000d, 0x00000000,
+        0x240004c4, 0x0a0005c6, 0x00000000, 0x1040000e, 0x30621000, 0x10400005,
+        0x00000000, 0x0e000688, 0x00000000, 0x0a0005bb, 0x00000000, 0x0e0004a1,
+        0x00000000, 0x8f82002c, 0x24420001, 0xaf82002c, 0x0a0005c6, 0x00000000,
+        0x30620040, 0x14400004, 0x00000000, 0x0000000d, 0x00000000, 0x240004db,
+        0x8f420138, 0x3c034000, 0x00431025, 0xaf420138, 0x0a000566, 0x00000000,
+        0x3c046008, 0x8c835000, 0x3c1a8000, 0x2402ff7f, 0x375b4000, 0x00621824,
+        0x3463380c, 0xac835000, 0x8f420008, 0x3c056000, 0x3c03601c, 0x34420001,
+        0xaf420008, 0x37428000, 0xaf800018, 0xaf820010, 0xaf400080, 0xaf400084,
+        0x8c660008, 0x8ca20808, 0x3c040800, 0x3c030080, 0xac830820, 0x3042fff0,
+        0x38420010, 0x2c420001, 0xaf860000, 0xaf820004, 0x03e00008, 0x00000000,
+        0x3084ffff, 0x30820007, 0x10400002, 0x24820007, 0x3044fff8, 0x8f820018,
+        0x00441821, 0x30631fff, 0x24644000, 0x0344d821, 0xaf82000c, 0xaf830018,
+        0x03e00008, 0xaf430084, 0x3084ffff, 0x30820007, 0x10400002, 0x24820007,
+        0x3044fff8, 0x8f820030, 0x8f830000, 0x00442021, 0xaf82001c, 0x0083102b,
+        0xaf840030, 0x14400002, 0x00831023, 0xaf820030, 0x8f820030, 0x34038000,
+        0x00431821, 0x03432021, 0xaf840010, 0x03e00008, 0xaf420080, 0x8f830024,
+        0x24020002, 0x30630006, 0x1062000d, 0x2c620003, 0x50400005, 0x24020004,
+        0x10600012, 0x3c020001, 0x0a00062a, 0x00000000, 0x10620007, 0x24020006,
+        0x1462000f, 0x3c020111, 0x0a000622, 0x00821025, 0x0a000621, 0x3c020101,
+        0x3c020011, 0x00821025, 0x24030001, 0xaf421000, 0xaf830020, 0x0a00062a,
+        0x00000000, 0x00821025, 0xaf421000, 0xaf800020, 0x00000000, 0x00000000,
+        0x00000000, 0x03e00008, 0x00000000, 0x8f820020, 0x10400005, 0x3c038000,
+        0x8f421000, 0x00431024, 0x1040fffd, 0x00000000, 0x03e00008, 0x00000000,
+        0x8f820024, 0x27bdffe8, 0x30424000, 0x14400005, 0xafbf0010, 0x0e00022f,
+        0x00000000, 0x0a000656, 0x8fbf0010, 0x8f620008, 0x8f630000, 0x24020030,
+        0x00031e02, 0x306300f0, 0x10620008, 0x28620031, 0x1440000d, 0x8fbf0010,
+        0x24020040, 0x10620007, 0x00000000, 0x0a000656, 0x00000000, 0x0e0002e8,
+        0x00000000, 0x0a000656, 0x8fbf0010, 0x0e0003db, 0x00000000, 0x8fbf0010,
+        0x03e00008, 0x27bd0018, 0x8f840028, 0x1080000f, 0x3c026000, 0x8c430c3c,
+        0x30630fff, 0xaf830008, 0x14600011, 0x3082000f, 0x10400005, 0x308200f0,
+        0x10400003, 0x30820f00, 0x14400006, 0x00000000, 0x0000000d, 0x00000000,
+        0x2400051a, 0x03e00008, 0x00000000, 0x0000000d, 0x00000000, 0x2400051f,
+        0x03e00008, 0x00000000, 0xaf830028, 0x03e00008, 0x00000000, 0x10c00007,
+        0x00000000, 0x8ca20000, 0x24c6ffff, 0x24a50004, 0xac820000, 0x14c0fffb,
+        0x24840004, 0x03e00008, 0x00000000, 0x0a000684, 0x00a01021, 0xac860000,
+        0x00000000, 0x00000000, 0x24840004, 0x00a01021, 0x1440fffa, 0x24a5ffff,
+        0x03e00008, 0x00000000, 0x0000000d, 0x03e00008, 0x00000000, 0x00000000};
 
-static u32 bnx2_TPAT_b06FwData[(0x0/4) + 1] = { 0x00000000 };
-static u32 bnx2_TPAT_b06FwRodata[(0x0/4) + 1] = { 0x00000000 };
-static u32 bnx2_TPAT_b06FwBss[(0x80/4) + 1] = { 0x00000000 };
-static u32 bnx2_TPAT_b06FwSbss[(0x48/4) + 1] = { 0x00000000 };
+static u32 bnx2_TPAT_b06FwData[(0x0/4) + 1] = { 0x0 };
+static u32 bnx2_TPAT_b06FwRodata[(0x0/4) + 1] = { 0x0 };
+static u32 bnx2_TPAT_b06FwBss[(0x250/4) + 1] = { 0x0 };
+static u32 bnx2_TPAT_b06FwSbss[(0x34/4) + 1] = { 0x0 };
 
-static int bnx2_TXP_b06FwReleaseMajor = 0x0;
+static int bnx2_TXP_b06FwReleaseMajor = 0x1;
 static int bnx2_TXP_b06FwReleaseMinor = 0x0;
 static int bnx2_TXP_b06FwReleaseFix = 0x0;
-static u32 bnx2_TXP_b06FwStartAddr = 0x08002090;
+static u32 bnx2_TXP_b06FwStartAddr = 0x080034b0;
 static u32 bnx2_TXP_b06FwTextAddr = 0x08000000;
-static int bnx2_TXP_b06FwTextLen = 0x3ffc;
-static u32 bnx2_TXP_b06FwDataAddr = 0x08004020;
+static int bnx2_TXP_b06FwTextLen = 0x5748;
+static u32 bnx2_TXP_b06FwDataAddr = 0x08005760;
 static int bnx2_TXP_b06FwDataLen = 0x0;
 static u32 bnx2_TXP_b06FwRodataAddr = 0x00000000;
 static int bnx2_TXP_b06FwRodataLen = 0x0;
-static u32 bnx2_TXP_b06FwBssAddr = 0x08004060;
-static int bnx2_TXP_b06FwBssLen = 0x194;
-static u32 bnx2_TXP_b06FwSbssAddr = 0x08004020;
-static int bnx2_TXP_b06FwSbssLen = 0x34;
-static u32 bnx2_TXP_b06FwText[(0x3ffc/4) + 1] = {
-        0x0a000824, 0x00000000, 0x00000000, 0x0000000d, 0x74787020, 0x302e362e,
-        0x39000000, 0x00060900, 0x0000000a, 0x000003e8, 0x0000ea60, 0x00000000,
+static u32 bnx2_TXP_b06FwBssAddr = 0x080057a0;
+static int bnx2_TXP_b06FwBssLen = 0x1c4;
+static u32 bnx2_TXP_b06FwSbssAddr = 0x08005760;
+static int bnx2_TXP_b06FwSbssLen = 0x38;
+static u32 bnx2_TXP_b06FwText[(0x5748/4) + 1] = {
+        0x0a000d2c, 0x00000000, 0x00000000, 0x0000000d, 0x74787020, 0x322e352e,
+        0x38000000, 0x02050800, 0x0000000a, 0x000003e8, 0x0000ea60, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
         0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
         0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
         0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
@@ -2124,55 +2983,164 @@ static u32 bnx2_TXP_b06FwText[(0x3ffc/4) + 1] = {
         0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
         0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
         0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-        0x00000000, 0x00000000, 0x00000000, 0x10000003, 0x00000000, 0x0000000d,
-        0x0000000d, 0x3c020800, 0x24424020, 0x3c030800, 0x246341f4, 0xac400000,
-        0x0043202b, 0x1480fffd, 0x24420004, 0x3c1d0800, 0x37bd7ffc, 0x03a0f021,
-        0x3c100800, 0x26102090, 0x3c1c0800, 0x279c4020, 0x0e000a0e, 0x00000000,
-        0x0000000d, 0x8f840014, 0x27bdffe8, 0xafb00010, 0x8f460104, 0x8f830008,
-        0x8c8500ac, 0xaf430080, 0x948200a8, 0xa7420e10, 0x948300aa, 0xa7430e12,
-        0x8c8200ac, 0xaf420e18, 0x97430e10, 0xa7430e14, 0x97420e12, 0xa7420e16,
-        0x8f430e18, 0x00005021, 0x00c53023, 0x10c001a3, 0xaf430e1c, 0x240f0800,
-        0x3c0e1000, 0x2419fff8, 0x24100010, 0x3c188100, 0x93620008, 0x10400009,
-        0x00000000, 0x97620010, 0x00c2102b, 0x14400005, 0x00000000, 0x97620010,
-        0x3042ffff, 0x0a000862, 0xaf420e00, 0xaf460e00, 0x8f420000, 0x30420008,
-        0x1040fffd, 0x00000000, 0x97420e08, 0x8f450e04, 0x3044ffff, 0x30820001,
-        0x14400005, 0x00000000, 0x14a00005, 0x3083a040, 0x0a0009e6, 0x00000000,
-        0x0000000d, 0x3083a040, 0x24020040, 0x14620049, 0x3082a000, 0x8f87000c,
-        0x30880036, 0x30890008, 0xaf4f0178, 0x00e01821, 0x9742008a, 0x00431023,
-        0x2442ffff, 0x30421fff, 0x2c420008, 0x1440fffa, 0x00000000, 0x8f830018,
-        0x00a05021, 0x00c53023, 0x24e24000, 0x03422821, 0x306b00ff, 0x24630001,
-        0xaf830018, 0x93840012, 0x000b1400, 0x3c030100, 0x00431025, 0xaca20000,
-        0x8f820018, 0x30840007, 0x00042240, 0x34870001, 0x00e83825, 0x1120000f,
-        0xaca20004, 0x97430e0a, 0x8f84000c, 0x00ee3825, 0x2402000e, 0x00781825,
-        0xaf430160, 0x25430006, 0x24840008, 0x30841fff, 0xa742015a, 0xa7430158,
-        0xaf84000c, 0x0a0008a9, 0x00000000, 0x8f83000c, 0x25420002, 0xa7420158,
-        0x24630008, 0x30631fff, 0xaf83000c, 0x54c0000c, 0x8f420e14, 0x97420e10,
-        0x97430e12, 0x8f840014, 0x00021400, 0x00621825, 0xac8300a8, 0x8f850014,
-        0x8f420e18, 0x34e70040, 0xaca200ac, 0x8f420e14, 0x8f430e1c, 0xaf420144,
-        0xaf430148, 0xa34b0152, 0xaf470154, 0x0a0009f1, 0xaf4e0178, 0x10400128,
-        0x00000000, 0x97620010, 0x00a2102b, 0x10400003, 0x30820040, 0x10400122,
-        0x00000000, 0xafa60008, 0xa7840010, 0xaf850004, 0x93620008, 0x1440005e,
-        0x27ac0008, 0xaf60000c, 0x97820010, 0x30424000, 0x10400002, 0x2403000e,
-        0x24030016, 0xa363000a, 0x24034007, 0xaf630014, 0x93820012, 0x8f630014,
-        0x30420007, 0x00021240, 0x00621825, 0xaf630014, 0x97820010, 0x8f630014,
-        0x30420010, 0x00621825, 0xaf630014, 0x97820010, 0x30420008, 0x5040000e,
-        0x00002821, 0x8f620014, 0x004e1025, 0xaf620014, 0x97430e0a, 0x2402000e,
-        0x00781825, 0xaf630004, 0xa3620002, 0x9363000a, 0x3405fffc, 0x24630004,
-        0x0a0008f2, 0xa363000a, 0xaf600004, 0xa3600002, 0x97820010, 0x9363000a,
-        0x30421f00, 0x00021182, 0x24420028, 0x00621821, 0xa3630009, 0x97420e0c,
-        0xa7620010, 0x93630009, 0x24020008, 0x24630002, 0x30630007, 0x00431023,
-        0x30420007, 0xa362000b, 0x93640009, 0x97620010, 0x8f890004, 0x97830010,
-        0x00441021, 0x00a21021, 0x30630040, 0x10600006, 0x3045ffff, 0x15250005,
-        0x0125102b, 0x3c068000, 0x0a000925, 0x00005821, 0x0125102b, 0x144000c8,
-        0x00005021, 0x97420e14, 0xa7420e10, 0x97430e16, 0xa7430e12, 0x8f420e1c,
-        0xaf420e18, 0xaf450e00, 0x8f420000, 0x30420008, 0x1040fffd, 0x00000000,
-        0x97420e08, 0x00a04821, 0xa7820010, 0x8f430e04, 0x00003021, 0x240b0001,
-        0xaf830004, 0x97620010, 0x0a000936, 0x304dffff, 0x8f890004, 0x97820010,
-        0x30420040, 0x10400004, 0x01206821, 0x3c068000, 0x0a000936, 0x00005821,
-        0x97630010, 0x8f820004, 0x144300a7, 0x00005021, 0x00003021, 0x240b0001,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x10000003, 0x00000000, 0x0000000d, 0x0000000d, 0x3c020800,
+        0x24425760, 0x3c030800, 0x24635964, 0xac400000, 0x0043202b, 0x1480fffd,
+        0x24420004, 0x3c1d0800, 0x37bd7ffc, 0x03a0f021, 0x3c100800, 0x261034b0,
+        0x3c1c0800, 0x279c5760, 0x0e000f5b, 0x00000000, 0x0000000d, 0x8f840014,
+        0x27bdffe8, 0xafb10014, 0xafb00010, 0x8f460104, 0x8f830008, 0x8c8500ac,
+        0xaf430080, 0x948200a8, 0xa7420e10, 0x948300aa, 0xa7430e12, 0x8c8200ac,
+        0xaf420e18, 0x97430e10, 0xa7430e14, 0x97420e12, 0x00008021, 0xa7420e16,
+        0x8f430e18, 0x00006021, 0x00c53023, 0xaf430e1c, 0x10c001a2, 0x2d820001,
+        0x3c0e1000, 0x2419fff8, 0x24110010, 0x240f0f00, 0x3c188100, 0x93620008,
+        0x10400009, 0x00000000, 0x97620010, 0x00c2102b, 0x14400005, 0x00000000,
+        0x97620010, 0x3042ffff, 0x0a000d6d, 0xaf420e00, 0xaf460e00, 0x8f420000,
+        0x30420008, 0x1040fffd, 0x00000000, 0x97420e08, 0x8f450e04, 0x3044ffff,
+        0x30820001, 0x14400005, 0x00000000, 0x14a00005, 0x3083a040, 0x0a000f34,
+        0x00000000, 0x0000000d, 0x3083a040, 0x24020040, 0x1462004f, 0x3082a000,
+        0x308a0036, 0x8f88000c, 0x30890008, 0x24020800, 0xaf420178, 0x01001821,
+        0x9742008a, 0x00431023, 0x2442ffff, 0x30421fff, 0x2c420008, 0x1440fffa,
+        0x00a06021, 0x8f820018, 0x00cc3023, 0x24070001, 0x8f830008, 0x304b00ff,
+        0x24420001, 0xaf820018, 0x25024000, 0x106f0005, 0x03422021, 0x93820012,
+        0x30420007, 0x00021240, 0x34470001, 0x000b1400, 0x3c030100, 0x00431025,
+        0xac820000, 0x8f830018, 0x00ea3825, 0x1120000f, 0xac830004, 0x97430e0a,
+        0x8f84000c, 0x00ee3825, 0x2402000e, 0x00781825, 0xaf430160, 0x25830006,
+        0x24840008, 0x30841fff, 0xa742015a, 0xa7430158, 0xaf84000c, 0x0a000db7,
+        0x00000000, 0x8f83000c, 0x25820002, 0xa7420158, 0x24630008, 0x30631fff,
+        0xaf83000c, 0x54c0000f, 0x8f420e14, 0x8f820008, 0x504f0002, 0x24100001,
+        0x34e70040, 0x97420e10, 0x97430e12, 0x8f850014, 0x00021400, 0x00621825,
+        0xaca300a8, 0x8f840014, 0x8f420e18, 0xac8200ac, 0x8f420e14, 0x8f430e1c,
+        0xaf420144, 0xaf430148, 0xa34b0152, 0xaf470154, 0x0a000efb, 0xaf4e0178,
+        0x10400165, 0x00000000, 0x93620008, 0x50400008, 0xafa60008, 0x97620010,
+        0x00a2102b, 0x10400003, 0x30820040, 0x1040015c, 0x00000000, 0xafa60008,
+        0xa7840010, 0xaf850004, 0x93620008, 0x1440005f, 0x27ac0008, 0xaf60000c,
+        0x97820010, 0x30424000, 0x10400002, 0x2403000e, 0x24030016, 0xa363000a,
+        0x24034007, 0xaf630014, 0x93820012, 0x8f630014, 0x30420007, 0x00021240,
+        0x00621825, 0xaf630014, 0x97820010, 0x8f630014, 0x30420010, 0x00621825,
+        0xaf630014, 0x97820010, 0x30420008, 0x5040000e, 0x00002821, 0x8f620014,
+        0x004e1025, 0xaf620014, 0x97430e0a, 0x2402000e, 0x00781825, 0xaf630004,
+        0xa3620002, 0x9363000a, 0x3405fffc, 0x24630004, 0x0a000e06, 0xa363000a,
+        0xaf600004, 0xa3600002, 0x97820010, 0x9363000a, 0x30421f00, 0x00021182,
+        0x24420028, 0x00621821, 0xa3630009, 0x97420e0c, 0xa7620010, 0x93630009,
+        0x24020008, 0x24630002, 0x30630007, 0x00431023, 0x30420007, 0xa362000b,
+        0x93640009, 0x97620010, 0x8f890004, 0x97830010, 0x00441021, 0x00a21021,
+        0x30630040, 0x10600007, 0x3045ffff, 0x00a9102b, 0x14400005, 0x0125102b,
+        0x3c068000, 0x0a000e3a, 0x00005821, 0x0125102b, 0x544000c7, 0x00006021,
+        0x97420e14, 0xa7420e10, 0x97430e16, 0xa7430e12, 0x8f420e1c, 0xaf420e18,
+        0xaf450e00, 0x8f420000, 0x30420008, 0x1040fffd, 0x00000000, 0x97420e08,
+        0x00a04821, 0xa7820010, 0x8f430e04, 0x00003021, 0x240b0001, 0xaf830004,
+        0x97620010, 0x0a000e4c, 0x304dffff, 0x8f890004, 0x97820010, 0x30420040,
+        0x10400004, 0x01206821, 0x3c068000, 0x0a000e4c, 0x00005821, 0x97630010,
+        0x8f820004, 0x10430003, 0x00003021, 0x0a000eee, 0x00006021, 0x240b0001,
         0x8d820000, 0x00491023, 0x1440000d, 0xad820000, 0x8f620014, 0x34420040,
         0xaf620014, 0x97430e10, 0x97420e12, 0x8f840014, 0x00031c00, 0x00431025,
-        0xac8200a8, 0x8f830014, 0x8f420e18, 0xac6200ac, 0x93620008, 0x1440003f,
+        0xac8200a8, 0x8f830014, 0x8f420e18, 0xac6200ac, 0x93620008, 0x1440003e,
         0x00000000, 0x25260002, 0x8f84000c, 0x9743008a, 0x3063ffff, 0xafa30000,
         0x8fa20000, 0x00441023, 0x2442ffff, 0x30421fff, 0x2c420010, 0x1440fff7,
         0x00000000, 0x8f82000c, 0x8f830018, 0x00021082, 0x00021080, 0x24424000,
@@ -2180,289 +3148,320 @@ static u32 bnx2_TXP_b06FwText[(0x3ffc/4) + 1] = {
         0x3c033200, 0x00431025, 0xaca20000, 0x93630009, 0x9362000a, 0x00031c00,
         0x00431025, 0xaca20004, 0x8f830018, 0xaca30008, 0x97820010, 0x30420008,
         0x10400002, 0x00c04021, 0x25280006, 0x97430e14, 0x93640002, 0x8f450e1c,
-        0x8f660004, 0x8f670014, 0xaf4f0178, 0x3063ffff, 0xa7430144, 0x97420e16,
-        0xa7420146, 0xaf450148, 0xa34a0152, 0x8f82000c, 0x308400ff, 0xa744015a,
-        0xaf460160, 0xa7480158, 0xaf470154, 0xaf4e0178, 0x00501021, 0x30421fff,
-        0xaf82000c, 0x0a0009c5, 0x8d820000, 0x93620009, 0x9363000b, 0x8f85000c,
-        0x2463000a, 0x00435021, 0x25440007, 0x00992024, 0x9743008a, 0x3063ffff,
-        0xafa30000, 0x8fa20000, 0x00451023, 0x2442ffff, 0x30421fff, 0x0044102b,
-        0x1440fff7, 0x00000000, 0x8f82000c, 0x8f840018, 0x00021082, 0x00021080,
-        0x24424000, 0x03422821, 0x00804021, 0x24840001, 0xaf840018, 0x93630009,
-        0x310200ff, 0x00022400, 0x3c024100, 0x24630002, 0x00621825, 0x00832025,
-        0xaca40000, 0x8f62000c, 0x00461025, 0xaca20004, 0x97430e14, 0x93640002,
-        0x8f450e1c, 0x8f660004, 0x8f670014, 0xaf4f0178, 0x3063ffff, 0xa7430144,
-        0x97420e16, 0x308400ff, 0xa7420146, 0xaf450148, 0xa3480152, 0x8f83000c,
-        0x25420007, 0x00591024, 0xa744015a, 0xaf460160, 0xa7490158, 0xaf470154,
-        0xaf4e0178, 0x00621821, 0x30631fff, 0xaf83000c, 0x8d820000, 0x14400005,
-        0x00000000, 0x8f620014, 0x2403ffbf, 0x00431024, 0xaf620014, 0x8f62000c,
-        0x004d1021, 0xaf62000c, 0x93630008, 0x14600008, 0x00000000, 0x11600006,
-        0x00000000, 0x8f630014, 0x3c02efff, 0x3442fffe, 0x00621824, 0xaf630014,
-        0xa36b0008, 0x01205021, 0x15400016, 0x8fa60008, 0x97420e14, 0x97430e16,
-        0x8f850014, 0x00021400, 0x00621825, 0xaca300a8, 0x8f840014, 0x8f420e1c,
-        0x0a0009f3, 0xac8200ac, 0x97420e14, 0x97430e16, 0x8f840014, 0x00021400,
-        0x00621825, 0xac8300a8, 0x8f850014, 0x8f420e1c, 0x00005021, 0x0a0009f3,
-        0xaca200ac, 0x14c0fe64, 0x00000000, 0x55400018, 0x8fb00010, 0x3c038000,
-        0x8f420178, 0x00431024, 0x1440fffd, 0x00000000, 0x97430e14, 0x8f440e1c,
-        0x24020800, 0xaf420178, 0x3063ffff, 0xa7430144, 0x97420e16, 0x3c031000,
-        0xa7420146, 0x24020240, 0xaf440148, 0xa3400152, 0xa740015a, 0xaf400160,
-        0xa7400158, 0xaf420154, 0xaf430178, 0x8fb00010, 0x03e00008, 0x27bd0018,
-        0x27bdffd8, 0x3c1a8000, 0x3c0420ff, 0x3484fffd, 0x3c020008, 0x03421821,
-        0xafbf0020, 0xafb3001c, 0xafb20018, 0xafb10014, 0xafb00010, 0xaf830014,
-        0xaf440e00, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-        0x3c0200ff, 0x3442fffd, 0x3c046004, 0xaf420e00, 0x8c835000, 0x24130d00,
-        0x3c120800, 0x3c114000, 0x2402ff7f, 0x00621824, 0x3463380c, 0x24020009,
-        0xac835000, 0xaf420008, 0xaf800018, 0xaf80000c, 0x0e000fa1, 0x00000000,
-        0x0e000a96, 0x00000000, 0x3c020800, 0x24504080, 0x8f420000, 0x30420001,
-        0x1040fffd, 0x00000000, 0x8f440100, 0xaf840008, 0xaf440020, 0x93430108,
-        0xa3830012, 0x93820012, 0x30420001, 0x10400008, 0x00000000, 0x93820012,
-        0x30420006, 0x00021100, 0x0e00083b, 0x0050d821, 0x0a000a52, 0x00000000,
-        0x14930005, 0x00000000, 0x0e00083b, 0x265b4100, 0x0a000a52, 0x00000000,
-        0x0e000ba3, 0x00000000, 0xaf510138, 0x0a000a36, 0x00000000, 0x27bdfff8,
-        0x3084ffff, 0x24820007, 0x3044fff8, 0x8f85000c, 0x9743008a, 0x3063ffff,
-        0xafa30000, 0x8fa20000, 0x00451023, 0x2442ffff, 0x30421fff, 0x0044102b,
-        0x1440fff7, 0x00000000, 0x8f82000c, 0x00021082, 0x00021080, 0x24424000,
-        0x03421021, 0x03e00008, 0x27bd0008, 0x3084ffff, 0x8f82000c, 0x24840007,
-        0x3084fff8, 0x00441021, 0x30421fff, 0xaf82000c, 0x03e00008, 0x00000000,
-        0x27bdffe8, 0x3c1a8000, 0x3c0420ff, 0x3484fffd, 0x3c020008, 0x03421821,
-        0xafbf0010, 0xaf830014, 0xaf440e00, 0x00000000, 0x00000000, 0x00000000,
-        0x00000000, 0x00000000, 0x3c0200ff, 0x3442fffd, 0x3c046004, 0xaf420e00,
-        0x8c825000, 0x2403ff7f, 0x00431024, 0x3442380c, 0x24030009, 0xac825000,
-        0xaf430008, 0xaf800018, 0xaf80000c, 0x0e000fa1, 0x00000000, 0x0e000a96,
-        0x00000000, 0x8fbf0010, 0x03e00008, 0x27bd0018, 0x27bdffe8, 0x3c02000a,
-        0x03421821, 0x3c040800, 0x24844120, 0x24050018, 0xafbf0010, 0xaf830024,
-        0x0e000fad, 0x00003021, 0x3c050800, 0x3c020800, 0x24423d60, 0xaca24180,
-        0x24a54180, 0x3c020800, 0x24423e18, 0x3c030800, 0x24633e2c, 0x3c040800,
-        0xaca20004, 0x3c020800, 0x24423d68, 0xaca30008, 0xac824190, 0x24844190,
-        0x3c020800, 0x24423da4, 0x3c070800, 0x24e73de4, 0x3c060800, 0x24c63e40,
-        0x3c050800, 0x24a52b28, 0x3c030800, 0xac820004, 0x3c020800, 0x24423e48,
-        0xac870008, 0xac86000c, 0xac850010, 0xac6241b0, 0x246341b0, 0x8fbf0010,
-        0x3c020800, 0x24423e60, 0xac620004, 0xac670008, 0xac66000c, 0xac650010,
-        0x03e00008, 0x27bd0018, 0x27bdffc8, 0x3c020800, 0x24424120, 0xafbf0030,
-        0xafb3002c, 0xafb20028, 0xafb10024, 0xafb00020, 0x90470021, 0x8c510008,
-        0x8c45001c, 0x8f900020, 0x3c060800, 0x3c038000, 0x8f420178, 0x00431024,
-        0x1440fffd, 0x8cc2414c, 0x24c3414c, 0x2473ffd4, 0xaf420144, 0x8e620030,
-        0x30b22000, 0xaf420148, 0x3c021000, 0xaf50014c, 0xa3470152, 0xa7510158,
-        0xaf450154, 0xaf420178, 0x12400004, 0x3c030800, 0x8c620030, 0x24420001,
-        0xac620030, 0x93420109, 0x9344010a, 0x00111c00, 0xafa30018, 0x00071a00,
-        0xafa50014, 0x8cc5414c, 0x00021600, 0x00042400, 0x00441025, 0x00431025,
-        0xafa20010, 0x8f440100, 0x8e660030, 0x0e000fe1, 0x02003821, 0x1640000e,
-        0x8fbf0030, 0x8f820000, 0x8e630030, 0x8c44017c, 0x02031823, 0x00711823,
-        0x00641823, 0x2c630002, 0x14600006, 0x8fb3002c, 0x0000000d, 0x00000000,
-        0x240000ca, 0x8fbf0030, 0x8fb3002c, 0x8fb20028, 0x8fb10024, 0x8fb00020,
-        0x03e00008, 0x27bd0038, 0x974309da, 0x00804021, 0xad030000, 0x8f4209dc,
-        0xad020004, 0x8f4309e0, 0xad030008, 0x934409d9, 0x24020001, 0x30840003,
-        0x1082001f, 0x30a900ff, 0x28820002, 0x10400005, 0x24020002, 0x10800009,
-        0x3c0a0800, 0x0a000b64, 0x93420934, 0x1082000b, 0x24020003, 0x10820026,
-        0x3c0a0800, 0x0a000b64, 0x93420934, 0x974209e4, 0x00021400, 0x34420800,
-        0xad02000c, 0x0a000b63, 0x25080010, 0x974209e4, 0x00021400, 0x34428100,
-        0xad02000c, 0x974309e8, 0x3c0a0800, 0x00031c00, 0x34630800, 0xad030010,
-        0x0a000b63, 0x25080014, 0x974409e4, 0x3c050800, 0x24a24120, 0x94430018,
-        0x94460010, 0x9447000c, 0x00a05021, 0x24020800, 0xad000010, 0xad020014,
-        0x00042400, 0x00661821, 0x00671823, 0x2463fff2, 0x00832025, 0xad04000c,
-        0x0a000b63, 0x25080018, 0x974209e4, 0x3c050800, 0x00021400, 0x34428100,
-        0xad02000c, 0x974409e8, 0x24a24120, 0x94430018, 0x94460010, 0x9447000c,
-        0x00a05021, 0x24020800, 0xad000014, 0xad020018, 0x00042400, 0x00661821,
-        0x00671823, 0x2463ffee, 0x00832025, 0xad040010, 0x2508001c, 0x93420934,
-        0x93450921, 0x3c074000, 0x25444120, 0x94830014, 0x94860010, 0x00021082,
-        0x00021600, 0x00052c00, 0x00a72825, 0x00451025, 0x00661821, 0x00431025,
-        0xad020000, 0x97830028, 0x974209ea, 0x00621821, 0x00031c00, 0xad030004,
-        0x97820028, 0x24420001, 0x30427fff, 0xa7820028, 0x93430920, 0x3c020006,
-        0x00031e00, 0x00621825, 0xad030008, 0x8f42092c, 0xad02000c, 0x8f430930,
-        0xad030010, 0x8f440938, 0x25080014, 0xad040000, 0x8f820020, 0x11200004,
-        0xad020004, 0x8f420940, 0x0a000b8d, 0x2442ffff, 0x8f420940, 0xad020008,
-        0x8f440948, 0x8f420940, 0x93430936, 0x00822823, 0x00652806, 0x3402ffff,
-        0x0045102b, 0x54400001, 0x3405ffff, 0x93420937, 0x25444120, 0x90830020,
-        0xad000010, 0x00021700, 0x34630010, 0x00031c00, 0x00431025, 0x00451025,
-        0xad02000c, 0x03e00008, 0x25020014, 0x27bdffb0, 0x3c020008, 0x03421821,
-        0xafbf004c, 0xafbe0048, 0xafb70044, 0xafb60040, 0xafb5003c, 0xafb40038,
-        0xafb30034, 0xafb20030, 0xafb1002c, 0xafb00028, 0xaf830000, 0x24020040,
-        0xaf420814, 0xaf400810, 0x8f420944, 0x8f430950, 0x8f440954, 0x8f45095c,
-        0xaf820030, 0xaf830020, 0xaf84001c, 0xaf85002c, 0x93430900, 0x24020020,
-        0x10620005, 0x24020030, 0x10620022, 0x3c030800, 0x0a000bf1, 0x8c62002c,
-        0x24020088, 0xaf420818, 0x3c020800, 0x24424180, 0xafa20020, 0x93430109,
-        0x3c020800, 0x10600009, 0x24574190, 0x3c026000, 0x24030100, 0xac43081c,
-        0x3c030001, 0xac43081c, 0x0000000d, 0x00000000, 0x2400031d, 0x9342010a,
-        0x30420080, 0x1440001c, 0x00000000, 0x3c026000, 0x24030100, 0xac43081c,
-        0x3c030001, 0xac43081c, 0x0000000d, 0x00000000, 0x24000324, 0x0a000bf4,
-        0x00000000, 0x93430109, 0x3063007f, 0x00031140, 0x000318c0, 0x00431021,
-        0x24430088, 0xaf430818, 0x0000000d, 0x3c020800, 0x244241d0, 0x3c030800,
-        0x247741e0, 0x0a000bf4, 0xafa20020, 0x24420001, 0x0a000f4c, 0xac62002c,
-        0x8f840000, 0x8f850020, 0x24020800, 0xaf420178, 0x8f4209a4, 0x8c83017c,
-        0x00a21023, 0x00431023, 0x2c420002, 0x14400004, 0x00000000, 0x0000000d,
-        0x00000000, 0x24000349, 0x8f420104, 0x8f430988, 0x00431023, 0x58400005,
-        0x8f4209a0, 0x0000000d, 0x00000000, 0x2400034d, 0x8f4209a0, 0x3c100800,
-        0xae02414c, 0x8f4309a4, 0x2604414c, 0x2491ffd4, 0xae230030, 0x8f420104,
-        0xae250024, 0x00431023, 0xac82ffd4, 0x8fa30020, 0x8c620000, 0x0040f809,
+        0x8f660004, 0x8f670014, 0x3063ffff, 0xa7430144, 0x97420e16, 0xa7420146,
+        0xaf450148, 0xa34a0152, 0x8f82000c, 0x308400ff, 0xa744015a, 0xaf460160,
+        0xa7480158, 0xaf470154, 0xaf4e0178, 0x00511021, 0x30421fff, 0xaf82000c,
+        0x0a000ed9, 0x8d820000, 0x93620009, 0x9363000b, 0x8f85000c, 0x2463000a,
+        0x00435021, 0x25440007, 0x00992024, 0x9743008a, 0x3063ffff, 0xafa30000,
+        0x8fa20000, 0x00451023, 0x2442ffff, 0x30421fff, 0x0044102b, 0x1440fff7,
+        0x00000000, 0x8f82000c, 0x8f840018, 0x00021082, 0x00021080, 0x24424000,
+        0x03422821, 0x00804021, 0x24840001, 0xaf840018, 0x93630009, 0x310200ff,
+        0x00022400, 0x3c024100, 0x24630002, 0x00621825, 0x00832025, 0xaca40000,
+        0x8f62000c, 0x00461025, 0xaca20004, 0x97430e14, 0x93640002, 0x8f450e1c,
+        0x8f660004, 0x8f670014, 0x3063ffff, 0xa7430144, 0x97420e16, 0x308400ff,
+        0xa7420146, 0xaf450148, 0xa3480152, 0x8f83000c, 0x25420007, 0x00591024,
+        0xa744015a, 0xaf460160, 0xa7490158, 0xaf470154, 0xaf4e0178, 0x00621821,
+        0x30631fff, 0xaf83000c, 0x8d820000, 0x14400005, 0x00000000, 0x8f620014,
+        0x2403ffbf, 0x00431024, 0xaf620014, 0x8f62000c, 0x004d1021, 0xaf62000c,
+        0x93630008, 0x14600008, 0x00000000, 0x11600006, 0x00000000, 0x8f630014,
+        0x3c02efff, 0x3442fffe, 0x00621824, 0xaf630014, 0xa36b0008, 0x01206021,
+        0x1580000c, 0x8fa60008, 0x97420e14, 0x97430e16, 0x8f850014, 0x00021400,
+        0x00621825, 0xaca300a8, 0x8f840014, 0x8f420e1c, 0xac8200ac, 0x0a000efd,
+        0x2d820001, 0x14c0fe65, 0x2d820001, 0x00501025, 0x10400058, 0x24020f00,
+        0x8f830008, 0x14620023, 0x3c048000, 0x11800009, 0x3c038000, 0x97420e08,
+        0x30420040, 0x14400005, 0x00000000, 0x0000000d, 0x00000000, 0x2400032c,
+        0x3c038000, 0x8f420178, 0x00431024, 0x1440fffd, 0x00000000, 0x97420e10,
+        0x3c030500, 0x00431025, 0xaf42014c, 0x97430e14, 0xa7430144, 0x97420e16,
+        0xa7420146, 0x8f430e1c, 0x24022000, 0xaf430148, 0x3c031000, 0xa3400152,
+        0xa740015a, 0xaf400160, 0xa7400158, 0xaf420154, 0xaf430178, 0x8f830008,
+        0x3c048000, 0x8f420178, 0x00441024, 0x1440fffd, 0x24020f00, 0x10620016,
+        0x00000000, 0x97420e14, 0xa7420144, 0x97430e16, 0xa7430146, 0x8f420e1c,
+        0x3c031000, 0xaf420148, 0x0a000f51, 0x24020240, 0x97420e14, 0x97430e16,
+        0x8f840014, 0x00021400, 0x00621825, 0xac8300a8, 0x8f850014, 0x8f420e1c,
+        0x00006021, 0xaca200ac, 0x0a000efd, 0x2d820001, 0xaf40014c, 0x11800007,
+        0x00000000, 0x97420e10, 0xa7420144, 0x97430e12, 0xa7430146, 0x0a000f4e,
+        0x8f420e18, 0x97420e14, 0xa7420144, 0x97430e16, 0xa7430146, 0x8f420e1c,
+        0xaf420148, 0x24020040, 0x3c031000, 0xa3400152, 0xa740015a, 0xaf400160,
+        0xa7400158, 0xaf420154, 0xaf430178, 0x8fb10014, 0x8fb00010, 0x03e00008,
+        0x27bd0018, 0x27bdffd0, 0x3c1a8000, 0x3c0420ff, 0x3484fffd, 0x3c020008,
+        0x03421821, 0xafbf002c, 0xafb60028, 0xafb50024, 0xafb40020, 0xafb3001c,
+        0xafb20018, 0xafb10014, 0xafb00010, 0xaf830014, 0xaf440e00, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x3c0200ff, 0x3442fffd,
+        0x3c046004, 0xaf420e00, 0x8c835000, 0x24160800, 0x24150d00, 0x3c140800,
+        0x24130f00, 0x3c120800, 0x3c114000, 0x2402ff7f, 0x00621824, 0x3463380c,
+        0x24020009, 0xac835000, 0xaf420008, 0xaf800018, 0xaf80000c, 0x0e001559,
+        0x00000000, 0x0e000ff0, 0x00000000, 0x3c020800, 0x245057c0, 0x8f420000,
+        0x30420001, 0x1040fffd, 0x00000000, 0x8f440100, 0xaf840008, 0xaf440020,
+        0xaf560178, 0x93430108, 0xa3830012, 0x93820012, 0x30420001, 0x10400008,
+        0x00000000, 0x93820012, 0x30420006, 0x00021100, 0x0e000d43, 0x0050d821,
+        0x0a000fac, 0x00000000, 0x14950005, 0x00000000, 0x0e000d43, 0x269b5840,
+        0x0a000fac, 0x00000000, 0x14930005, 0x00000000, 0x0e000d43, 0x265b5860,
+        0x0a000fac, 0x00000000, 0x0e0010ea, 0x00000000, 0xaf510138, 0x0a000f89,
+        0x00000000, 0x27bdfff8, 0x3084ffff, 0x24820007, 0x3044fff8, 0x8f85000c,
+        0x9743008a, 0x3063ffff, 0xafa30000, 0x8fa20000, 0x00451023, 0x2442ffff,
+        0x30421fff, 0x0044102b, 0x1440fff7, 0x00000000, 0x8f82000c, 0x00021082,
+        0x00021080, 0x24424000, 0x03421021, 0x03e00008, 0x27bd0008, 0x3084ffff,
+        0x8f82000c, 0x24840007, 0x3084fff8, 0x00441021, 0x30421fff, 0xaf82000c,
+        0x03e00008, 0x00000000, 0x27bdffe8, 0x3c1a8000, 0x3c0420ff, 0x3484fffd,
+        0x3c020008, 0x03421821, 0xafbf0010, 0xaf830014, 0xaf440e00, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x3c0200ff, 0x3442fffd,
+        0x3c046004, 0xaf420e00, 0x8c825000, 0x2403ff7f, 0x00431024, 0x3442380c,
+        0x24030009, 0xac825000, 0xaf430008, 0xaf800018, 0xaf80000c, 0x0e001559,
+        0x00000000, 0x0e000ff0, 0x00000000, 0x8fbf0010, 0x03e00008, 0x27bd0018,
+        0x27bdffe8, 0x3c02000a, 0x03421821, 0x3c040800, 0x24845880, 0x24050019,
+        0xafbf0010, 0xaf830024, 0x0e001565, 0x00003021, 0x3c050800, 0x3c020800,
+        0x24425330, 0xaca258e8, 0x24a558e8, 0x3c020800, 0x244254f8, 0x3c030800,
+        0x2463550c, 0x3c040800, 0xaca20004, 0x3c020800, 0x24425338, 0xaca30008,
+        0xac825900, 0x24845900, 0x3c020800, 0x244253c4, 0x3c070800, 0x24e75404,
+        0x3c060800, 0x24c65520, 0x3c050800, 0x24a55438, 0x3c030800, 0xac820004,
+        0x3c020800, 0x24425528, 0xac870008, 0xac86000c, 0xac850010, 0xac625920,
+        0x24635920, 0x8fbf0010, 0x3c020800, 0x24425540, 0xac620004, 0x3c020800,
+        0xac670008, 0xac66000c, 0xac650010, 0xac400048, 0x03e00008, 0x27bd0018,
+        0x974309da, 0x00804021, 0xad030000, 0x8f4209dc, 0xad020004, 0x8f4309e0,
+        0xad030008, 0x934409d9, 0x24020001, 0x30840003, 0x1082001f, 0x30a900ff,
+        0x28820002, 0x10400005, 0x24020002, 0x10800009, 0x3c0a0800, 0x0a001078,
+        0x93420934, 0x1082000b, 0x24020003, 0x10820026, 0x3c0a0800, 0x0a001078,
+        0x93420934, 0x974209e4, 0x00021400, 0x34420800, 0xad02000c, 0x0a001077,
+        0x25080010, 0x974209e4, 0x00021400, 0x34428100, 0xad02000c, 0x974309e8,
+        0x3c0a0800, 0x00031c00, 0x34630800, 0xad030010, 0x0a001077, 0x25080014,
+        0x974409e4, 0x3c050800, 0x24a25880, 0x9443001c, 0x94460014, 0x94470010,
+        0x00a05021, 0x24020800, 0xad000010, 0xad020014, 0x00042400, 0x00661821,
+        0x00671823, 0x2463fff2, 0x00832025, 0xad04000c, 0x0a001077, 0x25080018,
+        0x974209e4, 0x3c050800, 0x00021400, 0x34428100, 0xad02000c, 0x974409e8,
+        0x24a25880, 0x9443001c, 0x94460014, 0x94470010, 0x00a05021, 0x24020800,
+        0xad000014, 0xad020018, 0x00042400, 0x00661821, 0x00671823, 0x2463ffee,
+        0x00832025, 0xad040010, 0x2508001c, 0x93420934, 0x93450921, 0x3c074000,
+        0x25445880, 0x94830018, 0x94860014, 0x00021082, 0x00021600, 0x00052c00,
+        0x00a72825, 0x00451025, 0x00661821, 0x00431025, 0xad020000, 0x9783002c,
+        0x974209ea, 0x00621821, 0x00031c00, 0xad030004, 0x9782002c, 0x24420001,
+        0x30427fff, 0xa782002c, 0x93430920, 0x3c020006, 0x00031e00, 0x00621825,
+        0xad030008, 0x8f42092c, 0xad02000c, 0x8f430930, 0xad030010, 0x8f440938,
+        0x25080014, 0xad040000, 0x8f820020, 0x11200004, 0xad020004, 0x8f420940,
+        0x0a0010a1, 0x2442ffff, 0x8f420940, 0xad020008, 0x8f440948, 0x8f420940,
+        0x93430936, 0x00823023, 0x00663006, 0x3402ffff, 0x0046102b, 0x54400001,
+        0x3406ffff, 0x93420937, 0x25445880, 0x90830024, 0xad000010, 0x00021700,
+        0x34630010, 0x00031c00, 0x00431025, 0x00461025, 0xad02000c, 0x8c830008,
+        0x14600031, 0x25080014, 0x3c020800, 0x8c430048, 0x1060002d, 0x00000000,
+        0x9342010b, 0xad020000, 0x8f830000, 0x8c6200b0, 0xad020004, 0x8f830000,
+        0x8c6200b4, 0xad020008, 0x8f830000, 0x8c6200c0, 0xad02000c, 0x8f830000,
+        0x8c6200c4, 0xad020010, 0x8f830000, 0x8c6200c8, 0xad020014, 0x8f830000,
+        0x8c6200cc, 0xad020018, 0x8f830000, 0x8c6200e0, 0xad02001c, 0x8f830000,
+        0x8c6200e8, 0xad020020, 0x8f830000, 0x8c6200f0, 0x3c04600e, 0xad020024,
+        0x8c8200d0, 0xad020028, 0x8c8300d4, 0xad03002c, 0x8f820028, 0x3c046012,
+        0xad020030, 0x8c8200a8, 0xad020034, 0x8c8300ac, 0x3c026000, 0xad030038,
+        0x8c434448, 0xad03003c, 0x03e00008, 0x01001021, 0x27bdffa8, 0x3c020008,
+        0x03423021, 0xafbf0054, 0xafbe0050, 0xafb7004c, 0xafb60048, 0xafb50044,
+        0xafb40040, 0xafb3003c, 0xafb20038, 0xafb10034, 0xafb00030, 0xaf860000,
+        0x24020040, 0xaf420814, 0xaf400810, 0x8f420944, 0x8f430950, 0x8f440954,
+        0x8f45095c, 0xaf820034, 0xaf830020, 0xaf84001c, 0xaf850030, 0x90c20000,
+        0x24030020, 0x304400ff, 0x10830005, 0x24020030, 0x10820022, 0x3c030800,
+        0x0a001139, 0x8c62002c, 0x24020088, 0xaf420818, 0x3c020800, 0x244258e8,
+        0xafa20020, 0x93430109, 0x3c020800, 0x10600009, 0x24575900, 0x3c026000,
+        0x24030100, 0xac43081c, 0x3c030001, 0xac43081c, 0x0000000d, 0x00000000,
+        0x24000376, 0x9342010a, 0x30420080, 0x14400021, 0x24020800, 0x3c026000,
+        0x24030100, 0xac43081c, 0x3c030001, 0xac43081c, 0x0000000d, 0x00000000,
+        0x2400037d, 0x0a001141, 0x24020800, 0x93430109, 0x3063007f, 0x00031140,
+        0x000318c0, 0x00431021, 0x24430088, 0xaf430818, 0x0000000d, 0x3c020800,
+        0x24425940, 0x3c030800, 0x24775950, 0x0a001140, 0xafa20020, 0x24420001,
+        0xac62002c, 0x0000000d, 0x00000000, 0x24000395, 0x0a0014c1, 0x8fbf0054,
+        0x24020800, 0xaf420178, 0x8f450104, 0x8f420988, 0x00a21023, 0x58400005,
+        0x8f4309a0, 0x0000000d, 0x00000000, 0x240003b1, 0x8f4309a0, 0x3c100800,
+        0xae0358b0, 0x8f4209a4, 0x8f830020, 0x260458b0, 0x2491ffd0, 0xae220034,
+        0x00a21023, 0xae230028, 0xac82ffd0, 0x8fa30020, 0x8c620000, 0x0040f809,
         0x0200b021, 0x00409021, 0x32440010, 0x32420002, 0x10400007, 0xafa40024,
-        0x8e22001c, 0x32500040, 0x2403ffbf, 0x00431024, 0x0a000f13, 0xae22001c,
-        0x32420020, 0x10400002, 0x3c020800, 0x245741b0, 0x32420001, 0x14400007,
-        0x00000000, 0x8f820008, 0xaf420080, 0x8ec3414c, 0xaf430e10, 0x8e220030,
+        0x8e220020, 0x32530040, 0x2403ffbf, 0x00431024, 0x0a001493, 0xae220020,
+        0x32420020, 0x10400002, 0x3c020800, 0x24575920, 0x32420001, 0x14400007,
+        0x00000000, 0x8f820008, 0xaf420080, 0x8ec358b0, 0xaf430e10, 0x8e220034,
         0xaf420e18, 0x9343010b, 0x93420905, 0x30420008, 0x1040003c, 0x307400ff,
         0x8f820000, 0x8c430074, 0x0460000a, 0x00000000, 0x3c026000, 0x24030100,
-        0xac43081c, 0x3c030001, 0xac43081c, 0x0000000d, 0x00000000, 0x24000384,
-        0x8f820000, 0x9044007b, 0x9343010a, 0x14830027, 0x32500040, 0x24072000,
-        0x3c090800, 0x3c038000, 0x8f420178, 0x00431024, 0x1440fffd, 0x8ec2414c,
-        0x26c4414c, 0x2484ffd4, 0xaf420144, 0x8c820030, 0x3c030100, 0xaf420148,
-        0x24020047, 0xaf43014c, 0x00001821, 0xa3420152, 0x3c021000, 0xa7430158,
-        0xaf470154, 0xaf420178, 0x8ec5414c, 0x8d230030, 0x8c860030, 0x24630001,
-        0xad230030, 0x93420109, 0x9343010a, 0xafa70014, 0xafa00018, 0x00021600,
-        0x00031c00, 0x00431025, 0x34424700, 0xafa20010, 0x8f440100, 0x0e000fe1,
-        0x3c070100, 0x3c030800, 0x24624120, 0x0a000d01, 0x8c43001c, 0x32820002,
-        0x10400047, 0x3c039000, 0x34630001, 0x8f820008, 0x32500040, 0x3c048000,
-        0x00431025, 0xaf420020, 0x8f420020, 0x00441024, 0x1440fffd, 0x00000000,
-        0x8f830000, 0x90620005, 0x3c058000, 0x34420008, 0xa0620005, 0x8f860000,
-        0x34a50001, 0x8f840008, 0x8cc20074, 0x3c038000, 0x00852025, 0x00431025,
-        0xacc20074, 0xaf440020, 0x90c3007b, 0x9342010a, 0x14620028, 0x3c040800,
-        0x24072000, 0x3c090800, 0x3c038000, 0x8f420178, 0x00431024, 0x1440fffd,
-        0x8ec2414c, 0x26c4414c, 0x2484ffd4, 0xaf420144, 0x8c820030, 0x3c030100,
-        0xaf420148, 0x24020046, 0xaf43014c, 0x00001821, 0xa3420152, 0x3c021000,
-        0xa7430158, 0xaf470154, 0xaf420178, 0x8ec5414c, 0x8d230030, 0x8c860030,
-        0x24630001, 0xad230030, 0x93420109, 0x9343010a, 0xafa70014, 0xafa00018,
-        0x00021600, 0x00031c00, 0x00431025, 0x34424600, 0xafa20010, 0x8f440100,
-        0x0e000fe1, 0x3c070100, 0x3c040800, 0x24824120, 0x0a000d01, 0x8c43001c,
-        0x93420108, 0x30420010, 0x50400050, 0x9343093f, 0x8f860000, 0x90c3007f,
-        0x90c2007e, 0x90c40080, 0x306800ff, 0x00021600, 0x00081c00, 0x00431025,
-        0x00042200, 0x90c3007a, 0x90c5000a, 0x00441025, 0x11050028, 0x00623825,
-        0xa0c8000a, 0x24086000, 0x3c090800, 0x3c038000, 0x8f420178, 0x00431024,
-        0x1440fffd, 0x8ec2414c, 0x26c4414c, 0x2484ffd4, 0xaf420144, 0x8c820030,
-        0x00001821, 0xaf420148, 0x24020052, 0xaf47014c, 0xa3420152, 0x3c021000,
-        0xa7430158, 0xaf480154, 0xaf420178, 0x8ec5414c, 0x8d230030, 0x8c860030,
-        0x24630001, 0xad230030, 0x93420109, 0x9343010a, 0xafa80014, 0xafa00018,
-        0x00021600, 0x00031c00, 0x00431025, 0x34425200, 0xafa20010, 0x0e000fe1,
-        0x8f440100, 0x0a000cfb, 0x00000000, 0x3c026000, 0x24030100, 0xac43081c,
-        0x3c030001, 0xac43081c, 0x0000000d, 0x00000000, 0x240003cd, 0x16800009,
-        0x3c040800, 0x3c030800, 0x24624120, 0x8c43001c, 0x32500040, 0x2404ffbf,
-        0x00641824, 0x0a000f13, 0xac43001c, 0x8c824120, 0x10400005, 0x3c030800,
-        0x8c620034, 0xac804120, 0x24420001, 0xac620034, 0x9343093f, 0x24020012,
-        0x1462000f, 0x329e0038, 0x17c0000c, 0x3c030800, 0x8f830000, 0x8c62004c,
-        0xac62005c, 0x3c020800, 0x24444120, 0x8c82001c, 0x32500040, 0x2403ffbf,
-        0x00431024, 0x0a000f13, 0xac82001c, 0xac604120, 0x97420908, 0x000211c0,
+        0xac43081c, 0x3c030001, 0xac43081c, 0x0000000d, 0x00000000, 0x240003ed,
+        0x8f820000, 0x9044007b, 0x9343010a, 0x14830027, 0x32530040, 0x00003821,
+        0x24052000, 0x3c090800, 0x3c038000, 0x8f420178, 0x00431024, 0x1440fffd,
+        0x8ec258b0, 0x26c458b0, 0x2484ffd0, 0xaf420144, 0x8c820034, 0x3c030100,
+        0xaf420148, 0x24020047, 0xaf43014c, 0xa3420152, 0x8d230030, 0x3c021000,
+        0xa7470158, 0xaf450154, 0xaf420178, 0x8c860034, 0x24630001, 0xad230030,
+        0x9342010a, 0x3c030047, 0xafa50014, 0x00021600, 0x00431025, 0x00471025,
+        0xafa20010, 0x9343010b, 0xafa30018, 0x8f440100, 0x8f450104, 0x0e00159b,
+        0x3c070100, 0x3c050800, 0x24a25880, 0x0a001250, 0x8c430020, 0x32820002,
+        0x10400050, 0x00000000, 0x0e0015b9, 0x32530040, 0x3c039000, 0x34630001,
+        0x8f820008, 0x3c048000, 0x00431025, 0xaf420020, 0x8f420020, 0x00441024,
+        0x1440fffd, 0x00000000, 0x8f830000, 0x90620005, 0x34420008, 0xa0620005,
+        0x8f840000, 0x8c820074, 0x3c038000, 0x00431025, 0xac820074, 0x90830000,
+        0x24020020, 0x10620004, 0x00000000, 0x0000000d, 0x00000000, 0x2400040b,
+        0x8f830008, 0x3c028000, 0x34420001, 0x00621825, 0xaf430020, 0x9084007b,
+        0x9342010a, 0x14820028, 0x3c030800, 0x00003821, 0x24052000, 0x3c090800,
+        0x3c038000, 0x8f420178, 0x00431024, 0x1440fffd, 0x8ec258b0, 0x26c458b0,
+        0x2484ffd0, 0xaf420144, 0x8c820034, 0x3c030100, 0xaf420148, 0x24020046,
+        0xaf43014c, 0xa3420152, 0x8d230030, 0x3c021000, 0xa7470158, 0xaf450154,
+        0xaf420178, 0x8c860034, 0x24630001, 0xad230030, 0x9342010a, 0x3c030046,
+        0xafa50014, 0x00021600, 0x00431025, 0x00471025, 0xafa20010, 0x9343010b,
+        0xafa30018, 0x8f440100, 0x8f450104, 0x0e00159b, 0x3c070100, 0x3c030800,
+        0x24625880, 0x0a001250, 0x8c430020, 0x93420108, 0x30420010, 0x50400056,
+        0x9343093f, 0x8f860000, 0x90c2007f, 0x8cc30178, 0x304800ff, 0x15030004,
+        0x00000000, 0x0000000d, 0x00000000, 0x24000425, 0x90c2007e, 0x90c40080,
+        0x00081c00, 0x00021600, 0x00431025, 0x00042200, 0x90c3007a, 0x90c5000a,
+        0x00441025, 0x11050028, 0x00623825, 0xa0c8000a, 0x00004021, 0x24056000,
+        0x3c090800, 0x3c038000, 0x8f420178, 0x00431024, 0x1440fffd, 0x8ec258b0,
+        0x26c458b0, 0x2484ffd0, 0xaf420144, 0x8c820034, 0xaf420148, 0x24020052,
+        0xaf47014c, 0xa3420152, 0x8d230030, 0x3c021000, 0xa7480158, 0xaf450154,
+        0xaf420178, 0x8c860034, 0x24630001, 0xad230030, 0x9342010a, 0x3c030052,
+        0xafa50014, 0x00021600, 0x00431025, 0x00481025, 0xafa20010, 0x9343010b,
+        0xafa30018, 0x8f440100, 0x0e00159b, 0x8f450104, 0x0a00124a, 0x00000000,
+        0x3c026000, 0x24030100, 0xac43081c, 0x3c030001, 0xac43081c, 0x0000000d,
+        0x00000000, 0x2400043e, 0x16800009, 0x3c050800, 0x3c040800, 0x24825880,
+        0x8c430020, 0x32530040, 0x2404ffbf, 0x00641824, 0x0a001493, 0xac430020,
+        0x8ca25880, 0x10400005, 0x3c030800, 0x8c620034, 0xaca05880, 0x24420001,
+        0xac620034, 0x9343093f, 0x24020012, 0x5462000e, 0x97420908, 0x32820038,
+        0x14400009, 0x3c030800, 0x8f830000, 0x8c62004c, 0xac62005c, 0x3c020800,
+        0x24445880, 0x8c820020, 0x0a001285, 0x32530040, 0xac605880, 0x97420908,
+        0x5440001c, 0x97420908, 0x3c039000, 0x34630001, 0x8f820008, 0x32530040,
+        0x3c048000, 0x00431025, 0xaf420020, 0x8f420020, 0x00441024, 0x1440fffd,
+        0x3c028000, 0x8f840000, 0x8f850008, 0x8c830050, 0x34420001, 0x00a22825,
+        0xaf830020, 0xac830070, 0xac83005c, 0xaf450020, 0x3c050800, 0x24a45880,
+        0x8c820020, 0x2403ffbf, 0x00431024, 0x0a001493, 0xac820020, 0x000211c0,
         0xaf420024, 0x97420908, 0x3c030080, 0x34630003, 0x000211c0, 0xaf42080c,
-        0xaf43081c, 0x974209ec, 0x8f4309a4, 0xa7820028, 0x3c020800, 0x24444120,
-        0xac830028, 0x93420937, 0x93430934, 0x00021080, 0x00621821, 0xa4830014,
-        0x934209d8, 0x00621821, 0xa4830016, 0x934209d8, 0x93430934, 0x00809821,
-        0x00431021, 0x24420010, 0xa4820012, 0x0000a821, 0x24020006, 0x13c00003,
-        0xae62001c, 0x0a000d82, 0x24120008, 0x8f420958, 0x8f830020, 0x8f84002c,
-        0x00431023, 0x00832023, 0x04800003, 0xae620004, 0x04410003, 0x0082102b,
-        0x0a000d4e, 0xae600004, 0x54400001, 0xae640004, 0x8ee20000, 0x0040f809,
-        0x00000000, 0x00409021, 0x32420001, 0x5440001e, 0x8ee20004, 0x8e630008,
-        0x1060002b, 0x3c02c000, 0x00621025, 0xaf420e00, 0x8f420000, 0x30420008,
-        0x1040fffd, 0x00000000, 0x97420e08, 0xa7820010, 0x8f430e04, 0x8e620008,
-        0xaf830004, 0x8f840004, 0x0044102b, 0x1040000b, 0x24150001, 0x24020100,
-        0x3c016000, 0xac22081c, 0x3c020001, 0x3c016000, 0xac22081c, 0x0000000d,
-        0x00000000, 0x24000449, 0x24150001, 0x8ee20004, 0x0040f809, 0x00000000,
-        0x02429025, 0x32420002, 0x5040001d, 0x8f470940, 0x12a00006, 0x8ec2414c,
-        0x8f830000, 0xac6200a8, 0x8f840000, 0x8e620030, 0xac8200ac, 0x32420004,
-        0x50400013, 0x8f470940, 0x3c020800, 0x3283007d, 0x106000fe, 0x245741b0,
-        0x32820001, 0x50400006, 0x36520002, 0x8f830030, 0x8f420940, 0x106200f7,
-        0x00000000, 0x36520002, 0x24020008, 0xa660000c, 0xa662000e, 0xae600008,
-        0xa2600020, 0x8f470940, 0x3c030800, 0x24684120, 0x8d020028, 0x8d050008,
-        0x9504000c, 0x9506000a, 0x95030022, 0x00451021, 0x00862021, 0x00641821,
-        0xaf870030, 0xad020028, 0x32820030, 0x10400006, 0xa5030010, 0x91020020,
-        0x32910040, 0x34420004, 0x0a000dd4, 0xa1020020, 0x93420923, 0x30420040,
+        0xaf43081c, 0x974209ec, 0x8f4309a4, 0xa782002c, 0x3c020800, 0x24445880,
+        0xac83002c, 0x93420937, 0x93430934, 0x00021080, 0x00621821, 0xa4830018,
+        0x934209d8, 0x32850038, 0xafa50028, 0x00621821, 0xa483001a, 0x934209d8,
+        0x93430934, 0x3c1e0800, 0x00809821, 0x00431021, 0x24420010, 0xa4820016,
+        0x24020006, 0xae620020, 0x8fa20028, 0x10400003, 0x0000a821, 0x0a0012f0,
+        0x24120008, 0x8f420958, 0x8f830020, 0x8f840030, 0x00431023, 0x00832023,
+        0x04800003, 0xae620004, 0x04410003, 0x0082102b, 0x0a0012bc, 0xae600004,
+        0x54400001, 0xae640004, 0x8ee20000, 0x0040f809, 0x00000000, 0x00409021,
+        0x32420001, 0x5440001e, 0x8ee20004, 0x8e630008, 0x1060002b, 0x3c02c000,
+        0x00621025, 0xaf420e00, 0x8f420000, 0x30420008, 0x1040fffd, 0x00000000,
+        0x97420e08, 0xa7820010, 0x8f430e04, 0x8e620008, 0xaf830004, 0x8f840004,
+        0x0044102b, 0x1040000b, 0x24150001, 0x24020100, 0x3c016000, 0xac22081c,
+        0x3c020001, 0x3c016000, 0xac22081c, 0x0000000d, 0x00000000, 0x240004cd,
+        0x24150001, 0x8ee20004, 0x0040f809, 0x00000000, 0x02429025, 0x32420002,
+        0x5040001d, 0x8f470940, 0x12a00006, 0x8ec258b0, 0x8f830000, 0xac6200a8,
+        0x8f840000, 0x8e620034, 0xac8200ac, 0x32420004, 0x50400013, 0x8f470940,
+        0x3c020800, 0x3283007d, 0x10600110, 0x24575920, 0x32820001, 0x50400006,
+        0x36520002, 0x8f830034, 0x8f420940, 0x10620109, 0x00000000, 0x36520002,
+        0x24020008, 0xa6600010, 0xa6620012, 0xae600008, 0xa2600024, 0x8f470940,
+        0x3c030800, 0x24685880, 0x8d02002c, 0x8d050008, 0x95040010, 0x9506000a,
+        0x95030026, 0x00451021, 0x00862021, 0x00641821, 0xaf870034, 0xad02002c,
+        0x32820030, 0x10400008, 0xa5030014, 0x91020024, 0x32910040, 0x34420004,
+        0xa1020024, 0xaf400048, 0x0a001345, 0x3c040800, 0x93420923, 0x30420002,
         0x10400029, 0x32910040, 0x8f830000, 0x8f840020, 0x8c620084, 0x00441023,
-        0x0442000a, 0x3c039000, 0x95020010, 0x8c630084, 0x00821021, 0x00621823,
-        0x1c600004, 0x3c039000, 0x91020020, 0x34420001, 0xa1020020, 0x34630001,
+        0x0442000a, 0x3c039000, 0x95020014, 0x8c630084, 0x00821021, 0x00621823,
+        0x1c600004, 0x3c039000, 0x91020024, 0x34420001, 0xa1020024, 0x34630001,
         0x8f820008, 0x32910040, 0x3c048000, 0x00431025, 0xaf420020, 0x8f420020,
         0x00441024, 0x1440fffd, 0x00000000, 0x8f840000, 0x9083003f, 0x2402000a,
         0x10620005, 0x2402000c, 0x9083003f, 0x24020008, 0x14620002, 0x24020014,
         0xa082003f, 0x8f830008, 0x3c028000, 0x34420001, 0x00621825, 0xaf430020,
-        0x3c040800, 0x24904120, 0x9602000c, 0x96030016, 0x9604000e, 0x00431021,
-        0x00442021, 0x24840002, 0x3084ffff, 0x0e000a55, 0xa6020018, 0x8f850018,
-        0x00a01821, 0xa2030021, 0x8ee60008, 0x00402021, 0x24a50001, 0xaf850018,
-        0x00c0f809, 0x00000000, 0x00402021, 0x0e000b12, 0x02202821, 0x8ee3000c,
-        0x0060f809, 0x00402021, 0x96040018, 0x9602000e, 0x00822021, 0x24840002,
-        0x0e000a6b, 0x3084ffff, 0x3c030800, 0x8c624120, 0x8e030008, 0x3c040800,
-        0x00431023, 0x14400012, 0xac824120, 0x54600006, 0x8e02001c, 0x3243004a,
-        0x24020002, 0x14620005, 0x00000000, 0x8e02001c, 0x34420040, 0x0a000e0b,
-        0xae02001c, 0x52a00006, 0x36520002, 0x8e02002c, 0xaf420e10, 0x8e030030,
-        0xaf430e18, 0x36520002, 0x52a00008, 0x96670010, 0x8f830000, 0x8f420e10,
-        0xac6200a8, 0x8f840000, 0x8f420e18, 0xac8200ac, 0x96670010, 0x92680020,
-        0x24020040, 0xaf420814, 0x8f830020, 0x8f82001c, 0x00671821, 0x00621023,
-        0xaf830020, 0x58400005, 0x8f42095c, 0x8f820000, 0xaf83001c, 0xac430054,
-        0x8f42095c, 0x31030008, 0xaf82002c, 0x1060001a, 0x00000000, 0x8f840000,
-        0x90820120, 0x90830121, 0x304600ff, 0x00c31823, 0x30630007, 0x24020007,
-        0x1062000e, 0x00000000, 0x90820122, 0x304200fe, 0xa0820122, 0x8f850000,
-        0x00061880, 0x8f840020, 0x24a20100, 0x00431021, 0x24c30001, 0x30630007,
-        0xac440000, 0x0a000e40, 0xa0a30120, 0x90820122, 0x34420001, 0xa0820122,
-        0x14e00003, 0x31020001, 0x10400031, 0x32510002, 0x8f820000, 0x8c43000c,
-        0x30630001, 0x1060002c, 0x32510002, 0x3c029000, 0x8f830008, 0x34420001,
-        0x3c048000, 0x00621825, 0xaf430020, 0x8f420020, 0x00441024, 0x1440fffd,
-        0x00000000, 0x8f870000, 0x8ce2000c, 0x30420001, 0x10400018, 0x00000000,
-        0x94e2006a, 0x00022880, 0x50a00001, 0x24050001, 0x94e30068, 0x90e40081,
-        0x3c020800, 0x8c460024, 0x00652821, 0x00852804, 0x00c5102b, 0x54400001,
-        0x00a03021, 0x3c020800, 0x8c440028, 0x00c4182b, 0x54600001, 0x00c02021,
-        0x8f430074, 0x2402fffe, 0x00822824, 0x00a31821, 0xace3000c, 0x8f830008,
-        0x3c028000, 0x34420001, 0x00621825, 0xaf430020, 0x8f830020, 0x3c020800,
-        0x24504120, 0xae030024, 0x8ee20010, 0x0040f809, 0x00000000, 0x12a00005,
-        0x00000000, 0x8f420e10, 0xae02002c, 0x8f430e18, 0xae030030, 0x1220feba,
-        0x0000a821, 0x8f870024, 0x97860028, 0x8f830000, 0x8f820030, 0x8f840020,
-        0x8f85001c, 0x32500040, 0xa4e6002c, 0xac620044, 0x32420008, 0xac640050,
-        0xac650054, 0x1040007a, 0x32820020, 0x10400027, 0x32910010, 0x24072000,
-        0x3c090800, 0x3c038000, 0x8f420178, 0x00431024, 0x1440fffd, 0x8ec2414c,
-        0x26c4414c, 0x2484ffd4, 0xaf420144, 0x8c820030, 0x3c030400, 0xaf420148,
-        0x24020041, 0xaf43014c, 0x00001821, 0xa3420152, 0x3c021000, 0xa7430158,
-        0xaf470154, 0xaf420178, 0x8ec5414c, 0x8d230030, 0x8c860030, 0x24630001,
-        0xad230030, 0x93420109, 0x9343010a, 0xafa70014, 0xafa00018, 0x00021600,
-        0x00031c00, 0x00431025, 0x34424100, 0xafa20010, 0x8f440100, 0x0e000fe1,
-        0x3c070400, 0x12200028, 0x24072000, 0x3c090800, 0x3c038000, 0x8f420178,
-        0x00431024, 0x1440fffd, 0x8ec2414c, 0x26c4414c, 0x2484ffd4, 0xaf420144,
-        0x8c820030, 0x3c030300, 0xaf420148, 0x2402004e, 0xaf43014c, 0x00001821,
-        0xa3420152, 0x3c021000, 0xa7430158, 0xaf470154, 0xaf420178, 0x8ec5414c,
-        0x8d230030, 0x8c860030, 0x24630001, 0xad230030, 0x93420109, 0x9343010a,
-        0xafa70014, 0xafa00018, 0x00021600, 0x00031c00, 0x00431025, 0x34424e00,
-        0xafa20010, 0x8f440100, 0x0e000fe1, 0x3c070300, 0x0a000f0b, 0x8fa30024,
-        0x32820008, 0x10400026, 0x3c090800, 0x24072000, 0x3c038000, 0x8f420178,
-        0x00431024, 0x1440fffd, 0x8ec2414c, 0x26c4414c, 0x2484ffd4, 0xaf420144,
-        0x8c820030, 0x3c030200, 0xaf420148, 0x2402004b, 0xaf43014c, 0x00001821,
-        0xa3420152, 0x3c021000, 0xa7430158, 0xaf470154, 0xaf420178, 0x8ec5414c,
-        0x8d230030, 0x8c860030, 0x24630001, 0xad230030, 0x93420109, 0x9343010a,
-        0xafa70014, 0xafa00018, 0x00021600, 0x00031c00, 0x00431025, 0x34424b00,
-        0xafa20010, 0x8f440100, 0x0e000fe1, 0x3c070200, 0x8fa30024, 0x14600004,
-        0x8fa40020, 0x32420010, 0x10400004, 0x00000000, 0x8c820004, 0x0040f809,
-        0x00000000, 0x12000006, 0x8fa30020, 0x8c620008, 0x0040f809, 0x00000000,
-        0x0a000f4d, 0x8fbf004c, 0x3c030800, 0x8c62413c, 0x30420040, 0x1440002f,
-        0x8fbf004c, 0x24040040, 0x8f910020, 0x3c038000, 0x8f420178, 0x00431024,
-        0x1440fffd, 0x8ec2414c, 0x26d0414c, 0x2610ffd4, 0xaf420144, 0x8e020030,
-        0x00001821, 0xaf420148, 0x24020049, 0xaf51014c, 0xa3420152, 0x3c021000,
-        0xa7430158, 0xaf440154, 0xaf420178, 0x8ec5414c, 0x8e060030, 0x93420109,
-        0x9343010a, 0xafa40014, 0xafa00018, 0x00021600, 0x00031c00, 0x00431025,
-        0x34424900, 0xafa20010, 0x8f440100, 0x0e000fe1, 0x02203821, 0x8f830000,
-        0x8e020030, 0x8c64017c, 0x02221023, 0x00441023, 0x2c420002, 0x14400005,
-        0x8fbf004c, 0x0000000d, 0x00000000, 0x240000ca, 0x8fbf004c, 0x8fbe0048,
-        0x8fb70044, 0x8fb60040, 0x8fb5003c, 0x8fb40038, 0x8fb30034, 0x8fb20030,
-        0x8fb1002c, 0x8fb00028, 0x03e00008, 0x27bd0050, 0x03e00008, 0x00001021,
-        0x3c030800, 0x24654120, 0x8ca40004, 0x8c634120, 0x0064102b, 0x54400001,
-        0x00602021, 0x9743093c, 0x0083102b, 0x54400001, 0x00801821, 0x00001021,
-        0xaca30008, 0x03e00008, 0xa4a00022, 0x8f850004, 0x97840010, 0x3c030800,
-        0x24634120, 0x24020008, 0xa462000e, 0x8f820004, 0xa460000c, 0x000420c2,
+        0x3c040800, 0x24865880, 0x94c20010, 0x94c3001a, 0x8cc40008, 0x00432821,
+        0x14800006, 0xa4c5001c, 0x3c020800, 0x8c430048, 0x10600002, 0x24a20040,
+        0xa4c2001c, 0x27d05880, 0x9604001c, 0x96020012, 0x00822021, 0x24840002,
+        0x0e000faf, 0x3084ffff, 0x8f850018, 0x00a01821, 0xa2030025, 0x8ee60008,
+        0x00402021, 0x24a50001, 0xaf850018, 0x00c0f809, 0x00000000, 0x00402021,
+        0x0e001026, 0x02202821, 0x8ee3000c, 0x0060f809, 0x00402021, 0x9604001c,
+        0x96020012, 0x00822021, 0x24840002, 0x0e000fc5, 0x3084ffff, 0x8fc25880,
+        0x8e030008, 0x00431023, 0x14400012, 0xafc25880, 0x54600006, 0x8e020020,
+        0x3243004a, 0x24020002, 0x14620005, 0x00000000, 0x8e020020, 0x34420040,
+        0x0a001382, 0xae020020, 0x52a00006, 0x36520002, 0x8e020030, 0xaf420e10,
+        0x8e030034, 0xaf430e18, 0x36520002, 0x52a00008, 0x96670014, 0x8f830000,
+        0x8f420e10, 0xac6200a8, 0x8f840000, 0x8f420e18, 0xac8200ac, 0x96670014,
+        0x92680024, 0x24020040, 0xaf420814, 0x8f830020, 0x8f82001c, 0x00671821,
+        0x00621023, 0xaf830020, 0x18400008, 0x00000000, 0x8f820000, 0xaf83001c,
+        0xac430054, 0x54e00005, 0xaf400040, 0x0a0013a0, 0x8f42095c, 0x54e00001,
+        0xaf400044, 0x8f42095c, 0x31030008, 0xaf820030, 0x1060001a, 0x00000000,
+        0x8f840000, 0x90820120, 0x90830121, 0x304600ff, 0x00c31823, 0x30630007,
+        0x24020007, 0x1062000e, 0x00000000, 0x90820122, 0x304200fe, 0xa0820122,
+        0x8f850000, 0x00061880, 0x8f840020, 0x24a20100, 0x00431021, 0x24c30001,
+        0x30630007, 0xac440000, 0x0a0013bd, 0xa0a30120, 0x90820122, 0x34420001,
+        0xa0820122, 0x14e00003, 0x31020001, 0x10400031, 0x32510002, 0x8f820000,
+        0x8c43000c, 0x30630001, 0x1060002c, 0x32510002, 0x3c029000, 0x8f830008,
+        0x34420001, 0x3c048000, 0x00621825, 0xaf430020, 0x8f420020, 0x00441024,
+        0x1440fffd, 0x00000000, 0x8f870000, 0x8ce2000c, 0x30420001, 0x10400018,
+        0x00000000, 0x94e2006a, 0x00022880, 0x50a00001, 0x24050001, 0x94e30068,
+        0x90e40081, 0x3c020800, 0x8c460024, 0x00652821, 0x00852804, 0x00c5102b,
+        0x54400001, 0x00a03021, 0x3c020800, 0x8c440028, 0x00c4182b, 0x54600001,
+        0x00c02021, 0x8f430074, 0x2402fffe, 0x00822824, 0x00a31821, 0xace3000c,
+        0x8f830008, 0x3c028000, 0x34420001, 0x00621825, 0xaf430020, 0x8f820020,
+        0x3c050800, 0x24b05880, 0xae020028, 0x8ee30010, 0x0060f809, 0x00000000,
+        0x8f820028, 0x24420001, 0xaf820028, 0x12a00005, 0xaf40004c, 0x8f420e10,
+        0xae020030, 0x8f430e18, 0xae030034, 0x1220fea7, 0x24020006, 0x8f870024,
+        0x9786002c, 0x8f830000, 0x8f820034, 0x8f840020, 0x8f85001c, 0x32530040,
+        0xa4e6002c, 0xac620044, 0x32420008, 0xac640050, 0xac650054, 0x1040007a,
+        0x32820020, 0x10400027, 0x32910010, 0x00003821, 0x24052000, 0x3c090800,
+        0x3c038000, 0x8f420178, 0x00431024, 0x1440fffd, 0x8ec258b0, 0x26c458b0,
+        0x2484ffd0, 0xaf420144, 0x8c820034, 0x3c030400, 0xaf420148, 0x24020041,
+        0xaf43014c, 0xa3420152, 0x8d230030, 0x3c021000, 0xa7470158, 0xaf450154,
+        0xaf420178, 0x8c860034, 0x24630001, 0xad230030, 0x9342010a, 0x3c030041,
+        0xafa50014, 0x00021600, 0x00431025, 0x00471025, 0xafa20010, 0x9343010b,
+        0xafa30018, 0x8f440100, 0x8f450104, 0x0e00159b, 0x3c070400, 0x12200028,
+        0x00003821, 0x24052000, 0x3c090800, 0x3c038000, 0x8f420178, 0x00431024,
+        0x1440fffd, 0x8ec258b0, 0x26c458b0, 0x2484ffd0, 0xaf420144, 0x8c820034,
+        0x3c030300, 0xaf420148, 0x2402004e, 0xaf43014c, 0xa3420152, 0x8d230030,
+        0x3c021000, 0xa7470158, 0xaf450154, 0xaf420178, 0x8c860034, 0x24630001,
+        0xad230030, 0x9342010a, 0x3c03004e, 0xafa50014, 0x00021600, 0x00431025,
+        0x00471025, 0xafa20010, 0x9343010b, 0xafa30018, 0x8f440100, 0x8f450104,
+        0x0e00159b, 0x3c070300, 0x0a00148b, 0x8fa20024, 0x32820008, 0x10400026,
+        0x24052000, 0x00003821, 0x3c090800, 0x3c038000, 0x8f420178, 0x00431024,
+        0x1440fffd, 0x8ec258b0, 0x26c458b0, 0x2484ffd0, 0xaf420144, 0x8c820034,
+        0x3c030200, 0xaf420148, 0x2402004b, 0xaf43014c, 0xa3420152, 0x8d230030,
+        0x3c021000, 0xa7470158, 0xaf450154, 0xaf420178, 0x8c860034, 0x24630001,
+        0xad230030, 0x9342010a, 0x3c03004b, 0xafa50014, 0x00021600, 0x00431025,
+        0x00471025, 0xafa20010, 0x9343010b, 0xafa30018, 0x8f440100, 0x8f450104,
+        0x0e00159b, 0x3c070200, 0x8fa20024, 0x14400004, 0x8fa30020, 0x32420010,
+        0x10400004, 0x00000000, 0x8c620004, 0x0040f809, 0x00000000, 0x12600006,
+        0x8fa40020, 0x8c820008, 0x0040f809, 0x00000000, 0x0a0014c1, 0x8fbf0054,
+        0x3c030800, 0x8c6258a0, 0x30420040, 0x14400023, 0x8fbf0054, 0x00002821,
+        0x24040040, 0x8f870020, 0x3c038000, 0x8f420178, 0x00431024, 0x1440fffd,
+        0x8ec258b0, 0x26c358b0, 0x2463ffd0, 0xaf420144, 0x8c620034, 0xaf420148,
+        0x24020049, 0xaf47014c, 0xa3420152, 0x3c021000, 0xa7450158, 0xaf440154,
+        0xaf420178, 0x8c660034, 0x9342010a, 0x3c030049, 0xafa40014, 0x00021600,
+        0x00431025, 0x00451025, 0xafa20010, 0x9343010b, 0xafa30018, 0x8f440100,
+        0x0e00159b, 0x8f450104, 0x8fbf0054, 0x8fbe0050, 0x8fb7004c, 0x8fb60048,
+        0x8fb50044, 0x8fb40040, 0x8fb3003c, 0x8fb20038, 0x8fb10034, 0x8fb00030,
+        0x03e00008, 0x27bd0058, 0x03e00008, 0x00001021, 0x3c020800, 0x24435880,
+        0x8c650004, 0x8c445880, 0x0085182b, 0x10600002, 0x00403021, 0x00802821,
+        0x9744093c, 0x00a4102b, 0x54400001, 0x00a02021, 0x93420923, 0x0004182b,
+        0x00021042, 0x30420001, 0x00431024, 0x1040000d, 0x24c25880, 0x8f850000,
+        0x8f830020, 0x8ca20084, 0x00431023, 0x04420007, 0x24c25880, 0x8ca20084,
+        0x00641821, 0x00431023, 0x28420001, 0x00822023, 0x24c25880, 0xac440008,
+        0xa4400026, 0x03e00008, 0x00001021, 0x8f850004, 0x97840010, 0x3c030800,
+        0x24635880, 0x24020008, 0xa4620012, 0x8f820004, 0xa4600010, 0x000420c2,
         0x30840008, 0x2c420001, 0x00021023, 0x30420006, 0xac650008, 0x03e00008,
-        0xa0640020, 0x3c020800, 0x24424120, 0x90450021, 0x94430018, 0x3c021100,
+        0xa0640024, 0x3c020800, 0x24425880, 0x90450025, 0x9443001c, 0x3c021100,
         0xac800004, 0x00052c00, 0x24630002, 0x00621825, 0x00a32825, 0x24820008,
-        0x03e00008, 0xac850000, 0x0000000d, 0x00000000, 0x2400016f, 0x03e00008,
-        0x00000000, 0x0000000d, 0x00000000, 0x2400017b, 0x03e00008, 0x00000000,
-        0x03e00008, 0x00000000, 0x3c020800, 0x24424120, 0xac400008, 0xa4400022,
-        0x03e00008, 0x24020001, 0x3c020800, 0x24424120, 0x24030008, 0xac400008,
-        0xa440000c, 0xa443000e, 0xa0400020, 0x03e00008, 0x24020004, 0x03e00008,
+        0x03e00008, 0xac850000, 0x27bdffd8, 0x3c020800, 0x24425880, 0xafbf0020,
+        0x90480025, 0x8c440008, 0x8c460020, 0x8f870020, 0x3c030800, 0x3c058000,
+        0x8f420178, 0x00451024, 0x1440fffd, 0x8c6258b0, 0x246358b0, 0x2469ffd0,
+        0xaf420144, 0x8d220034, 0x30c32000, 0xaf420148, 0x3c021000, 0xaf47014c,
+        0xa3480152, 0xa7440158, 0xaf460154, 0xaf420178, 0x10600004, 0x3c030800,
+        0x8c620030, 0x24420001, 0xac620030, 0x9342010a, 0x00081c00, 0x3084ffff,
+        0xafa60014, 0x00021600, 0x00431025, 0x00441025, 0xafa20010, 0x9343010b,
+        0xafa30018, 0x8f440100, 0x8f450104, 0x0e00159b, 0x8d260034, 0x8fbf0020,
+        0x03e00008, 0x27bd0028, 0x0000000d, 0x00000000, 0x2400019d, 0x03e00008,
+        0x00000000, 0x0000000d, 0x00000000, 0x240001a9, 0x03e00008, 0x00000000,
+        0x03e00008, 0x00000000, 0x3c020800, 0x24425880, 0xac400008, 0xa4400026,
+        0x03e00008, 0x24020001, 0x3c020800, 0x24425880, 0x24030008, 0xac400008,
+        0xa4400010, 0xa4430012, 0xa0400024, 0x03e00008, 0x24020004, 0x03e00008,
         0x00001021, 0x10c00007, 0x00000000, 0x8ca20000, 0x24c6ffff, 0x24a50004,
-        0xac820000, 0x14c0fffb, 0x24840004, 0x03e00008, 0x00000000, 0x0a000fb2,
-        0x00a01021, 0xac860000, 0x24840004, 0x00a01021, 0x1440fffc, 0x24a5ffff,
-        0x03e00008, 0x00000000, 0x3c0a0800, 0x8d490068, 0x3c050800, 0x24a51090,
-        0x00093140, 0x00c51021, 0xac440000, 0x8f440e04, 0x00a61021, 0xac440004,
-        0x97430e08, 0x97420e0c, 0x00a62021, 0x00031c00, 0x00431025, 0xac820008,
-        0x8f430e10, 0x00801021, 0xac43000c, 0x8f440e14, 0xac440010, 0x8f430e18,
-        0x3c0800ff, 0xac430014, 0x8f470e1c, 0x3508ffff, 0x25290001, 0xac470018,
-        0x3c070800, 0x8ce3006c, 0x9344010a, 0x3c026000, 0x24630001, 0xace3006c,
-        0x8c434448, 0x3129007f, 0x00a62821, 0xad490068, 0x00042600, 0x00681824,
-        0x00832025, 0x03e00008, 0xaca4001c, 0x8fac0010, 0x8fad0014, 0x8fae0018,
-        0x3c0b0800, 0x8d6a0060, 0x3c080800, 0x25080078, 0x000a4940, 0x01281021,
-        0x01091821, 0xac440000, 0x00601021, 0xac650004, 0xac460008, 0xac67000c,
-        0xac4c0010, 0xac6d0014, 0x3c036000, 0xac4e0018, 0x8c654448, 0x3c040800,
-        0x8c820064, 0x254a0001, 0x314a007f, 0x01094021, 0xad6a0060, 0x24420001,
-        0xac820064, 0x03e00008, 0xad05001c, 0x00000000 };
-
-static u32 bnx2_TXP_b06FwData[(0x0/4) + 1] = { 0x00000000 };
-static u32 bnx2_TXP_b06FwRodata[(0x0/4) + 1] = { 0x00000000 };
-static u32 bnx2_TXP_b06FwBss[(0x194/4) + 1] = { 0x00000000 };
-static u32 bnx2_TXP_b06FwSbss[(0x34/4) + 1] = { 0x00000000 };
+        0xac820000, 0x14c0fffb, 0x24840004, 0x03e00008, 0x00000000, 0x0a00156c,
+        0x00a01021, 0xac860000, 0x00000000, 0x00000000, 0x24840004, 0x00a01021,
+        0x1440fffa, 0x24a5ffff, 0x03e00008, 0x00000000, 0x3c0a0800, 0x8d490068,
+        0x3c050800, 0x24a52098, 0x00093140, 0x00c51021, 0xac440000, 0x8f440e04,
+        0x00a61021, 0xac440004, 0x97430e08, 0x97420e0c, 0x00a62021, 0x00031c00,
+        0x00431025, 0xac820008, 0x8f430e10, 0x00801021, 0xac43000c, 0x8f440e14,
+        0xac440010, 0x8f430e18, 0x3c0800ff, 0xac430014, 0x8f470e1c, 0x3508ffff,
+        0x25290001, 0xac470018, 0x3c070800, 0x8ce3006c, 0x9344010a, 0x3c026000,
+        0x24630001, 0xace3006c, 0x8c434448, 0x3129007f, 0x00a62821, 0xad490068,
+        0x00042600, 0x00681824, 0x00832025, 0x03e00008, 0xaca4001c, 0x8fac0010,
+        0x8fad0014, 0x8fae0018, 0x3c0b0800, 0x8d6a0060, 0x3c080800, 0x25080080,
+        0x000a4940, 0x01281021, 0x01091821, 0xac440000, 0x00601021, 0xac650004,
+        0xac460008, 0xac67000c, 0xac4c0010, 0xac6d0014, 0x3c036000, 0xac4e0018,
+        0x8c654448, 0x3c040800, 0x8c820064, 0x254a0001, 0x314a00ff, 0x01094021,
+        0xad6a0060, 0x24420001, 0xac820064, 0x03e00008, 0xad05001c, 0x3c030800,
+        0x3c090800, 0x8d250070, 0x246330b0, 0x8f460100, 0x00053900, 0x00e31021,
+        0xac460000, 0x8f440104, 0x00671021, 0xac440004, 0x8f460108, 0x8f840014,
+        0x24a50001, 0xac460008, 0x8c880074, 0x3c060800, 0x8cc20074, 0x30a5003f,
+        0x00671821, 0xad250070, 0x24420001, 0xacc20074, 0x03e00008, 0xac68000c,
+        0x00000000 };
 
+static u32 bnx2_TXP_b06FwData[(0x0/4) + 1] = { 0x0 };
+static u32 bnx2_TXP_b06FwRodata[(0x0/4) + 1] = { 0x0 };
+static u32 bnx2_TXP_b06FwBss[(0x1c4/4) + 1] = { 0x0 };
+static u32 bnx2_TXP_b06FwSbss[(0x38/4) + 1] = { 0x0 };
diff --git a/drivers/net/depca.c b/drivers/net/depca.c
index 4d26e5e7d18b..0d33a93df96b 100644
--- a/drivers/net/depca.c
+++ b/drivers/net/depca.c
@@ -1470,15 +1470,6 @@ static int __init depca_mca_probe(struct device *device)
 ** ISA bus I/O device probe
 */
 
-static void depca_platform_release (struct device *device)
-{
-        struct platform_device *pldev;
-
-        /* free device */
-        pldev = to_platform_device (device);
-        kfree (pldev);
-}
-
 static void __init depca_platform_probe (void)
 {
         int i;
@@ -1491,19 +1482,16 @@ static void __init depca_platform_probe (void)
                  * line, use it (if valid) */
                 if (io && io != depca_io_ports[i].iobase)
                         continue;
-                
-                if (!(pldev = kmalloc (sizeof (*pldev), GFP_KERNEL)))
+
+                pldev = platform_device_alloc(depca_string, i);
+                if (!pldev)
                         continue;
 
-                memset (pldev, 0, sizeof (*pldev));
-                pldev->name = depca_string;
-                pldev->id   = i;
                 pldev->dev.platform_data = (void *) depca_io_ports[i].iobase;
-                pldev->dev.release       = depca_platform_release;
                 depca_io_ports[i].device = pldev;
 
-                if (platform_device_register (pldev)) {
-                        kfree (pldev);
+                if (platform_device_add(pldev)) {
+                        platform_device_put(pldev);
                         depca_io_ports[i].device = NULL;
                         continue;
                 }
@@ -1515,6 +1503,7 @@ static void __init depca_platform_probe (void)
                  * allocated structure */
                         
                         depca_io_ports[i].device = NULL;
+                        pldev->dev.platform_data = NULL;
                         platform_device_unregister (pldev);
                 }
         }
@@ -2112,6 +2101,7 @@ static void __exit depca_module_exit (void)
 
         for (i = 0; depca_io_ports[i].iobase; i++) {
                 if (depca_io_ports[i].device) {
+                        depca_io_ports[i].device->dev.platform_data = NULL;
                         platform_device_unregister (depca_io_ports[i].device);
                         depca_io_ports[i].device = NULL;
                 }
diff --git a/drivers/net/e1000/e1000_ethtool.c b/drivers/net/e1000/e1000_ethtool.c
index 9c7feaeaa6a4..8eae8ba27e84 100644
--- a/drivers/net/e1000/e1000_ethtool.c
+++ b/drivers/net/e1000/e1000_ethtool.c
@@ -1739,7 +1739,7 @@ e1000_get_strings(struct net_device *netdev, uint32_t stringset, uint8_t *data)
         }
 }
 
-struct ethtool_ops e1000_ethtool_ops = {
+static struct ethtool_ops e1000_ethtool_ops = {
         .get_settings           = e1000_get_settings,
         .set_settings           = e1000_set_settings,
         .get_drvinfo            = e1000_get_drvinfo,
diff --git a/drivers/net/e1000/e1000_hw.c b/drivers/net/e1000/e1000_hw.c
index 8fc876da43b4..a267c5235fc0 100644
--- a/drivers/net/e1000/e1000_hw.c
+++ b/drivers/net/e1000/e1000_hw.c
@@ -68,6 +68,38 @@ static int32_t e1000_polarity_reversal_workaround(struct e1000_hw *hw);
 static int32_t e1000_set_phy_mode(struct e1000_hw *hw);
 static int32_t e1000_host_if_read_cookie(struct e1000_hw *hw, uint8_t *buffer);
 static uint8_t e1000_calculate_mng_checksum(char *buffer, uint32_t length);
+static uint8_t e1000_arc_subsystem_valid(struct e1000_hw *hw);
+static int32_t e1000_check_downshift(struct e1000_hw *hw);
+static int32_t e1000_check_polarity(struct e1000_hw *hw, uint16_t *polarity);
+static void e1000_clear_hw_cntrs(struct e1000_hw *hw);
+static void e1000_clear_vfta(struct e1000_hw *hw);
+static int32_t e1000_commit_shadow_ram(struct e1000_hw *hw);
+static int32_t e1000_config_dsp_after_link_change(struct e1000_hw *hw,
+                                                  boolean_t link_up);
+static int32_t e1000_config_fc_after_link_up(struct e1000_hw *hw);
+static int32_t e1000_detect_gig_phy(struct e1000_hw *hw);
+static int32_t e1000_get_auto_rd_done(struct e1000_hw *hw);
+static int32_t e1000_get_cable_length(struct e1000_hw *hw,
+                                      uint16_t *min_length,
+                                      uint16_t *max_length);
+static int32_t e1000_get_hw_eeprom_semaphore(struct e1000_hw *hw);
+static int32_t e1000_get_phy_cfg_done(struct e1000_hw *hw);
+static int32_t e1000_id_led_init(struct e1000_hw * hw);
+static void e1000_init_rx_addrs(struct e1000_hw *hw);
+static boolean_t e1000_is_onboard_nvm_eeprom(struct e1000_hw *hw);
+static int32_t e1000_poll_eerd_eewr_done(struct e1000_hw *hw, int eerd);
+static void e1000_put_hw_eeprom_semaphore(struct e1000_hw *hw);
+static int32_t e1000_read_eeprom_eerd(struct e1000_hw *hw, uint16_t offset,
+                                      uint16_t words, uint16_t *data);
+static int32_t e1000_set_d0_lplu_state(struct e1000_hw *hw, boolean_t active);
+static int32_t e1000_set_d3_lplu_state(struct e1000_hw *hw, boolean_t active);
+static int32_t e1000_wait_autoneg(struct e1000_hw *hw);
+
+static void e1000_write_reg_io(struct e1000_hw *hw, uint32_t offset,
+                               uint32_t value);
+
+#define E1000_WRITE_REG_IO(a, reg, val) \
+            e1000_write_reg_io((a), E1000_##reg, val)
 
 /* IGP cable length table */
 static const
@@ -2035,7 +2067,7 @@ e1000_force_mac_fc(struct e1000_hw *hw)
  * based on the flow control negotiated by the PHY. In TBI mode, the TFCE
  * and RFCE bits will be automaticaly set to the negotiated flow control mode.
  *****************************************************************************/
-int32_t
+static int32_t
 e1000_config_fc_after_link_up(struct e1000_hw *hw)
 {
     int32_t ret_val;
@@ -2537,7 +2569,7 @@ e1000_get_speed_and_duplex(struct e1000_hw *hw,
 *
 * hw - Struct containing variables accessed by shared code
 ******************************************************************************/
-int32_t
+static int32_t
 e1000_wait_autoneg(struct e1000_hw *hw)
 {
     int32_t ret_val;
@@ -3021,7 +3053,7 @@ e1000_phy_reset(struct e1000_hw *hw)
 *
 * hw - Struct containing variables accessed by shared code
 ******************************************************************************/
-int32_t
+static int32_t
 e1000_detect_gig_phy(struct e1000_hw *hw)
 {
     int32_t phy_init_status, ret_val;
@@ -3121,7 +3153,7 @@ e1000_phy_reset_dsp(struct e1000_hw *hw)
 * hw - Struct containing variables accessed by shared code
 * phy_info - PHY information structure
 ******************************************************************************/
-int32_t
+static int32_t
 e1000_phy_igp_get_info(struct e1000_hw *hw,
                        struct e1000_phy_info *phy_info)
 {
@@ -3195,7 +3227,7 @@ e1000_phy_igp_get_info(struct e1000_hw *hw,
 * hw - Struct containing variables accessed by shared code
 * phy_info - PHY information structure
 ******************************************************************************/
-int32_t
+static int32_t
 e1000_phy_m88_get_info(struct e1000_hw *hw,
                        struct e1000_phy_info *phy_info)
 {
@@ -3905,7 +3937,7 @@ e1000_read_eeprom(struct e1000_hw *hw,
  * data - word read from the EEPROM
  * words - number of words to read
  *****************************************************************************/
-int32_t
+static int32_t
 e1000_read_eeprom_eerd(struct e1000_hw *hw,
                   uint16_t offset,
                   uint16_t words,
@@ -3939,7 +3971,7 @@ e1000_read_eeprom_eerd(struct e1000_hw *hw,
  * data - word read from the EEPROM
  * words - number of words to read
  *****************************************************************************/
-int32_t
+static int32_t
 e1000_write_eeprom_eewr(struct e1000_hw *hw,
                    uint16_t offset,
                    uint16_t words,
@@ -3976,7 +4008,7 @@ e1000_write_eeprom_eewr(struct e1000_hw *hw,
  *
  * hw - Struct containing variables accessed by shared code
  *****************************************************************************/
-int32_t
+static int32_t
 e1000_poll_eerd_eewr_done(struct e1000_hw *hw, int eerd)
 {
     uint32_t attempts = 100000;
@@ -4004,7 +4036,7 @@ e1000_poll_eerd_eewr_done(struct e1000_hw *hw, int eerd)
 *
 * hw - Struct containing variables accessed by shared code
 ****************************************************************************/
-boolean_t
+static boolean_t
 e1000_is_onboard_nvm_eeprom(struct e1000_hw *hw)
 {
     uint32_t eecd = 0;
@@ -4322,7 +4354,7 @@ e1000_write_eeprom_microwire(struct e1000_hw *hw,
  * data - word read from the EEPROM
  * words - number of words to read
  *****************************************************************************/
-int32_t
+static int32_t
 e1000_commit_shadow_ram(struct e1000_hw *hw)
 {
     uint32_t attempts = 100000;
@@ -4453,7 +4485,7 @@ e1000_read_mac_addr(struct e1000_hw * hw)
  * of the receive addresss registers. Clears the multicast table. Assumes
  * the receiver is in reset when the routine is called.
  *****************************************************************************/
-void
+static void
 e1000_init_rx_addrs(struct e1000_hw *hw)
 {
     uint32_t i;
@@ -4481,6 +4513,7 @@ e1000_init_rx_addrs(struct e1000_hw *hw)
     }
 }
 
+#if 0
 /******************************************************************************
  * Updates the MAC's list of multicast addresses.
  *
@@ -4564,6 +4597,7 @@ e1000_mc_addr_list_update(struct e1000_hw *hw,
     }
     DEBUGOUT("MC Update Complete\n");
 }
+#endif  /*  0  */
 
 /******************************************************************************
  * Hashes an address to determine its location in the multicast table
@@ -4705,7 +4739,7 @@ e1000_write_vfta(struct e1000_hw *hw,
  *
  * hw - Struct containing variables accessed by shared code
  *****************************************************************************/
-void
+static void
 e1000_clear_vfta(struct e1000_hw *hw)
 {
     uint32_t offset;
@@ -4735,7 +4769,7 @@ e1000_clear_vfta(struct e1000_hw *hw)
     }
 }
 
-int32_t
+static int32_t
 e1000_id_led_init(struct e1000_hw * hw)
 {
     uint32_t ledctl;
@@ -4997,7 +5031,7 @@ e1000_led_off(struct e1000_hw *hw)
  *
  * hw - Struct containing variables accessed by shared code
  *****************************************************************************/
-void
+static void
 e1000_clear_hw_cntrs(struct e1000_hw *hw)
 {
     volatile uint32_t temp;
@@ -5283,6 +5317,8 @@ e1000_get_bus_info(struct e1000_hw *hw)
         break;
     }
 }
+
+#if 0
 /******************************************************************************
  * Reads a value from one of the devices registers using port I/O (as opposed
  * memory mapped I/O). Only 82544 and newer devices support port I/O.
@@ -5300,6 +5336,7 @@ e1000_read_reg_io(struct e1000_hw *hw,
     e1000_io_write(hw, io_addr, offset);
     return e1000_io_read(hw, io_data);
 }
+#endif  /*  0  */
 
 /******************************************************************************
  * Writes a value to one of the devices registers using port I/O (as opposed to
@@ -5309,7 +5346,7 @@ e1000_read_reg_io(struct e1000_hw *hw,
  * offset - offset to write to
  * value - value to write
  *****************************************************************************/
-void
+static void
 e1000_write_reg_io(struct e1000_hw *hw,
                    uint32_t offset,
                    uint32_t value)
@@ -5337,7 +5374,7 @@ e1000_write_reg_io(struct e1000_hw *hw,
  * register to the minimum and maximum range.
  * For IGP phy's, the function calculates the range by the AGC registers.
  *****************************************************************************/
-int32_t
+static int32_t
 e1000_get_cable_length(struct e1000_hw *hw,
                        uint16_t *min_length,
                        uint16_t *max_length)
@@ -5489,7 +5526,7 @@ e1000_get_cable_length(struct e1000_hw *hw,
  * return 0.  If the link speed is 1000 Mbps the polarity status is in the
  * IGP01E1000_PHY_PCS_INIT_REG.
  *****************************************************************************/
-int32_t
+static int32_t
 e1000_check_polarity(struct e1000_hw *hw,
                      uint16_t *polarity)
 {
@@ -5551,7 +5588,7 @@ e1000_check_polarity(struct e1000_hw *hw,
  * Link Health register.  In IGP this bit is latched high, so the driver must
  * read it immediately after link is established.
  *****************************************************************************/
-int32_t
+static int32_t
 e1000_check_downshift(struct e1000_hw *hw)
 {
     int32_t ret_val;
@@ -5592,7 +5629,7 @@ e1000_check_downshift(struct e1000_hw *hw)
  *
  ****************************************************************************/
 
-int32_t
+static int32_t
 e1000_config_dsp_after_link_change(struct e1000_hw *hw,
                                    boolean_t link_up)
 {
@@ -5823,7 +5860,7 @@ e1000_set_phy_mode(struct e1000_hw *hw)
  *
  ****************************************************************************/
 
-int32_t
+static int32_t
 e1000_set_d3_lplu_state(struct e1000_hw *hw,
                         boolean_t active)
 {
@@ -5936,7 +5973,7 @@ e1000_set_d3_lplu_state(struct e1000_hw *hw,
  *
  ****************************************************************************/
 
-int32_t
+static int32_t
 e1000_set_d0_lplu_state(struct e1000_hw *hw,
                         boolean_t active)
 {
@@ -6103,7 +6140,7 @@ e1000_host_if_read_cookie(struct e1000_hw * hw, uint8_t *buffer)
  *            timeout
  *          - E1000_SUCCESS for success.
  ****************************************************************************/
-int32_t
+static int32_t
 e1000_mng_enable_host_if(struct e1000_hw * hw)
 {
     uint32_t hicr;
@@ -6137,7 +6174,7 @@ e1000_mng_enable_host_if(struct e1000_hw * hw)
  *
  * returns  - E1000_SUCCESS for success.
  ****************************************************************************/
-int32_t
+static int32_t
 e1000_mng_host_if_write(struct e1000_hw * hw, uint8_t *buffer,
                         uint16_t length, uint16_t offset, uint8_t *sum)
 {
@@ -6205,7 +6242,7 @@ e1000_mng_host_if_write(struct e1000_hw * hw, uint8_t *buffer,
  *
  * returns  - E1000_SUCCESS for success.
  ****************************************************************************/
-int32_t
+static int32_t
 e1000_mng_write_cmd_header(struct e1000_hw * hw,
                            struct e1000_host_mng_command_header * hdr)
 {
@@ -6243,7 +6280,7 @@ e1000_mng_write_cmd_header(struct e1000_hw * hw,
  *
  * returns  - E1000_SUCCESS for success.
  ****************************************************************************/
-int32_t
+static int32_t
 e1000_mng_write_commit(
     struct e1000_hw * hw)
 {
@@ -6496,7 +6533,7 @@ e1000_polarity_reversal_workaround(struct e1000_hw *hw)
  * returns: - none.
  *
  ***************************************************************************/
-void
+static void
 e1000_set_pci_express_master_disable(struct e1000_hw *hw)
 {
     uint32_t ctrl;
@@ -6511,6 +6548,7 @@ e1000_set_pci_express_master_disable(struct e1000_hw *hw)
     E1000_WRITE_REG(hw, CTRL, ctrl);
 }
 
+#if 0
 /***************************************************************************
  *
  * Enables PCI-Express master access.
@@ -6534,6 +6572,7 @@ e1000_enable_pciex_master(struct e1000_hw *hw)
     ctrl &= ~E1000_CTRL_GIO_MASTER_DISABLE;
     E1000_WRITE_REG(hw, CTRL, ctrl);
 }
+#endif  /*  0  */
 
 /*******************************************************************************
  *
@@ -6584,7 +6623,7 @@ e1000_disable_pciex_master(struct e1000_hw *hw)
  *            E1000_SUCCESS at any other case.
  *
  ******************************************************************************/
-int32_t
+static int32_t
 e1000_get_auto_rd_done(struct e1000_hw *hw)
 {
     int32_t timeout = AUTO_READ_DONE_TIMEOUT;
@@ -6623,7 +6662,7 @@ e1000_get_auto_rd_done(struct e1000_hw *hw)
  *            E1000_SUCCESS at any other case.
  *
  ***************************************************************************/
-int32_t
+static int32_t
 e1000_get_phy_cfg_done(struct e1000_hw *hw)
 {
     int32_t timeout = PHY_CFG_TIMEOUT;
@@ -6666,7 +6705,7 @@ e1000_get_phy_cfg_done(struct e1000_hw *hw)
  *            E1000_SUCCESS at any other case.
  *
  ***************************************************************************/
-int32_t
+static int32_t
 e1000_get_hw_eeprom_semaphore(struct e1000_hw *hw)
 {
     int32_t timeout;
@@ -6711,7 +6750,7 @@ e1000_get_hw_eeprom_semaphore(struct e1000_hw *hw)
  * returns: - None.
  *
  ***************************************************************************/
-void
+static void
 e1000_put_hw_eeprom_semaphore(struct e1000_hw *hw)
 {
     uint32_t swsm;
@@ -6747,7 +6786,7 @@ e1000_check_phy_reset_block(struct e1000_hw *hw)
             E1000_BLK_PHY_RESET : E1000_SUCCESS;
 }
 
-uint8_t
+static uint8_t
 e1000_arc_subsystem_valid(struct e1000_hw *hw)
 {
     uint32_t fwsm;
diff --git a/drivers/net/e1000/e1000_hw.h b/drivers/net/e1000/e1000_hw.h
index 4f2c196dc314..76ce12809a11 100644
--- a/drivers/net/e1000/e1000_hw.h
+++ b/drivers/net/e1000/e1000_hw.h
@@ -284,7 +284,6 @@ typedef enum {
 /* Initialization */
 int32_t e1000_reset_hw(struct e1000_hw *hw);
 int32_t e1000_init_hw(struct e1000_hw *hw);
-int32_t e1000_id_led_init(struct e1000_hw * hw);
 int32_t e1000_set_mac_type(struct e1000_hw *hw);
 void e1000_set_media_type(struct e1000_hw *hw);
 
@@ -292,10 +291,8 @@ void e1000_set_media_type(struct e1000_hw *hw);
 int32_t e1000_setup_link(struct e1000_hw *hw);
 int32_t e1000_phy_setup_autoneg(struct e1000_hw *hw);
 void e1000_config_collision_dist(struct e1000_hw *hw);
-int32_t e1000_config_fc_after_link_up(struct e1000_hw *hw);
 int32_t e1000_check_for_link(struct e1000_hw *hw);
 int32_t e1000_get_speed_and_duplex(struct e1000_hw *hw, uint16_t * speed, uint16_t * duplex);
-int32_t e1000_wait_autoneg(struct e1000_hw *hw);
 int32_t e1000_force_mac_fc(struct e1000_hw *hw);
 
 /* PHY */
@@ -303,21 +300,11 @@ int32_t e1000_read_phy_reg(struct e1000_hw *hw, uint32_t reg_addr, uint16_t *phy
 int32_t e1000_write_phy_reg(struct e1000_hw *hw, uint32_t reg_addr, uint16_t data);
 int32_t e1000_phy_hw_reset(struct e1000_hw *hw);
 int32_t e1000_phy_reset(struct e1000_hw *hw);
-int32_t e1000_detect_gig_phy(struct e1000_hw *hw);
 int32_t e1000_phy_get_info(struct e1000_hw *hw, struct e1000_phy_info *phy_info);
-int32_t e1000_phy_m88_get_info(struct e1000_hw *hw, struct e1000_phy_info *phy_info);
-int32_t e1000_phy_igp_get_info(struct e1000_hw *hw, struct e1000_phy_info *phy_info);
-int32_t e1000_get_cable_length(struct e1000_hw *hw, uint16_t *min_length, uint16_t *max_length);
-int32_t e1000_check_polarity(struct e1000_hw *hw, uint16_t *polarity);
-int32_t e1000_check_downshift(struct e1000_hw *hw);
 int32_t e1000_validate_mdi_setting(struct e1000_hw *hw);
 
 /* EEPROM Functions */
 int32_t e1000_init_eeprom_params(struct e1000_hw *hw);
-boolean_t e1000_is_onboard_nvm_eeprom(struct e1000_hw *hw);
-int32_t e1000_read_eeprom_eerd(struct e1000_hw *hw, uint16_t offset, uint16_t words, uint16_t *data);
-int32_t e1000_write_eeprom_eewr(struct e1000_hw *hw, uint16_t offset, uint16_t words, uint16_t *data);
-int32_t e1000_poll_eerd_eewr_done(struct e1000_hw *hw, int eerd);
 
 /* MNG HOST IF functions */
 uint32_t e1000_enable_mng_pass_thru(struct e1000_hw *hw);
@@ -377,13 +364,6 @@ int32_t e1000_mng_write_dhcp_info(struct e1000_hw *hw, uint8_t *buffer,
                                                         uint16_t length);
 boolean_t e1000_check_mng_mode(struct e1000_hw *hw);
 boolean_t e1000_enable_tx_pkt_filtering(struct e1000_hw *hw);
-int32_t e1000_mng_enable_host_if(struct e1000_hw *hw);
-int32_t e1000_mng_host_if_write(struct e1000_hw *hw, uint8_t *buffer,
-                            uint16_t length, uint16_t offset, uint8_t *sum);
-int32_t e1000_mng_write_cmd_header(struct e1000_hw* hw, 
-                                   struct e1000_host_mng_command_header* hdr);
-
-int32_t e1000_mng_write_commit(struct e1000_hw *hw);
 
 int32_t e1000_read_eeprom(struct e1000_hw *hw, uint16_t reg, uint16_t words, uint16_t *data);
 int32_t e1000_validate_eeprom_checksum(struct e1000_hw *hw);
@@ -395,13 +375,10 @@ int32_t e1000_swfw_sync_acquire(struct e1000_hw *hw, uint16_t mask);
 void e1000_swfw_sync_release(struct e1000_hw *hw, uint16_t mask);
 
 /* Filters (multicast, vlan, receive) */
-void e1000_init_rx_addrs(struct e1000_hw *hw);
-void e1000_mc_addr_list_update(struct e1000_hw *hw, uint8_t * mc_addr_list, uint32_t mc_addr_count, uint32_t pad, uint32_t rar_used_count);
 uint32_t e1000_hash_mc_addr(struct e1000_hw *hw, uint8_t * mc_addr);
 void e1000_mta_set(struct e1000_hw *hw, uint32_t hash_value);
 void e1000_rar_set(struct e1000_hw *hw, uint8_t * mc_addr, uint32_t rar_index);
 void e1000_write_vfta(struct e1000_hw *hw, uint32_t offset, uint32_t value);
-void e1000_clear_vfta(struct e1000_hw *hw);
 
 /* LED functions */
 int32_t e1000_setup_led(struct e1000_hw *hw);
@@ -412,7 +389,6 @@ int32_t e1000_led_off(struct e1000_hw *hw);
 /* Adaptive IFS Functions */
 
 /* Everything else */
-void e1000_clear_hw_cntrs(struct e1000_hw *hw);
 void e1000_reset_adaptive(struct e1000_hw *hw);
 void e1000_update_adaptive(struct e1000_hw *hw);
 void e1000_tbi_adjust_stats(struct e1000_hw *hw, struct e1000_hw_stats *stats, uint32_t frame_len, uint8_t * mac_addr);
@@ -423,29 +399,11 @@ void e1000_read_pci_cfg(struct e1000_hw *hw, uint32_t reg, uint16_t * value);
 void e1000_write_pci_cfg(struct e1000_hw *hw, uint32_t reg, uint16_t * value);
 /* Port I/O is only supported on 82544 and newer */
 uint32_t e1000_io_read(struct e1000_hw *hw, unsigned long port);
-uint32_t e1000_read_reg_io(struct e1000_hw *hw, uint32_t offset);
 void e1000_io_write(struct e1000_hw *hw, unsigned long port, uint32_t value);
-void e1000_write_reg_io(struct e1000_hw *hw, uint32_t offset, uint32_t value);
-int32_t e1000_config_dsp_after_link_change(struct e1000_hw *hw, boolean_t link_up);
-int32_t e1000_set_d3_lplu_state(struct e1000_hw *hw, boolean_t active);
-int32_t e1000_set_d0_lplu_state(struct e1000_hw *hw, boolean_t active);
-void e1000_set_pci_express_master_disable(struct e1000_hw *hw);
-void e1000_enable_pciex_master(struct e1000_hw *hw);
 int32_t e1000_disable_pciex_master(struct e1000_hw *hw);
-int32_t e1000_get_auto_rd_done(struct e1000_hw *hw);
-int32_t e1000_get_phy_cfg_done(struct e1000_hw *hw);
 int32_t e1000_get_software_semaphore(struct e1000_hw *hw);
 void e1000_release_software_semaphore(struct e1000_hw *hw);
 int32_t e1000_check_phy_reset_block(struct e1000_hw *hw);
-int32_t e1000_get_hw_eeprom_semaphore(struct e1000_hw *hw);
-void e1000_put_hw_eeprom_semaphore(struct e1000_hw *hw);
-int32_t e1000_commit_shadow_ram(struct e1000_hw *hw);
-uint8_t e1000_arc_subsystem_valid(struct e1000_hw *hw);
-
-#define E1000_READ_REG_IO(a, reg) \
-    e1000_read_reg_io((a), E1000_##reg)
-#define E1000_WRITE_REG_IO(a, reg, val) \
-    e1000_write_reg_io((a), E1000_##reg, val)
 
 /* PCI Device IDs */
 #define E1000_DEV_ID_82542               0x1000
diff --git a/drivers/net/e1000/e1000_main.c b/drivers/net/e1000/e1000_main.c
index efbbda7cbcbf..8b207f0e139e 100644
--- a/drivers/net/e1000/e1000_main.c
+++ b/drivers/net/e1000/e1000_main.c
@@ -37,7 +37,7 @@
  */
 
 char e1000_driver_name[] = "e1000";
-char e1000_driver_string[] = "Intel(R) PRO/1000 Network Driver";
+static char e1000_driver_string[] = "Intel(R) PRO/1000 Network Driver";
 #ifndef CONFIG_E1000_NAPI
 #define DRIVERNAPI
 #else
@@ -45,7 +45,7 @@ char e1000_driver_string[] = "Intel(R) PRO/1000 Network Driver";
 #endif
 #define DRV_VERSION "6.1.16-k2"DRIVERNAPI
 char e1000_driver_version[] = DRV_VERSION;
-char e1000_copyright[] = "Copyright (c) 1999-2005 Intel Corporation.";
+static char e1000_copyright[] = "Copyright (c) 1999-2005 Intel Corporation.";
 
 /* e1000_pci_tbl - PCI Device ID Table
  *
@@ -112,14 +112,14 @@ int e1000_setup_all_tx_resources(struct e1000_adapter *adapter);
 int e1000_setup_all_rx_resources(struct e1000_adapter *adapter);
 void e1000_free_all_tx_resources(struct e1000_adapter *adapter);
 void e1000_free_all_rx_resources(struct e1000_adapter *adapter);
-int e1000_setup_tx_resources(struct e1000_adapter *adapter,
-                             struct e1000_tx_ring *txdr);
-int e1000_setup_rx_resources(struct e1000_adapter *adapter,
-                             struct e1000_rx_ring *rxdr);
-void e1000_free_tx_resources(struct e1000_adapter *adapter,
-                             struct e1000_tx_ring *tx_ring);
-void e1000_free_rx_resources(struct e1000_adapter *adapter,
-                             struct e1000_rx_ring *rx_ring);
+static int e1000_setup_tx_resources(struct e1000_adapter *adapter,
+                                    struct e1000_tx_ring *txdr);
+static int e1000_setup_rx_resources(struct e1000_adapter *adapter,
+                                    struct e1000_rx_ring *rxdr);
+static void e1000_free_tx_resources(struct e1000_adapter *adapter,
+                                    struct e1000_tx_ring *tx_ring);
+static void e1000_free_rx_resources(struct e1000_adapter *adapter,
+                                    struct e1000_rx_ring *rx_ring);
 void e1000_update_stats(struct e1000_adapter *adapter);
 
 /* Local Function Prototypes */
@@ -296,7 +296,8 @@ e1000_irq_enable(struct e1000_adapter *adapter)
                 E1000_WRITE_FLUSH(&adapter->hw);
         }
 }
-void
+
+static void
 e1000_update_mng_vlan(struct e1000_adapter *adapter)
 {
         struct net_device *netdev = adapter->netdev;
@@ -1141,7 +1142,7 @@ e1000_check_64k_bound(struct e1000_adapter *adapter,
  * Return 0 on success, negative on failure
  **/
 
-int
+static int
 e1000_setup_tx_resources(struct e1000_adapter *adapter,
                          struct e1000_tx_ring *txdr)
 {
@@ -1359,7 +1360,7 @@ e1000_configure_tx(struct e1000_adapter *adapter)
  * Returns 0 on success, negative on failure
  **/
 
-int
+static int
 e1000_setup_rx_resources(struct e1000_adapter *adapter,
                          struct e1000_rx_ring *rxdr)
 {
@@ -1747,7 +1748,7 @@ e1000_configure_rx(struct e1000_adapter *adapter)
  * Free all transmit software resources
  **/
 
-void
+static void
 e1000_free_tx_resources(struct e1000_adapter *adapter,
                         struct e1000_tx_ring *tx_ring)
 {
@@ -1858,7 +1859,7 @@ e1000_clean_all_tx_rings(struct e1000_adapter *adapter)
  * Free all receive software resources
  **/
 
-void
+static void
 e1000_free_rx_resources(struct e1000_adapter *adapter,
                         struct e1000_rx_ring *rx_ring)
 {
diff --git a/drivers/net/fec.c b/drivers/net/fec.c
index 85504fb900da..bd6983d1afba 100644
--- a/drivers/net/fec.c
+++ b/drivers/net/fec.c
@@ -18,8 +18,8 @@
  * Much better multiple PHY support by Magnus Damm.
  * Copyright (c) 2000 Ericsson Radio Systems AB.
  *
- * Support for FEC controller of ColdFire/5270/5271/5272/5274/5275/5280/5282.
- * Copyright (c) 2001-2004 Greg Ungerer (gerg@snapgear.com)
+ * Support for FEC controller of ColdFire processors.
+ * Copyright (c) 2001-2005 Greg Ungerer (gerg@snapgear.com)
  *
  * Bug fixes and cleanup by Philippe De Muyter (phdm@macqel.be)
  * Copyright (c) 2004-2005 Macq Electronique SA.
@@ -50,7 +50,8 @@
 #include <asm/pgtable.h>
 
 #if defined(CONFIG_M523x) || defined(CONFIG_M527x) || \
-    defined(CONFIG_M5272) || defined(CONFIG_M528x)
+    defined(CONFIG_M5272) || defined(CONFIG_M528x) || \
+    defined(CONFIG_M520x)
 #include <asm/coldfire.h>
 #include <asm/mcfsim.h>
 #include "fec.h"
@@ -77,6 +78,8 @@ static unsigned int fec_hw[] = {
         (MCF_MBAR + 0x1800),
 #elif defined(CONFIG_M523x) || defined(CONFIG_M528x)
         (MCF_MBAR + 0x1000),
+#elif defined(CONFIG_M520x)
+        (MCF_MBAR+0x30000),
 #else
         &(((immap_t *)IMAP_ADDR)->im_cpm.cp_fec),
 #endif
@@ -139,6 +142,10 @@ typedef struct {
 #define TX_RING_SIZE            16      /* Must be power of two */
 #define TX_RING_MOD_MASK        15      /*   for this to work */
 
+#if (((RX_RING_SIZE + TX_RING_SIZE) * 8) > PAGE_SIZE)
+#error "FEC: descriptor ring size contants too large"
+#endif
+
 /* Interrupt events/masks.
 */
 #define FEC_ENET_HBERR  ((uint)0x80000000)      /* Heartbeat error */
@@ -164,7 +171,8 @@ typedef struct {
  * size bits. Other FEC hardware does not, so we need to take that into
  * account when setting it.
  */
-#if defined(CONFIG_M523x) || defined(CONFIG_M527x) || defined(CONFIG_M528x)
+#if defined(CONFIG_M523x) || defined(CONFIG_M527x) || defined(CONFIG_M528x) || \
+    defined(CONFIG_M520x)
 #define OPT_FRAME_SIZE  (PKT_MAXBUF_SIZE << 16)
 #else
 #define OPT_FRAME_SIZE  0
@@ -1137,6 +1145,65 @@ static phy_info_t const phy_info_ks8721bl = {
 };
 
 /* ------------------------------------------------------------------------- */
+/* register definitions for the DP83848 */
+
+#define MII_DP8384X_PHYSTST    16  /* PHY Status Register */
+
+static void mii_parse_dp8384x_sr2(uint mii_reg, struct net_device *dev)
+{
+        struct fec_enet_private *fep = dev->priv;
+        volatile uint *s = &(fep->phy_status);
+
+        *s &= ~(PHY_STAT_SPMASK | PHY_STAT_LINK | PHY_STAT_ANC);
+
+        /* Link up */
+        if (mii_reg & 0x0001) {
+                fep->link = 1;
+                *s |= PHY_STAT_LINK;
+        } else
+                fep->link = 0;
+        /* Status of link */
+        if (mii_reg & 0x0010)   /* Autonegotioation complete */
+                *s |= PHY_STAT_ANC;
+        if (mii_reg & 0x0002) {   /* 10MBps? */
+                if (mii_reg & 0x0004)   /* Full Duplex? */
+                        *s |= PHY_STAT_10FDX;
+                else
+                        *s |= PHY_STAT_10HDX;
+        } else {                  /* 100 Mbps? */
+                if (mii_reg & 0x0004)   /* Full Duplex? */
+                        *s |= PHY_STAT_100FDX;
+                else
+                        *s |= PHY_STAT_100HDX;
+        }
+        if (mii_reg & 0x0008)
+                *s |= PHY_STAT_FAULT;
+}
+
+static phy_info_t phy_info_dp83848= {
+        0x020005c9,
+        "DP83848",
+
+        (const phy_cmd_t []) {  /* config */
+                { mk_mii_read(MII_REG_CR), mii_parse_cr },
+                { mk_mii_read(MII_REG_ANAR), mii_parse_anar },
+                { mk_mii_read(MII_DP8384X_PHYSTST), mii_parse_dp8384x_sr2 },
+                { mk_mii_end, }
+        },
+        (const phy_cmd_t []) {  /* startup - enable interrupts */
+                { mk_mii_write(MII_REG_CR, 0x1200), NULL }, /* autonegotiate */
+                { mk_mii_read(MII_REG_SR), mii_parse_sr },
+                { mk_mii_end, }
+        },
+        (const phy_cmd_t []) { /* ack_int - never happens, no interrupt */
+                { mk_mii_end, }
+        },
+        (const phy_cmd_t []) {  /* shutdown */
+                { mk_mii_end, }
+        },
+};
+
+/* ------------------------------------------------------------------------- */
 
 static phy_info_t const * const phy_info[] = {
         &phy_info_lxt970,
@@ -1144,6 +1211,7 @@ static phy_info_t const * const phy_info[] = {
         &phy_info_qs6612,
         &phy_info_am79c874,
         &phy_info_ks8721bl,
+        &phy_info_dp83848,
         NULL
 };
 
@@ -1422,6 +1490,134 @@ static void __inline__ fec_uncache(unsigned long addr)
 
 /* ------------------------------------------------------------------------- */
 
+#elif defined(CONFIG_M520x)
+
+/*
+ *      Code specific to Coldfire 520x
+ */
+static void __inline__ fec_request_intrs(struct net_device *dev)
+{
+        struct fec_enet_private *fep;
+        int b;
+        static const struct idesc {
+                char *name;
+                unsigned short irq;
+        } *idp, id[] = {
+                { "fec(TXF)", 23 },
+                { "fec(TXB)", 24 },
+                { "fec(TXFIFO)", 25 },
+                { "fec(TXCR)", 26 },
+                { "fec(RXF)", 27 },
+                { "fec(RXB)", 28 },
+                { "fec(MII)", 29 },
+                { "fec(LC)", 30 },
+                { "fec(HBERR)", 31 },
+                { "fec(GRA)", 32 },
+                { "fec(EBERR)", 33 },
+                { "fec(BABT)", 34 },
+                { "fec(BABR)", 35 },
+                { NULL },
+        };
+
+        fep = netdev_priv(dev);
+        b = 64 + 13;
+
+        /* Setup interrupt handlers. */
+        for (idp = id; idp->name; idp++) {
+                if (request_irq(b+idp->irq,fec_enet_interrupt,0,idp->name,dev)!=0)
+                        printk("FEC: Could not allocate %s IRQ(%d)!\n", idp->name, b+idp->irq);
+        }
+
+        /* Unmask interrupts at ColdFire interrupt controller */
+        {
+                volatile unsigned char  *icrp;
+                volatile unsigned long  *imrp;
+
+                icrp = (volatile unsigned char *) (MCF_IPSBAR + MCFICM_INTC0 +
+                        MCFINTC_ICR0);
+                for (b = 36; (b < 49); b++)
+                        icrp[b] = 0x04;
+                imrp = (volatile unsigned long *) (MCF_IPSBAR + MCFICM_INTC0 +
+                        MCFINTC_IMRH);
+                *imrp &= ~0x0001FFF0;
+        }
+        *(volatile unsigned char *)(MCF_IPSBAR + MCF_GPIO_PAR_FEC) |= 0xf0;
+        *(volatile unsigned char *)(MCF_IPSBAR + MCF_GPIO_PAR_FECI2C) |= 0x0f;
+}
+
+static void __inline__ fec_set_mii(struct net_device *dev, struct fec_enet_private *fep)
+{
+        volatile fec_t *fecp;
+
+        fecp = fep->hwp;
+        fecp->fec_r_cntrl = OPT_FRAME_SIZE | 0x04;
+        fecp->fec_x_cntrl = 0x00;
+
+        /*
+         * Set MII speed to 2.5 MHz
+         * See 5282 manual section 17.5.4.7: MSCR
+         */
+        fep->phy_speed = ((((MCF_CLK / 2) / (2500000 / 10)) + 5) / 10) * 2;
+        fecp->fec_mii_speed = fep->phy_speed;
+
+        fec_restart(dev, 0);
+}
+
+static void __inline__ fec_get_mac(struct net_device *dev)
+{
+        struct fec_enet_private *fep = netdev_priv(dev);
+        volatile fec_t *fecp;
+        unsigned char *iap, tmpaddr[ETH_ALEN];
+
+        fecp = fep->hwp;
+
+        if (FEC_FLASHMAC) {
+                /*
+                 * Get MAC address from FLASH.
+                 * If it is all 1's or 0's, use the default.
+                 */
+                iap = FEC_FLASHMAC;
+                if ((iap[0] == 0) && (iap[1] == 0) && (iap[2] == 0) &&
+                   (iap[3] == 0) && (iap[4] == 0) && (iap[5] == 0))
+                        iap = fec_mac_default;
+                if ((iap[0] == 0xff) && (iap[1] == 0xff) && (iap[2] == 0xff) &&
+                   (iap[3] == 0xff) && (iap[4] == 0xff) && (iap[5] == 0xff))
+                        iap = fec_mac_default;
+        } else {
+                *((unsigned long *) &tmpaddr[0]) = fecp->fec_addr_low;
+                *((unsigned short *) &tmpaddr[4]) = (fecp->fec_addr_high >> 16);
+                iap = &tmpaddr[0];
+        }
+
+        memcpy(dev->dev_addr, iap, ETH_ALEN);
+
+        /* Adjust MAC if using default MAC address */
+        if (iap == fec_mac_default)
+                dev->dev_addr[ETH_ALEN-1] = fec_mac_default[ETH_ALEN-1] + fep->index;
+}
+
+static void __inline__ fec_enable_phy_intr(void)
+{
+}
+
+static void __inline__ fec_disable_phy_intr(void)
+{
+}
+
+static void __inline__ fec_phy_ack_intr(void)
+{
+}
+
+static void __inline__ fec_localhw_setup(void)
+{
+}
+
+static void __inline__ fec_uncache(unsigned long addr)
+{
+}
+
+/* ------------------------------------------------------------------------- */
+
 #else
 
 /*
@@ -1952,6 +2148,14 @@ int __init fec_enet_init(struct net_device *dev)
         if (index >= FEC_MAX_PORTS)
                 return -ENXIO;
 
+        /* Allocate memory for buffer descriptors.
+        */
+        mem_addr = __get_free_page(GFP_KERNEL);
+        if (mem_addr == 0) {
+                printk("FEC: allocate descriptor memory failed?\n");
+                return -ENOMEM;
+        }
+
         /* Create an Ethernet device instance.
         */
         fecp = (volatile fec_t *) fec_hw[index];
@@ -1964,16 +2168,6 @@ int __init fec_enet_init(struct net_device *dev)
         fecp->fec_ecntrl = 1;
         udelay(10);
 
-        /* Clear and enable interrupts */
-        fecp->fec_ievent = 0xffc00000;
-        fecp->fec_imask = (FEC_ENET_TXF | FEC_ENET_TXB |
-                FEC_ENET_RXF | FEC_ENET_RXB | FEC_ENET_MII);
-        fecp->fec_hash_table_high = 0;
-        fecp->fec_hash_table_low = 0;
-        fecp->fec_r_buff_size = PKT_MAXBLR_SIZE;
-        fecp->fec_ecntrl = 2;
-        fecp->fec_r_des_active = 0x01000000;
-
         /* Set the Ethernet address.  If using multiple Enets on the 8xx,
          * this needs some work to get unique addresses.
          *
@@ -1982,14 +2176,6 @@ int __init fec_enet_init(struct net_device *dev)
          */
         fec_get_mac(dev);
 
-        /* Allocate memory for buffer descriptors.
-        */
-        if (((RX_RING_SIZE + TX_RING_SIZE) * sizeof(cbd_t)) > PAGE_SIZE) {
-                printk("FEC init error.  Need more space.\n");
-                printk("FEC initialization failed.\n");
-                return 1;
-        }
-        mem_addr = __get_free_page(GFP_KERNEL);
         cbd_base = (cbd_t *)mem_addr;
         /* XXX: missing check for allocation failure */
 
@@ -2067,6 +2253,16 @@ int __init fec_enet_init(struct net_device *dev)
         */
         fec_request_intrs(dev);
 
+        /* Clear and enable interrupts */
+        fecp->fec_ievent = 0xffc00000;
+        fecp->fec_imask = (FEC_ENET_TXF | FEC_ENET_TXB |
+                FEC_ENET_RXF | FEC_ENET_RXB | FEC_ENET_MII);
+        fecp->fec_hash_table_high = 0;
+        fecp->fec_hash_table_low = 0;
+        fecp->fec_r_buff_size = PKT_MAXBLR_SIZE;
+        fecp->fec_ecntrl = 2;
+        fecp->fec_r_des_active = 0x01000000;
+
         dev->base_addr = (unsigned long)fecp;
 
         /* The FEC Ethernet specific entries in the device structure. */
diff --git a/drivers/net/fec.h b/drivers/net/fec.h
index 045761b8a600..965c5c49fcdc 100644
--- a/drivers/net/fec.h
+++ b/drivers/net/fec.h
@@ -1,11 +1,10 @@
 /****************************************************************************/
 
 /*
- *      fec.h  --  Fast Ethernet Controller for Motorola ColdFire 5230,
- *                 5231, 5232, 5234, 5235, 5270, 5271, 5272, 5274, 5275,
- *                 5280 and 5282.
+ *      fec.h  --  Fast Ethernet Controller for Motorola ColdFire SoC
+ *                 processors.
  *
- *      (C) Copyright 2000-2003, Greg Ungerer (gerg@snapgear.com)
+ *      (C) Copyright 2000-2005, Greg Ungerer (gerg@snapgear.com)
  *      (C) Copyright 2000-2001, Lineo (www.lineo.com)
  */
 
@@ -14,7 +13,8 @@
 #define FEC_H
 /****************************************************************************/
 
-#if defined(CONFIG_M523x) || defined(CONFIG_M527x) || defined(CONFIG_M528x)
+#if defined(CONFIG_M523x) || defined(CONFIG_M527x) || defined(CONFIG_M528x) || \
+    defined(CONFIG_M520x)
 /*
  *      Just figures, Motorola would have to change the offsets for
  *      registers in the same peripheral device on different models
diff --git a/drivers/net/fec_8xx/Kconfig b/drivers/net/fec_8xx/Kconfig
index 4560026ed419..94e7a9af8705 100644
--- a/drivers/net/fec_8xx/Kconfig
+++ b/drivers/net/fec_8xx/Kconfig
@@ -1,6 +1,6 @@
 config FEC_8XX
         tristate "Motorola 8xx FEC driver"
-        depends on NET_ETHERNET
+        depends on NET_ETHERNET && FEC
         select MII
 
 config FEC_8XX_GENERIC_PHY
diff --git a/drivers/net/hamradio/dmascc.c b/drivers/net/hamradio/dmascc.c
index 3be3f916643a..c8dc40214a08 100644
--- a/drivers/net/hamradio/dmascc.c
+++ b/drivers/net/hamradio/dmascc.c
@@ -311,16 +311,6 @@ static void __exit dmascc_exit(void)
         }
 }
 
-#ifndef MODULE
-void __init dmascc_setup(char *str, int *ints)
-{
-        int i;
-
-        for (i = 0; i < MAX_NUM_DEVS && i < ints[0]; i++)
-                io[i] = ints[i + 1];
-}
-#endif
-
 static int __init dmascc_init(void)
 {
         int h, i, j, n;
diff --git a/drivers/net/ixgb/ixgb_ethtool.c b/drivers/net/ixgb/ixgb_ethtool.c
index 04e47189d830..d38ade5f2f4e 100644
--- a/drivers/net/ixgb/ixgb_ethtool.c
+++ b/drivers/net/ixgb/ixgb_ethtool.c
@@ -694,7 +694,7 @@ ixgb_get_strings(struct net_device *netdev, uint32_t stringset, uint8_t *data)
         }
 }
 
-struct ethtool_ops ixgb_ethtool_ops = {
+static struct ethtool_ops ixgb_ethtool_ops = {
         .get_settings = ixgb_get_settings,
         .set_settings = ixgb_set_settings,
         .get_drvinfo = ixgb_get_drvinfo,
diff --git a/drivers/net/ixgb/ixgb_hw.c b/drivers/net/ixgb/ixgb_hw.c
index 69329c73095a..620cad48bdea 100644
--- a/drivers/net/ixgb/ixgb_hw.c
+++ b/drivers/net/ixgb/ixgb_hw.c
@@ -47,9 +47,22 @@ static void ixgb_optics_reset(struct ixgb_hw *hw);
 
 static ixgb_phy_type ixgb_identify_phy(struct ixgb_hw *hw);
 
-uint32_t ixgb_mac_reset(struct ixgb_hw *hw);
+static void ixgb_clear_hw_cntrs(struct ixgb_hw *hw);
 
-uint32_t ixgb_mac_reset(struct ixgb_hw *hw)
+static void ixgb_clear_vfta(struct ixgb_hw *hw);
+
+static void ixgb_init_rx_addrs(struct ixgb_hw *hw);
+
+static uint16_t ixgb_read_phy_reg(struct ixgb_hw *hw,
+                                  uint32_t reg_address,
+                                  uint32_t phy_address,
+                                  uint32_t device_type);
+
+static boolean_t ixgb_setup_fc(struct ixgb_hw *hw);
+
+static boolean_t mac_addr_valid(uint8_t *mac_addr);
+
+static uint32_t ixgb_mac_reset(struct ixgb_hw *hw)
 {
         uint32_t ctrl_reg;
 
@@ -335,7 +348,7 @@ ixgb_init_hw(struct ixgb_hw *hw)
  * of the receive addresss registers. Clears the multicast table. Assumes
  * the receiver is in reset when the routine is called.
  *****************************************************************************/
-void
+static void
 ixgb_init_rx_addrs(struct ixgb_hw *hw)
 {
         uint32_t i;
@@ -604,7 +617,7 @@ ixgb_write_vfta(struct ixgb_hw *hw,
  *
  * hw - Struct containing variables accessed by shared code
  *****************************************************************************/
-void
+static void
 ixgb_clear_vfta(struct ixgb_hw *hw)
 {
         uint32_t offset;
@@ -620,7 +633,7 @@ ixgb_clear_vfta(struct ixgb_hw *hw)
  * hw - Struct containing variables accessed by shared code
  *****************************************************************************/
 
-boolean_t
+static boolean_t
 ixgb_setup_fc(struct ixgb_hw *hw)
 {
         uint32_t ctrl_reg;
@@ -722,7 +735,7 @@ ixgb_setup_fc(struct ixgb_hw *hw)
  * This requires that first an address cycle command is sent, followed by a
  * read command.
  *****************************************************************************/
-uint16_t
+static uint16_t
 ixgb_read_phy_reg(struct ixgb_hw *hw,
                 uint32_t reg_address,
                 uint32_t phy_address,
@@ -815,7 +828,7 @@ ixgb_read_phy_reg(struct ixgb_hw *hw,
  * This requires that first an address cycle command is sent, followed by a
  * write command.
  *****************************************************************************/
-void
+static void
 ixgb_write_phy_reg(struct ixgb_hw *hw,
                         uint32_t reg_address,
                         uint32_t phy_address,
@@ -959,7 +972,7 @@ boolean_t ixgb_check_for_bad_link(struct ixgb_hw *hw)
  *
  * hw - Struct containing variables accessed by shared code
  *****************************************************************************/
-void
+static void
 ixgb_clear_hw_cntrs(struct ixgb_hw *hw)
 {
         volatile uint32_t temp_reg;
@@ -1114,7 +1127,7 @@ ixgb_get_bus_info(struct ixgb_hw *hw)
  * mac_addr - pointer to MAC address.
  *
  *****************************************************************************/
-boolean_t
+static boolean_t
 mac_addr_valid(uint8_t *mac_addr)
 {
         boolean_t is_valid = TRUE;
diff --git a/drivers/net/ixgb/ixgb_hw.h b/drivers/net/ixgb/ixgb_hw.h
index 8bcf31ed10c2..382c6300ccc2 100644
--- a/drivers/net/ixgb/ixgb_hw.h
+++ b/drivers/net/ixgb/ixgb_hw.h
@@ -784,23 +784,8 @@ struct ixgb_hw_stats {
 extern boolean_t ixgb_adapter_stop(struct ixgb_hw *hw);
 extern boolean_t ixgb_init_hw(struct ixgb_hw *hw);
 extern boolean_t ixgb_adapter_start(struct ixgb_hw *hw);
-extern void ixgb_init_rx_addrs(struct ixgb_hw *hw);
 extern void ixgb_check_for_link(struct ixgb_hw *hw);
 extern boolean_t ixgb_check_for_bad_link(struct ixgb_hw *hw);
-extern boolean_t ixgb_setup_fc(struct ixgb_hw *hw);
-extern void ixgb_clear_hw_cntrs(struct ixgb_hw *hw);
-extern boolean_t mac_addr_valid(uint8_t *mac_addr);
-
-extern uint16_t ixgb_read_phy_reg(struct ixgb_hw *hw,
-                                uint32_t reg_addr,
-                                uint32_t phy_addr,
-                                uint32_t device_type);
-
-extern void ixgb_write_phy_reg(struct ixgb_hw *hw,
-                                uint32_t reg_addr,
-                                uint32_t phy_addr,
-                                uint32_t device_type,
-                                uint16_t data);
 
 extern void ixgb_rar_set(struct ixgb_hw *hw,
                                 uint8_t *addr,
@@ -818,8 +803,6 @@ extern void ixgb_write_vfta(struct ixgb_hw *hw,
                                  uint32_t offset,
                                  uint32_t value);
 
-extern void ixgb_clear_vfta(struct ixgb_hw *hw);
-
 /* Access functions to eeprom data */
 void ixgb_get_ee_mac_addr(struct ixgb_hw *hw, uint8_t *mac_addr);
 uint32_t ixgb_get_ee_pba_number(struct ixgb_hw *hw);
diff --git a/drivers/net/ixgb/ixgb_main.c b/drivers/net/ixgb/ixgb_main.c
index 176680cb153e..f9f77e4f5965 100644
--- a/drivers/net/ixgb/ixgb_main.c
+++ b/drivers/net/ixgb/ixgb_main.c
@@ -45,7 +45,7 @@
  */
 
 char ixgb_driver_name[] = "ixgb";
-char ixgb_driver_string[] = "Intel(R) PRO/10GbE Network Driver";
+static char ixgb_driver_string[] = "Intel(R) PRO/10GbE Network Driver";
 
 #ifndef CONFIG_IXGB_NAPI
 #define DRIVERNAPI
diff --git a/drivers/net/jazzsonic.c b/drivers/net/jazzsonic.c
index a74a5cfaf5bc..2fb3101cb33e 100644
--- a/drivers/net/jazzsonic.c
+++ b/drivers/net/jazzsonic.c
@@ -285,18 +285,8 @@ static struct device_driver jazz_sonic_driver = {
         .remove = __devexit_p(jazz_sonic_device_remove),
 };
 
-static void jazz_sonic_platform_release (struct device *device)
-{
-        struct platform_device *pldev;
-
-        /* free device */
-        pldev = to_platform_device (device);
-        kfree (pldev);
-}
-
 static int __init jazz_sonic_init_module(void)
 {
-        struct platform_device *pldev;
         int err;
 
         if ((err = driver_register(&jazz_sonic_driver))) {
@@ -304,27 +294,19 @@ static int __init jazz_sonic_init_module(void)
                 return err;
         }
 
-        jazz_sonic_device = NULL;
-
-        if (!(pldev = kmalloc (sizeof (*pldev), GFP_KERNEL))) {
+        jazz_sonic_device = platform_device_alloc(jazz_sonic_string, 0);
+        if (!jazz_sonnic_device)
                 goto out_unregister;
-        }
 
-        memset(pldev, 0, sizeof (*pldev));
-        pldev->name             = jazz_sonic_string;
-        pldev->id               = 0;
-        pldev->dev.release      = jazz_sonic_platform_release;
-        jazz_sonic_device       = pldev;
-
-        if (platform_device_register (pldev)) {
-                kfree(pldev);
+        if (platform_device_add(jazz_sonic_device)) {
+                platform_device_put(jazz_sonic_device);
                 jazz_sonic_device = NULL;
         }
 
         return 0;
 
 out_unregister:
-        platform_device_unregister(pldev);
+        driver_unregister(&jazz_sonic_driver);
 
         return -ENOMEM;
 }
diff --git a/drivers/net/macsonic.c b/drivers/net/macsonic.c
index e9c999d7eb39..9ef4592aca03 100644
--- a/drivers/net/macsonic.c
+++ b/drivers/net/macsonic.c
@@ -599,18 +599,8 @@ static struct device_driver mac_sonic_driver = {
         .remove = __devexit_p(mac_sonic_device_remove),
 };
 
-static void mac_sonic_platform_release(struct device *device)
-{
-        struct platform_device *pldev;
-
-        /* free device */
-        pldev = to_platform_device (device);
-        kfree (pldev);
-}
-
 static int __init mac_sonic_init_module(void)
 {
-        struct platform_device *pldev;
         int err;
 
         if ((err = driver_register(&mac_sonic_driver))) {
@@ -618,27 +608,20 @@ static int __init mac_sonic_init_module(void)
                 return err;
         }
 
-        mac_sonic_device = NULL;
-
-        if (!(pldev = kmalloc (sizeof (*pldev), GFP_KERNEL))) {
+        mac_sonic_device = platform_device_alloc(mac_sonic_string, 0);
+        if (!mac_sonic_device) {
                 goto out_unregister;
         }
 
-        memset(pldev, 0, sizeof (*pldev));
-        pldev->name             = mac_sonic_string;
-        pldev->id               = 0;
-        pldev->dev.release      = mac_sonic_platform_release;
-        mac_sonic_device        = pldev;
-
-        if (platform_device_register (pldev)) {
-                kfree(pldev);
+        if (platform_device_add(mac_sonic_device)) {
+                platform_device_put(mac_sonic_device);
                 mac_sonic_device = NULL;
         }
 
         return 0;
 
 out_unregister:
-        platform_device_unregister(pldev);
+        driver_unregister(&mac_sonic_driver);
 
         return -ENOMEM;
 }
diff --git a/drivers/net/phy/cicada.c b/drivers/net/phy/cicada.c
index c47fb2ecd147..7d8d534255c0 100644
--- a/drivers/net/phy/cicada.c
+++ b/drivers/net/phy/cicada.c
@@ -29,7 +29,6 @@
 #include <linux/spinlock.h>
 #include <linux/mm.h>
 #include <linux/module.h>
-#include <linux/version.h>
 #include <linux/mii.h>
 #include <linux/ethtool.h>
 #include <linux/phy.h>
diff --git a/drivers/net/phy/davicom.c b/drivers/net/phy/davicom.c
index 6caf499fae32..5e9002e444c5 100644
--- a/drivers/net/phy/davicom.c
+++ b/drivers/net/phy/davicom.c
@@ -29,7 +29,6 @@
 #include <linux/spinlock.h>
 #include <linux/mm.h>
 #include <linux/module.h>
-#include <linux/version.h>
 #include <linux/mii.h>
 #include <linux/ethtool.h>
 #include <linux/phy.h>
diff --git a/drivers/net/phy/lxt.c b/drivers/net/phy/lxt.c
index 4c840448ec86..bef79e454c33 100644
--- a/drivers/net/phy/lxt.c
+++ b/drivers/net/phy/lxt.c
@@ -29,7 +29,6 @@
 #include <linux/spinlock.h>
 #include <linux/mm.h>
 #include <linux/module.h>
-#include <linux/version.h>
 #include <linux/mii.h>
 #include <linux/ethtool.h>
 #include <linux/phy.h>
diff --git a/drivers/net/phy/marvell.c b/drivers/net/phy/marvell.c
index 4a72b025006b..a2d6386d13bc 100644
--- a/drivers/net/phy/marvell.c
+++ b/drivers/net/phy/marvell.c
@@ -29,7 +29,6 @@
 #include <linux/spinlock.h>
 #include <linux/mm.h>
 #include <linux/module.h>
-#include <linux/version.h>
 #include <linux/mii.h>
 #include <linux/ethtool.h>
 #include <linux/phy.h>
diff --git a/drivers/net/phy/mdio_bus.c b/drivers/net/phy/mdio_bus.c
index 5eab9c42a111..02940c0fef68 100644
--- a/drivers/net/phy/mdio_bus.c
+++ b/drivers/net/phy/mdio_bus.c
@@ -29,7 +29,6 @@
 #include <linux/spinlock.h>
 #include <linux/mm.h>
 #include <linux/module.h>
-#include <linux/version.h>
 #include <linux/mii.h>
 #include <linux/ethtool.h>
 #include <linux/phy.h>
diff --git a/drivers/net/phy/phy.c b/drivers/net/phy/phy.c
index 9209da9dde0d..b8686e47f899 100644
--- a/drivers/net/phy/phy.c
+++ b/drivers/net/phy/phy.c
@@ -30,7 +30,6 @@
 #include <linux/spinlock.h>
 #include <linux/mm.h>
 #include <linux/module.h>
-#include <linux/version.h>
 #include <linux/mii.h>
 #include <linux/ethtool.h>
 #include <linux/phy.h>
diff --git a/drivers/net/phy/phy_device.c b/drivers/net/phy/phy_device.c
index 6da1aa0706a1..16bebe7a7ce1 100644
--- a/drivers/net/phy/phy_device.c
+++ b/drivers/net/phy/phy_device.c
@@ -30,7 +30,6 @@
 #include <linux/spinlock.h>
 #include <linux/mm.h>
 #include <linux/module.h>
-#include <linux/version.h>
 #include <linux/mii.h>
 #include <linux/ethtool.h>
 #include <linux/phy.h>
diff --git a/drivers/net/phy/qsemi.c b/drivers/net/phy/qsemi.c
index d461ba457631..65d995b02b25 100644
--- a/drivers/net/phy/qsemi.c
+++ b/drivers/net/phy/qsemi.c
@@ -29,7 +29,6 @@
 #include <linux/spinlock.h>
 #include <linux/mm.h>
 #include <linux/module.h>
-#include <linux/version.h>
 #include <linux/mii.h>
 #include <linux/ethtool.h>
 #include <linux/phy.h>
diff --git a/drivers/net/s2io.c b/drivers/net/s2io.c
index 9c4935407f26..0745dd9d01f3 100644
--- a/drivers/net/s2io.c
+++ b/drivers/net/s2io.c
@@ -2110,7 +2110,7 @@ int fill_rxd_3buf(nic_t *nic, RxD_t *rxdp, struct sk_buff *skb)
 {
         struct net_device *dev = nic->dev;
         struct sk_buff *frag_list;
-        u64 tmp;
+        void *tmp;
 
         /* Buffer-1 receives L3/L4 headers */
         ((RxD3_t*)rxdp)->Buffer1_ptr = pci_map_single
@@ -2125,11 +2125,9 @@ int fill_rxd_3buf(nic_t *nic, RxD_t *rxdp, struct sk_buff *skb)
         }
         frag_list = skb_shinfo(skb)->frag_list;
         frag_list->next = NULL;
-        tmp = (u64) frag_list->data;
-        tmp += ALIGN_SIZE;
-        tmp &= ~ALIGN_SIZE;
-        frag_list->data = (void *) tmp;
-        frag_list->tail = (void *) tmp;
+        tmp = (void *)ALIGN((long)frag_list->data, ALIGN_SIZE + 1);
+        frag_list->data = tmp;
+        frag_list->tail = tmp;
 
         /* Buffer-2 receives L4 data payload */
         ((RxD3_t*)rxdp)->Buffer2_ptr = pci_map_single(nic->pdev,
diff --git a/drivers/net/wireless/airo.c b/drivers/net/wireless/airo.c
index 849ac88bcccc..6afc6e5dee9b 100644
--- a/drivers/net/wireless/airo.c
+++ b/drivers/net/wireless/airo.c
@@ -47,6 +47,8 @@
 #include <linux/pci.h>
 #include <asm/uaccess.h>
 
+#include "airo.h"
+
 #ifdef CONFIG_PCI
 static struct pci_device_id card_ids[] = {
         { 0x14b9, 1, PCI_ANY_ID, PCI_ANY_ID, },
diff --git a/drivers/net/wireless/airo.h b/drivers/net/wireless/airo.h
new file mode 100644
index 000000000000..e480adf86be6
--- /dev/null
+++ b/drivers/net/wireless/airo.h
@@ -0,0 +1,9 @@
+#ifndef _AIRO_H_
+#define _AIRO_H_
+
+struct net_device *init_airo_card(unsigned short irq, int port, int is_pcmcia,
+                                  struct device *dmdev);
+int reset_airo_card(struct net_device *dev);
+void stop_airo_card(struct net_device *dev, int freeres);
+
+#endif  /*  _AIRO_H_  */
diff --git a/drivers/net/wireless/airo_cs.c b/drivers/net/wireless/airo_cs.c
index 784de9109113..96ed8da8661d 100644
--- a/drivers/net/wireless/airo_cs.c
+++ b/drivers/net/wireless/airo_cs.c
@@ -42,6 +42,8 @@
 #include <asm/io.h>
 #include <asm/system.h>
 
+#include "airo.h"
+
 /*
    All the PCMCIA modules use PCMCIA_DEBUG to control debugging.  If
    you do not define PCMCIA_DEBUG at all, all the debug code will be
@@ -78,10 +80,6 @@ MODULE_SUPPORTED_DEVICE("Aironet 4500, 4800 and Cisco 340 PCMCIA cards");
    event handler. 
 */
 
-struct net_device *init_airo_card( int, int, int, struct device * );
-void stop_airo_card( struct net_device *, int );
-int reset_airo_card( struct net_device * );
-
 static void airo_config(dev_link_t *link);
 static void airo_release(dev_link_t *link);
 static int airo_event(event_t event, int priority,
diff --git a/drivers/net/wireless/prism54/islpci_eth.c b/drivers/net/wireless/prism54/islpci_eth.c
index 3b49efa37ee5..fc1eb3564832 100644
--- a/drivers/net/wireless/prism54/islpci_eth.c
+++ b/drivers/net/wireless/prism54/islpci_eth.c
@@ -244,7 +244,6 @@ islpci_eth_transmit(struct sk_buff *skb, struct net_device *ndev)
         priv->statistics.tx_dropped++;
         spin_unlock_irqrestore(&priv->slock, flags);
         dev_kfree_skb(skb);
-        skb = NULL;
         return err;
 }
 
diff --git a/drivers/parport/probe.c b/drivers/parport/probe.c
index 6e6f42d01e64..4b48b31ec235 100644
--- a/drivers/parport/probe.c
+++ b/drivers/parport/probe.c
@@ -78,17 +78,15 @@ static void parse_data(struct parport *port, int device, char *str)
                                 u++;
                         }
                         if (!strcmp(p, "MFG") || !strcmp(p, "MANUFACTURER")) {
-                                if (info->mfr)
-                                        kfree (info->mfr);
+                                kfree(info->mfr);
                                 info->mfr = kstrdup(sep, GFP_KERNEL);
                         } else if (!strcmp(p, "MDL") || !strcmp(p, "MODEL")) {
-                                if (info->model)
-                                        kfree (info->model);
+                                kfree(info->model);
                                 info->model = kstrdup(sep, GFP_KERNEL);
                         } else if (!strcmp(p, "CLS") || !strcmp(p, "CLASS")) {
                                 int i;
-                                if (info->class_name)
-                                        kfree (info->class_name);
+
+                                kfree(info->class_name);
                                 info->class_name = kstrdup(sep, GFP_KERNEL);
                                 for (u = sep; *u; u++)
                                         *u = toupper(*u);
@@ -102,21 +100,22 @@ static void parse_data(struct parport *port, int device, char *str)
                                 info->class = PARPORT_CLASS_OTHER;
                         } else if (!strcmp(p, "CMD") ||
                                    !strcmp(p, "COMMAND SET")) {
-                                if (info->cmdset)
-                                        kfree (info->cmdset);
+                                kfree(info->cmdset);
                                 info->cmdset = kstrdup(sep, GFP_KERNEL);
                                 /* if it speaks printer language, it's
                                    probably a printer */
                                 if (strstr(sep, "PJL") || strstr(sep, "PCL"))
                                         guessed_class = PARPORT_CLASS_PRINTER;
                         } else if (!strcmp(p, "DES") || !strcmp(p, "DESCRIPTION")) {
-                                if (info->description)
-                                        kfree (info->description);
+                                kfree(info->description);
                                 info->description = kstrdup(sep, GFP_KERNEL);
                         }
                 }
         rock_on:
-                if (q) p = q+1; else p=NULL;
+                if (q)
+                        p = q + 1;
+                else
+                        p = NULL;
         }
 
         /* If the device didn't tell us its class, maybe we have managed to
diff --git a/drivers/parport/share.c b/drivers/parport/share.c
index ae7becf7efa5..9cb3ab156b09 100644
--- a/drivers/parport/share.c
+++ b/drivers/parport/share.c
@@ -202,16 +202,11 @@ static void free_port (struct parport *port)
         list_del(&port->full_list);
         spin_unlock(&full_list_lock);
         for (d = 0; d < 5; d++) {
-                if (port->probe_info[d].class_name)
-                        kfree (port->probe_info[d].class_name);
-                if (port->probe_info[d].mfr)
-                        kfree (port->probe_info[d].mfr);
-                if (port->probe_info[d].model)
-                        kfree (port->probe_info[d].model);
-                if (port->probe_info[d].cmdset)
-                        kfree (port->probe_info[d].cmdset);
-                if (port->probe_info[d].description)
-                        kfree (port->probe_info[d].description);
+                kfree(port->probe_info[d].class_name);
+                kfree(port->probe_info[d].mfr);
+                kfree(port->probe_info[d].model);
+                kfree(port->probe_info[d].cmdset);
+                kfree(port->probe_info[d].description);
         }
 
         kfree(port->name);
@@ -618,9 +613,9 @@ parport_register_device(struct parport *port, const char *name,
         return tmp;
 
  out_free_all:
-        kfree (tmp->state);
+        kfree(tmp->state);
  out_free_pardevice:
-        kfree (tmp);
+        kfree(tmp);
  out:
         parport_put_port (port);
         module_put(port->ops->owner);
diff --git a/drivers/pci/hotplug/cpqphp_pci.c b/drivers/pci/hotplug/cpqphp_pci.c
index 93e39c4096a9..00b81a7bdd26 100644
--- a/drivers/pci/hotplug/cpqphp_pci.c
+++ b/drivers/pci/hotplug/cpqphp_pci.c
@@ -259,8 +259,7 @@ static int PCI_GetBusDevHelper(struct controller *ctrl, u8 *bus_num, u8 *dev_num
                sizeof(struct irq_routing_table)) / sizeof(struct irq_info);
         // Make sure I got at least one entry
         if (len == 0) {
-                if (PCIIRQRoutingInfoLength != NULL)
-                        kfree(PCIIRQRoutingInfoLength );
+                kfree(PCIIRQRoutingInfoLength );
                 return -1;
         }
 
@@ -275,8 +274,7 @@ static int PCI_GetBusDevHelper(struct controller *ctrl, u8 *bus_num, u8 *dev_num
                         ctrl->pci_bus->number = tbus;
                         pci_bus_read_config_dword (ctrl->pci_bus, *dev_num, PCI_VENDOR_ID, &work);
                         if (!nobridge || (work == 0xffffffff)) {
-                                if (PCIIRQRoutingInfoLength != NULL)
-                                        kfree(PCIIRQRoutingInfoLength );
+                                kfree(PCIIRQRoutingInfoLength );
                                 return 0;
                         }
 
@@ -289,20 +287,17 @@ static int PCI_GetBusDevHelper(struct controller *ctrl, u8 *bus_num, u8 *dev_num
                                 dbg("Scan bus for Non Bridge: bus %d\n", tbus);
                                 if (PCI_ScanBusForNonBridge(ctrl, tbus, dev_num) == 0) {
                                         *bus_num = tbus;
-                                        if (PCIIRQRoutingInfoLength != NULL)
-                                                kfree(PCIIRQRoutingInfoLength );
+                                        kfree(PCIIRQRoutingInfoLength );
                                         return 0;
                                 }
                         } else {
-                                if (PCIIRQRoutingInfoLength != NULL)
-                                        kfree(PCIIRQRoutingInfoLength );
+                                kfree(PCIIRQRoutingInfoLength );
                                 return 0;
                         }
 
                 }
         }
-        if (PCIIRQRoutingInfoLength != NULL)
-                kfree(PCIIRQRoutingInfoLength );
+        kfree(PCIIRQRoutingInfoLength );
         return -1;
 }
 
diff --git a/drivers/pci/hotplug/pciehprm_nonacpi.c b/drivers/pci/hotplug/pciehprm_nonacpi.c
index 33b2c69a0829..76c727c74cc0 100644
--- a/drivers/pci/hotplug/pciehprm_nonacpi.c
+++ b/drivers/pci/hotplug/pciehprm_nonacpi.c
@@ -31,6 +31,7 @@
 #include <linux/module.h>
 #include <linux/kernel.h>
 #include <linux/types.h>
+#include <linux/sched.h>
 #include <linux/pci.h>
 #include <linux/init.h>
 #include <linux/slab.h>
diff --git a/drivers/pci/pci-driver.c b/drivers/pci/pci-driver.c
index ae986e590b48..94e68c54d273 100644
--- a/drivers/pci/pci-driver.c
+++ b/drivers/pci/pci-driver.c
@@ -10,6 +10,7 @@
 #include <linux/mempolicy.h>
 #include <linux/string.h>
 #include <linux/slab.h>
+#include <linux/sched.h>
 #include "pci.h"
 
 /*
diff --git a/drivers/pcmcia/cistpl.c b/drivers/pcmcia/cistpl.c
index 3afb682255a0..2dc3e611a9a3 100644
--- a/drivers/pcmcia/cistpl.c
+++ b/drivers/pcmcia/cistpl.c
@@ -334,10 +334,8 @@ void destroy_cis_cache(struct pcmcia_socket *s)
         /*
          * If there was a fake CIS, destroy that as well.
          */
-        if (s->fake_cis) {
-                kfree(s->fake_cis);
-                s->fake_cis = NULL;
-        }
+        kfree(s->fake_cis);
+        s->fake_cis = NULL;
 }
 EXPORT_SYMBOL(destroy_cis_cache);
 
@@ -386,10 +384,8 @@ int verify_cis_cache(struct pcmcia_socket *s)
 
 int pcmcia_replace_cis(struct pcmcia_socket *s, cisdump_t *cis)
 {
-    if (s->fake_cis != NULL) {
-        kfree(s->fake_cis);
-        s->fake_cis = NULL;
-    }
+    kfree(s->fake_cis);
+    s->fake_cis = NULL;
     if (cis->Length > CISTPL_MAX_CIS_SIZE)
         return CS_BAD_SIZE;
     s->fake_cis = kmalloc(cis->Length, GFP_KERNEL);
diff --git a/drivers/pcmcia/cs.c b/drivers/pcmcia/cs.c
index d5e76423a0ee..234cdca6fe13 100644
--- a/drivers/pcmcia/cs.c
+++ b/drivers/pcmcia/cs.c
@@ -331,10 +331,8 @@ static void shutdown_socket(struct pcmcia_socket *s)
         cb_free(s);
 #endif
         s->functions = 0;
-        if (s->config) {
-                kfree(s->config);
-                s->config = NULL;
-        }
+        kfree(s->config);
+        s->config = NULL;
 
         {
                 int status;
diff --git a/drivers/pnp/card.c b/drivers/pnp/card.c
index e95ed67d4f05..bd7c966ea2d7 100644
--- a/drivers/pnp/card.c
+++ b/drivers/pnp/card.c
@@ -12,7 +12,7 @@
 #include "base.h"
 
 LIST_HEAD(pnp_cards);
-LIST_HEAD(pnp_card_drivers);
+static LIST_HEAD(pnp_card_drivers);
 
 
 static const struct pnp_card_device_id * match_card(struct pnp_card_driver * drv, struct pnp_card * card)
@@ -374,11 +374,13 @@ void pnp_unregister_card_driver(struct pnp_card_driver * drv)
         pnp_unregister_driver(&drv->link);
 }
 
+#if 0
 EXPORT_SYMBOL(pnp_add_card);
 EXPORT_SYMBOL(pnp_remove_card);
 EXPORT_SYMBOL(pnp_add_card_device);
 EXPORT_SYMBOL(pnp_remove_card_device);
 EXPORT_SYMBOL(pnp_add_card_id);
+#endif  /*  0  */
 EXPORT_SYMBOL(pnp_request_card_device);
 EXPORT_SYMBOL(pnp_release_card_device);
 EXPORT_SYMBOL(pnp_register_card_driver);
diff --git a/drivers/pnp/core.c b/drivers/pnp/core.c
index deed92459bc5..aec83ec5ea23 100644
--- a/drivers/pnp/core.c
+++ b/drivers/pnp/core.c
@@ -158,13 +158,14 @@ void __pnp_remove_device(struct pnp_dev *dev)
  *
  * this function will free all mem used by dev
  */
-
+#if 0
 void pnp_remove_device(struct pnp_dev *dev)
 {
         if (!dev || dev->card)
                 return;
         __pnp_remove_device(dev);
 }
+#endif  /*  0  */
 
 static int __init pnp_init(void)
 {
@@ -174,7 +175,9 @@ static int __init pnp_init(void)
 
 subsys_initcall(pnp_init);
 
+#if 0
 EXPORT_SYMBOL(pnp_register_protocol);
 EXPORT_SYMBOL(pnp_unregister_protocol);
 EXPORT_SYMBOL(pnp_add_device);
 EXPORT_SYMBOL(pnp_remove_device);
+#endif  /*  0  */
diff --git a/drivers/pnp/driver.c b/drivers/pnp/driver.c
index 33da25f3213f..d3ccce706ab4 100644
--- a/drivers/pnp/driver.c
+++ b/drivers/pnp/driver.c
@@ -214,6 +214,8 @@ int pnp_add_id(struct pnp_id *id, struct pnp_dev *dev)
 
 EXPORT_SYMBOL(pnp_register_driver);
 EXPORT_SYMBOL(pnp_unregister_driver);
+#if 0
 EXPORT_SYMBOL(pnp_add_id);
+#endif
 EXPORT_SYMBOL(pnp_device_attach);
 EXPORT_SYMBOL(pnp_device_detach);
diff --git a/drivers/pnp/isapnp/core.c b/drivers/pnp/isapnp/core.c
index beedd86800f4..57fd60314d59 100644
--- a/drivers/pnp/isapnp/core.c
+++ b/drivers/pnp/isapnp/core.c
@@ -941,7 +941,9 @@ EXPORT_SYMBOL(isapnp_protocol);
 EXPORT_SYMBOL(isapnp_present);
 EXPORT_SYMBOL(isapnp_cfg_begin);
 EXPORT_SYMBOL(isapnp_cfg_end);
+#if 0
 EXPORT_SYMBOL(isapnp_read_byte);
+#endif
 EXPORT_SYMBOL(isapnp_write_byte);
 
 static int isapnp_read_resources(struct pnp_dev *dev, struct pnp_resource_table *res)
diff --git a/drivers/pnp/manager.c b/drivers/pnp/manager.c
index cbb2749db178..261668618b2d 100644
--- a/drivers/pnp/manager.c
+++ b/drivers/pnp/manager.c
@@ -555,7 +555,9 @@ void pnp_resource_change(struct resource *resource, unsigned long start, unsigne
 
 
 EXPORT_SYMBOL(pnp_manual_config_dev);
+#if 0
 EXPORT_SYMBOL(pnp_auto_config_dev);
+#endif
 EXPORT_SYMBOL(pnp_activate_dev);
 EXPORT_SYMBOL(pnp_disable_dev);
 EXPORT_SYMBOL(pnp_resource_change);
diff --git a/drivers/pnp/pnpacpi/core.c b/drivers/pnp/pnpacpi/core.c
index 1a8915e74160..816479ad217b 100644
--- a/drivers/pnp/pnpacpi/core.c
+++ b/drivers/pnp/pnpacpi/core.c
@@ -117,7 +117,7 @@ static int pnpacpi_disable_resources(struct pnp_dev *dev)
         return ACPI_FAILURE(status) ? -ENODEV : 0;
 }
 
-struct pnp_protocol pnpacpi_protocol = {
+static struct pnp_protocol pnpacpi_protocol = {
         .name   = "Plug and Play ACPI",
         .get    = pnpacpi_get_resources,
         .set    = pnpacpi_set_resources,
@@ -234,7 +234,7 @@ static acpi_status __init pnpacpi_add_device_handler(acpi_handle handle,
 }
 
 int pnpacpi_disabled __initdata;
-int __init pnpacpi_init(void)
+static int __init pnpacpi_init(void)
 {
         if (acpi_disabled || pnpacpi_disabled) {
                 pnp_info("PnP ACPI: disabled");
@@ -258,4 +258,6 @@ static int __init pnpacpi_setup(char *str)
 }
 __setup("pnpacpi=", pnpacpi_setup);
 
+#if 0
 EXPORT_SYMBOL(pnpacpi_protocol);
+#endif
diff --git a/drivers/pnp/resource.c b/drivers/pnp/resource.c
index 887ad8939349..6ded527169f4 100644
--- a/drivers/pnp/resource.c
+++ b/drivers/pnp/resource.c
@@ -477,12 +477,14 @@ int pnp_check_dma(struct pnp_dev * dev, int idx)
 }
 
 
+#if 0
 EXPORT_SYMBOL(pnp_register_dependent_option);
 EXPORT_SYMBOL(pnp_register_independent_option);
 EXPORT_SYMBOL(pnp_register_irq_resource);
 EXPORT_SYMBOL(pnp_register_dma_resource);
 EXPORT_SYMBOL(pnp_register_port_resource);
 EXPORT_SYMBOL(pnp_register_mem_resource);
+#endif  /*  0  */
 
 
 /* format is: pnp_reserve_irq=irq1[,irq2] .... */
diff --git a/drivers/rapidio/Kconfig b/drivers/rapidio/Kconfig
new file mode 100644
index 000000000000..0b2d2c3579a7
--- /dev/null
+++ b/drivers/rapidio/Kconfig
@@ -0,0 +1,18 @@
+#
+# RapidIO configuration
+#
+config RAPIDIO_8_BIT_TRANSPORT
+        bool "8-bit transport addressing"
+        depends on RAPIDIO
+        ---help---
+          By default, the kernel assumes a 16-bit addressed RapidIO
+          network. By selecting this option, the kernel will support
+          an 8-bit addressed network.
+
+config RAPIDIO_DISC_TIMEOUT
+        int "Discovery timeout duration (seconds)"
+        depends on RAPIDIO
+        default "30"
+        ---help---
+          Amount of time a discovery node waits for a host to complete
+          enumeration beforing giving up.
diff --git a/drivers/rapidio/Makefile b/drivers/rapidio/Makefile
new file mode 100644
index 000000000000..7c0e1818de51
--- /dev/null
+++ b/drivers/rapidio/Makefile
@@ -0,0 +1,6 @@
+#
+# Makefile for RapidIO interconnect services
+#
+obj-y += rio.o rio-access.o rio-driver.o rio-scan.o rio-sysfs.o
+
+obj-$(CONFIG_RAPIDIO)           += switches/
diff --git a/drivers/rapidio/rio-access.c b/drivers/rapidio/rio-access.c
new file mode 100644
index 000000000000..b9fab2ae3a36
--- /dev/null
+++ b/drivers/rapidio/rio-access.c
@@ -0,0 +1,175 @@
+/*
+ * RapidIO configuration space access support
+ *
+ * Copyright 2005 MontaVista Software, Inc.
+ * Matt Porter <mporter@kernel.crashing.org>
+ *
+ * This program is free software; you can redistribute  it and/or modify it
+ * under  the terms of  the GNU General  Public License as published by the
+ * Free Software Foundation;  either version 2 of the  License, or (at your
+ * option) any later version.
+ */
+
+#include <linux/rio.h>
+#include <linux/module.h>
+
+/*
+ * These interrupt-safe spinlocks protect all accesses to RIO
+ * configuration space and doorbell access.
+ */
+static spinlock_t rio_config_lock = SPIN_LOCK_UNLOCKED;
+static spinlock_t rio_doorbell_lock = SPIN_LOCK_UNLOCKED;
+
+/*
+ *  Wrappers for all RIO configuration access functions.  They just check
+ *  alignment, do locking and call the low-level functions pointed to
+ *  by rio_mport->ops.
+ */
+
+#define RIO_8_BAD 0
+#define RIO_16_BAD (offset & 1)
+#define RIO_32_BAD (offset & 3)
+
+/**
+ * RIO_LOP_READ - Generate rio_local_read_config_* functions
+ * @size: Size of configuration space read (8, 16, 32 bits)
+ * @type: C type of value argument
+ * @len: Length of configuration space read (1, 2, 4 bytes)
+ *
+ * Generates rio_local_read_config_* functions used to access
+ * configuration space registers on the local device.
+ */
+#define RIO_LOP_READ(size,type,len) \
+int __rio_local_read_config_##size \
+        (struct rio_mport *mport, u32 offset, type *value)              \
+{                                                                       \
+        int res;                                                        \
+        unsigned long flags;                                            \
+        u32 data = 0;                                                   \
+        if (RIO_##size##_BAD) return RIO_BAD_SIZE;                      \
+        spin_lock_irqsave(&rio_config_lock, flags);                     \
+        res = mport->ops->lcread(mport->id, offset, len, &data);        \
+        *value = (type)data;                                            \
+        spin_unlock_irqrestore(&rio_config_lock, flags);                \
+        return res;                                                     \
+}
+
+/**
+ * RIO_LOP_WRITE - Generate rio_local_write_config_* functions
+ * @size: Size of configuration space write (8, 16, 32 bits)
+ * @type: C type of value argument
+ * @len: Length of configuration space write (1, 2, 4 bytes)
+ *
+ * Generates rio_local_write_config_* functions used to access
+ * configuration space registers on the local device.
+ */
+#define RIO_LOP_WRITE(size,type,len) \
+int __rio_local_write_config_##size \
+        (struct rio_mport *mport, u32 offset, type value)               \
+{                                                                       \
+        int res;                                                        \
+        unsigned long flags;                                            \
+        if (RIO_##size##_BAD) return RIO_BAD_SIZE;                      \
+        spin_lock_irqsave(&rio_config_lock, flags);                     \
+        res = mport->ops->lcwrite(mport->id, offset, len, value);       \
+        spin_unlock_irqrestore(&rio_config_lock, flags);                \
+        return res;                                                     \
+}
+
+RIO_LOP_READ(8, u8, 1)
+RIO_LOP_READ(16, u16, 2)
+RIO_LOP_READ(32, u32, 4)
+RIO_LOP_WRITE(8, u8, 1)
+RIO_LOP_WRITE(16, u16, 2)
+RIO_LOP_WRITE(32, u32, 4)
+
+EXPORT_SYMBOL_GPL(__rio_local_read_config_8);
+EXPORT_SYMBOL_GPL(__rio_local_read_config_16);
+EXPORT_SYMBOL_GPL(__rio_local_read_config_32);
+EXPORT_SYMBOL_GPL(__rio_local_write_config_8);
+EXPORT_SYMBOL_GPL(__rio_local_write_config_16);
+EXPORT_SYMBOL_GPL(__rio_local_write_config_32);
+
+/**
+ * RIO_OP_READ - Generate rio_mport_read_config_* functions
+ * @size: Size of configuration space read (8, 16, 32 bits)
+ * @type: C type of value argument
+ * @len: Length of configuration space read (1, 2, 4 bytes)
+ *
+ * Generates rio_mport_read_config_* functions used to access
+ * configuration space registers on the local device.
+ */
+#define RIO_OP_READ(size,type,len) \
+int rio_mport_read_config_##size \
+        (struct rio_mport *mport, u16 destid, u8 hopcount, u32 offset, type *value)     \
+{                                                                       \
+        int res;                                                        \
+        unsigned long flags;                                            \
+        u32 data = 0;                                                   \
+        if (RIO_##size##_BAD) return RIO_BAD_SIZE;                      \
+        spin_lock_irqsave(&rio_config_lock, flags);                     \
+        res = mport->ops->cread(mport->id, destid, hopcount, offset, len, &data); \
+        *value = (type)data;                                            \
+        spin_unlock_irqrestore(&rio_config_lock, flags);                \
+        return res;                                                     \
+}
+
+/**
+ * RIO_OP_WRITE - Generate rio_mport_write_config_* functions
+ * @size: Size of configuration space write (8, 16, 32 bits)
+ * @type: C type of value argument
+ * @len: Length of configuration space write (1, 2, 4 bytes)
+ *
+ * Generates rio_mport_write_config_* functions used to access
+ * configuration space registers on the local device.
+ */
+#define RIO_OP_WRITE(size,type,len) \
+int rio_mport_write_config_##size \
+        (struct rio_mport *mport, u16 destid, u8 hopcount, u32 offset, type value)      \
+{                                                                       \
+        int res;                                                        \
+        unsigned long flags;                                            \
+        if (RIO_##size##_BAD) return RIO_BAD_SIZE;                      \
+        spin_lock_irqsave(&rio_config_lock, flags);                     \
+        res = mport->ops->cwrite(mport->id, destid, hopcount, offset, len, value); \
+        spin_unlock_irqrestore(&rio_config_lock, flags);                \
+        return res;                                                     \
+}
+
+RIO_OP_READ(8, u8, 1)
+RIO_OP_READ(16, u16, 2)
+RIO_OP_READ(32, u32, 4)
+RIO_OP_WRITE(8, u8, 1)
+RIO_OP_WRITE(16, u16, 2)
+RIO_OP_WRITE(32, u32, 4)
+
+EXPORT_SYMBOL_GPL(rio_mport_read_config_8);
+EXPORT_SYMBOL_GPL(rio_mport_read_config_16);
+EXPORT_SYMBOL_GPL(rio_mport_read_config_32);
+EXPORT_SYMBOL_GPL(rio_mport_write_config_8);
+EXPORT_SYMBOL_GPL(rio_mport_write_config_16);
+EXPORT_SYMBOL_GPL(rio_mport_write_config_32);
+
+/**
+ * rio_mport_send_doorbell - Send a doorbell message
+ *
+ * @mport: RIO master port
+ * @destid: RIO device destination ID
+ * @data: Doorbell message data
+ *
+ * Send a doorbell message to a RIO device. The doorbell message
+ * has a 16-bit info field provided by the data argument.
+ */
+int rio_mport_send_doorbell(struct rio_mport *mport, u16 destid, u16 data)
+{
+        int res;
+        unsigned long flags;
+
+        spin_lock_irqsave(&rio_doorbell_lock, flags);
+        res = mport->ops->dsend(mport->id, destid, data);
+        spin_unlock_irqrestore(&rio_doorbell_lock, flags);
+
+        return res;
+}
+
+EXPORT_SYMBOL_GPL(rio_mport_send_doorbell);
diff --git a/drivers/rapidio/rio-driver.c b/drivers/rapidio/rio-driver.c
new file mode 100644
index 000000000000..dc749609699a
--- /dev/null
+++ b/drivers/rapidio/rio-driver.c
@@ -0,0 +1,229 @@
+/*
+ * RapidIO driver support
+ *
+ * Copyright 2005 MontaVista Software, Inc.
+ * Matt Porter <mporter@kernel.crashing.org>
+ *
+ * This program is free software; you can redistribute  it and/or modify it
+ * under  the terms of  the GNU General  Public License as published by the
+ * Free Software Foundation;  either version 2 of the  License, or (at your
+ * option) any later version.
+ */
+
+#include <linux/init.h>
+#include <linux/module.h>
+#include <linux/rio.h>
+#include <linux/rio_ids.h>
+
+#include "rio.h"
+
+/**
+ *  rio_match_device - Tell if a RIO device has a matching RIO device id structure
+ *  @id: the RIO device id structure to match against
+ *  @rdev: the RIO device structure to match against
+ *
+ *  Used from driver probe and bus matching to check whether a RIO device
+ *  matches a device id structure provided by a RIO driver. Returns the
+ *  matching &struct rio_device_id or %NULL if there is no match.
+ */
+static const struct rio_device_id *rio_match_device(const struct rio_device_id
+                                                    *id,
+                                                    const struct rio_dev *rdev)
+{
+        while (id->vid || id->asm_vid) {
+                if (((id->vid == RIO_ANY_ID) || (id->vid == rdev->vid)) &&
+                    ((id->did == RIO_ANY_ID) || (id->did == rdev->did)) &&
+                    ((id->asm_vid == RIO_ANY_ID)
+                     || (id->asm_vid == rdev->asm_vid))
+                    && ((id->asm_did == RIO_ANY_ID)
+                        || (id->asm_did == rdev->asm_did)))
+                        return id;
+                id++;
+        }
+        return NULL;
+}
+
+/**
+ * rio_dev_get - Increments the reference count of the RIO device structure
+ *
+ * @rdev: RIO device being referenced
+ *
+ * Each live reference to a device should be refcounted.
+ *
+ * Drivers for RIO devices should normally record such references in
+ * their probe() methods, when they bind to a device, and release
+ * them by calling rio_dev_put(), in their disconnect() methods.
+ */
+struct rio_dev *rio_dev_get(struct rio_dev *rdev)
+{
+        if (rdev)
+                get_device(&rdev->dev);
+
+        return rdev;
+}
+
+/**
+ * rio_dev_put - Release a use of the RIO device structure
+ *
+ * @rdev: RIO device being disconnected
+ *
+ * Must be called when a user of a device is finished with it.
+ * When the last user of the device calls this function, the
+ * memory of the device is freed.
+ */
+void rio_dev_put(struct rio_dev *rdev)
+{
+        if (rdev)
+                put_device(&rdev->dev);
+}
+
+/**
+ *  rio_device_probe - Tell if a RIO device structure has a matching RIO
+ *                     device id structure
+ *  @id: the RIO device id structure to match against
+ *  @dev: the RIO device structure to match against
+ *
+ * return 0 and set rio_dev->driver when drv claims rio_dev, else error
+ */
+static int rio_device_probe(struct device *dev)
+{
+        struct rio_driver *rdrv = to_rio_driver(dev->driver);
+        struct rio_dev *rdev = to_rio_dev(dev);
+        int error = -ENODEV;
+        const struct rio_device_id *id;
+
+        if (!rdev->driver && rdrv->probe) {
+                if (!rdrv->id_table)
+                        return error;
+                id = rio_match_device(rdrv->id_table, rdev);
+                rio_dev_get(rdev);
+                if (id)
+                        error = rdrv->probe(rdev, id);
+                if (error >= 0) {
+                        rdev->driver = rdrv;
+                        error = 0;
+                        rio_dev_put(rdev);
+                }
+        }
+        return error;
+}
+
+/**
+ *  rio_device_remove - Remove a RIO device from the system
+ *
+ *  @dev: the RIO device structure to match against
+ *
+ * Remove a RIO device from the system. If it has an associated
+ * driver, then run the driver remove() method.  Then update
+ * the reference count.
+ */
+static int rio_device_remove(struct device *dev)
+{
+        struct rio_dev *rdev = to_rio_dev(dev);
+        struct rio_driver *rdrv = rdev->driver;
+
+        if (rdrv) {
+                if (rdrv->remove)
+                        rdrv->remove(rdev);
+                rdev->driver = NULL;
+        }
+
+        rio_dev_put(rdev);
+
+        return 0;
+}
+
+/**
+ *  rio_register_driver - register a new RIO driver
+ *  @rdrv: the RIO driver structure to register
+ *
+ *  Adds a &struct rio_driver to the list of registered drivers
+ *  Returns a negative value on error, otherwise 0. If no error
+ *  occurred, the driver remains registered even if no device
+ *  was claimed during registration.
+ */
+int rio_register_driver(struct rio_driver *rdrv)
+{
+        /* initialize common driver fields */
+        rdrv->driver.name = rdrv->name;
+        rdrv->driver.bus = &rio_bus_type;
+        rdrv->driver.probe = rio_device_probe;
+        rdrv->driver.remove = rio_device_remove;
+
+        /* register with core */
+        return driver_register(&rdrv->driver);
+}
+
+/**
+ *  rio_unregister_driver - unregister a RIO driver
+ *  @rdrv: the RIO driver structure to unregister
+ *
+ *  Deletes the &struct rio_driver from the list of registered RIO
+ *  drivers, gives it a chance to clean up by calling its remove()
+ *  function for each device it was responsible for, and marks those
+ *  devices as driverless.
+ */
+void rio_unregister_driver(struct rio_driver *rdrv)
+{
+        driver_unregister(&rdrv->driver);
+}
+
+/**
+ *  rio_match_bus - Tell if a RIO device structure has a matching RIO
+ *                  driver device id structure
+ *  @dev: the standard device structure to match against
+ *  @drv: the standard driver structure containing the ids to match against
+ *
+ *  Used by a driver to check whether a RIO device present in the
+ *  system is in its list of supported devices. Returns 1 if
+ *  there is a matching &struct rio_device_id or 0 if there is
+ *  no match.
+ */
+static int rio_match_bus(struct device *dev, struct device_driver *drv)
+{
+        struct rio_dev *rdev = to_rio_dev(dev);
+        struct rio_driver *rdrv = to_rio_driver(drv);
+        const struct rio_device_id *id = rdrv->id_table;
+        const struct rio_device_id *found_id;
+
+        if (!id)
+                goto out;
+
+        found_id = rio_match_device(id, rdev);
+
+        if (found_id)
+                return 1;
+
+      out:return 0;
+}
+
+static struct device rio_bus = {
+        .bus_id = "rapidio",
+};
+
+struct bus_type rio_bus_type = {
+        .name = "rapidio",
+        .match = rio_match_bus,
+        .dev_attrs = rio_dev_attrs
+};
+
+/**
+ *  rio_bus_init - Register the RapidIO bus with the device model
+ *
+ *  Registers the RIO bus device and RIO bus type with the Linux
+ *  device model.
+ */
+static int __init rio_bus_init(void)
+{
+        if (device_register(&rio_bus) < 0)
+                printk("RIO: failed to register RIO bus device\n");
+        return bus_register(&rio_bus_type);
+}
+
+postcore_initcall(rio_bus_init);
+
+EXPORT_SYMBOL_GPL(rio_register_driver);
+EXPORT_SYMBOL_GPL(rio_unregister_driver);
+EXPORT_SYMBOL_GPL(rio_bus_type);
+EXPORT_SYMBOL_GPL(rio_dev_get);
+EXPORT_SYMBOL_GPL(rio_dev_put);
diff --git a/drivers/rapidio/rio-scan.c b/drivers/rapidio/rio-scan.c
new file mode 100644
index 000000000000..4f7ed4bd3be9
--- /dev/null
+++ b/drivers/rapidio/rio-scan.c
@@ -0,0 +1,945 @@
+/*
+ * RapidIO enumeration and discovery support
+ *
+ * Copyright 2005 MontaVista Software, Inc.
+ * Matt Porter <mporter@kernel.crashing.org>
+ *
+ * This program is free software; you can redistribute  it and/or modify it
+ * under  the terms of  the GNU General  Public License as published by the
+ * Free Software Foundation;  either version 2 of the  License, or (at your
+ * option) any later version.
+ */
+
+#include <linux/config.h>
+#include <linux/types.h>
+#include <linux/kernel.h>
+
+#include <linux/delay.h>
+#include <linux/dma-mapping.h>
+#include <linux/init.h>
+#include <linux/rio.h>
+#include <linux/rio_drv.h>
+#include <linux/rio_ids.h>
+#include <linux/rio_regs.h>
+#include <linux/module.h>
+#include <linux/spinlock.h>
+#include <linux/timer.h>
+
+#include "rio.h"
+
+LIST_HEAD(rio_devices);
+static LIST_HEAD(rio_switches);
+
+#define RIO_ENUM_CMPL_MAGIC     0xdeadbeef
+
+static void rio_enum_timeout(unsigned long);
+
+DEFINE_SPINLOCK(rio_global_list_lock);
+
+static int next_destid = 0;
+static int next_switchid = 0;
+static int next_net = 0;
+
+static struct timer_list rio_enum_timer =
+TIMER_INITIALIZER(rio_enum_timeout, 0, 0);
+
+static int rio_mport_phys_table[] = {
+        RIO_EFB_PAR_EP_ID,
+        RIO_EFB_PAR_EP_REC_ID,
+        RIO_EFB_SER_EP_ID,
+        RIO_EFB_SER_EP_REC_ID,
+        -1,
+};
+
+static int rio_sport_phys_table[] = {
+        RIO_EFB_PAR_EP_FREE_ID,
+        RIO_EFB_SER_EP_FREE_ID,
+        -1,
+};
+
+/**
+ * rio_get_device_id - Get the base/extended device id for a device
+ * @port: RIO master port
+ * @destid: Destination ID of device
+ * @hopcount: Hopcount to device
+ *
+ * Reads the base/extended device id from a device. Returns the
+ * 8/16-bit device ID.
+ */
+static u16 rio_get_device_id(struct rio_mport *port, u16 destid, u8 hopcount)
+{
+        u32 result;
+
+        rio_mport_read_config_32(port, destid, hopcount, RIO_DID_CSR, &result);
+
+        return RIO_GET_DID(result);
+}
+
+/**
+ * rio_set_device_id - Set the base/extended device id for a device
+ * @port: RIO master port
+ * @destid: Destination ID of device
+ * @hopcount: Hopcount to device
+ * @did: Device ID value to be written
+ *
+ * Writes the base/extended device id from a device.
+ */
+static void rio_set_device_id(struct rio_mport *port, u16 destid, u8 hopcount, u16 did)
+{
+        rio_mport_write_config_32(port, destid, hopcount, RIO_DID_CSR,
+                                  RIO_SET_DID(did));
+}
+
+/**
+ * rio_local_set_device_id - Set the base/extended device id for a port
+ * @port: RIO master port
+ * @did: Device ID value to be written
+ *
+ * Writes the base/extended device id from a device.
+ */
+static void rio_local_set_device_id(struct rio_mport *port, u16 did)
+{
+        rio_local_write_config_32(port, RIO_DID_CSR, RIO_SET_DID(did));
+}
+
+/**
+ * rio_clear_locks- Release all host locks and signal enumeration complete
+ * @port: Master port to issue transaction
+ *
+ * Marks the component tag CSR on each device with the enumeration
+ * complete flag. When complete, it then release the host locks on
+ * each device. Returns 0 on success or %-EINVAL on failure.
+ */
+static int rio_clear_locks(struct rio_mport *port)
+{
+        struct rio_dev *rdev;
+        u32 result;
+        int ret = 0;
+
+        /* Write component tag CSR magic complete value */
+        rio_local_write_config_32(port, RIO_COMPONENT_TAG_CSR,
+                                  RIO_ENUM_CMPL_MAGIC);
+        list_for_each_entry(rdev, &rio_devices, global_list)
+            rio_write_config_32(rdev, RIO_COMPONENT_TAG_CSR,
+                                RIO_ENUM_CMPL_MAGIC);
+
+        /* Release host device id locks */
+        rio_local_write_config_32(port, RIO_HOST_DID_LOCK_CSR,
+                                  port->host_deviceid);
+        rio_local_read_config_32(port, RIO_HOST_DID_LOCK_CSR, &result);
+        if ((result & 0xffff) != 0xffff) {
+                printk(KERN_INFO
+                       "RIO: badness when releasing host lock on master port, result %8.8x\n",
+                       result);
+                ret = -EINVAL;
+        }
+        list_for_each_entry(rdev, &rio_devices, global_list) {
+                rio_write_config_32(rdev, RIO_HOST_DID_LOCK_CSR,
+                                    port->host_deviceid);
+                rio_read_config_32(rdev, RIO_HOST_DID_LOCK_CSR, &result);
+                if ((result & 0xffff) != 0xffff) {
+                        printk(KERN_INFO
+                               "RIO: badness when releasing host lock on vid %4.4x did %4.4x\n",
+                               rdev->vid, rdev->did);
+                        ret = -EINVAL;
+                }
+        }
+
+        return ret;
+}
+
+/**
+ * rio_enum_host- Set host lock and initialize host destination ID
+ * @port: Master port to issue transaction
+ *
+ * Sets the local host master port lock and destination ID register
+ * with the host device ID value. The host device ID value is provided
+ * by the platform. Returns %0 on success or %-1 on failure.
+ */
+static int rio_enum_host(struct rio_mport *port)
+{
+        u32 result;
+
+        /* Set master port host device id lock */
+        rio_local_write_config_32(port, RIO_HOST_DID_LOCK_CSR,
+                                  port->host_deviceid);
+
+        rio_local_read_config_32(port, RIO_HOST_DID_LOCK_CSR, &result);
+        if ((result & 0xffff) != port->host_deviceid)
+                return -1;
+
+        /* Set master port destid and init destid ctr */
+        rio_local_set_device_id(port, port->host_deviceid);
+
+        if (next_destid == port->host_deviceid)
+                next_destid++;
+
+        return 0;
+}
+
+/**
+ * rio_device_has_destid- Test if a device contains a destination ID register
+ * @port: Master port to issue transaction
+ * @src_ops: RIO device source operations
+ * @dst_ops: RIO device destination operations
+ *
+ * Checks the provided @src_ops and @dst_ops for the necessary transaction
+ * capabilities that indicate whether or not a device will implement a
+ * destination ID register. Returns 1 if true or 0 if false.
+ */
+static int rio_device_has_destid(struct rio_mport *port, int src_ops,
+                                 int dst_ops)
+{
+        u32 mask = RIO_OPS_READ | RIO_OPS_WRITE | RIO_OPS_ATOMIC_TST_SWP | RIO_OPS_ATOMIC_INC | RIO_OPS_ATOMIC_DEC | RIO_OPS_ATOMIC_SET | RIO_OPS_ATOMIC_CLR;
+
+        return !!((src_ops | dst_ops) & mask);
+}
+
+/**
+ * rio_release_dev- Frees a RIO device struct
+ * @dev: LDM device associated with a RIO device struct
+ *
+ * Gets the RIO device struct associated a RIO device struct.
+ * The RIO device struct is freed.
+ */
+static void rio_release_dev(struct device *dev)
+{
+        struct rio_dev *rdev;
+
+        rdev = to_rio_dev(dev);
+        kfree(rdev);
+}
+
+/**
+ * rio_is_switch- Tests if a RIO device has switch capabilities
+ * @rdev: RIO device
+ *
+ * Gets the RIO device Processing Element Features register
+ * contents and tests for switch capabilities. Returns 1 if
+ * the device is a switch or 0 if it is not a switch.
+ * The RIO device struct is freed.
+ */
+static int rio_is_switch(struct rio_dev *rdev)
+{
+        if (rdev->pef & RIO_PEF_SWITCH)
+                return 1;
+        return 0;
+}
+
+/**
+ * rio_route_set_ops- Sets routing operations for a particular vendor switch
+ * @rdev: RIO device
+ *
+ * Searches the RIO route ops table for known switch types. If the vid
+ * and did match a switch table entry, then set the add_entry() and
+ * get_entry() ops to the table entry values.
+ */
+static void rio_route_set_ops(struct rio_dev *rdev)
+{
+        struct rio_route_ops *cur = __start_rio_route_ops;
+        struct rio_route_ops *end = __end_rio_route_ops;
+
+        while (cur < end) {
+                if ((cur->vid == rdev->vid) && (cur->did == rdev->did)) {
+                        pr_debug("RIO: adding routing ops for %s\n", rio_name(rdev));
+                        rdev->rswitch->add_entry = cur->add_hook;
+                        rdev->rswitch->get_entry = cur->get_hook;
+                }
+                cur++;
+        }
+
+        if (!rdev->rswitch->add_entry || !rdev->rswitch->get_entry)
+                printk(KERN_ERR "RIO: missing routing ops for %s\n",
+                       rio_name(rdev));
+}
+
+/**
+ * rio_add_device- Adds a RIO device to the device model
+ * @rdev: RIO device
+ *
+ * Adds the RIO device to the global device list and adds the RIO
+ * device to the RIO device list.  Creates the generic sysfs nodes
+ * for an RIO device.
+ */
+static void __devinit rio_add_device(struct rio_dev *rdev)
+{
+        device_add(&rdev->dev);
+
+        spin_lock(&rio_global_list_lock);
+        list_add_tail(&rdev->global_list, &rio_devices);
+        spin_unlock(&rio_global_list_lock);
+
+        rio_create_sysfs_dev_files(rdev);
+}
+
+/**
+ * rio_setup_device- Allocates and sets up a RIO device
+ * @net: RIO network
+ * @port: Master port to send transactions
+ * @destid: Current destination ID
+ * @hopcount: Current hopcount
+ * @do_enum: Enumeration/Discovery mode flag
+ *
+ * Allocates a RIO device and configures fields based on configuration
+ * space contents. If device has a destination ID register, a destination
+ * ID is either assigned in enumeration mode or read from configuration
+ * space in discovery mode.  If the device has switch capabilities, then
+ * a switch is allocated and configured appropriately. Returns a pointer
+ * to a RIO device on success or NULL on failure.
+ *
+ */
+static struct rio_dev *rio_setup_device(struct rio_net *net,
+                                        struct rio_mport *port, u16 destid,
+                                        u8 hopcount, int do_enum)
+{
+        struct rio_dev *rdev;
+        struct rio_switch *rswitch;
+        int result, rdid;
+
+        rdev = kmalloc(sizeof(struct rio_dev), GFP_KERNEL);
+        if (!rdev)
+                goto out;
+
+        memset(rdev, 0, sizeof(struct rio_dev));
+        rdev->net = net;
+        rio_mport_read_config_32(port, destid, hopcount, RIO_DEV_ID_CAR,
+                                 &result);
+        rdev->did = result >> 16;
+        rdev->vid = result & 0xffff;
+        rio_mport_read_config_32(port, destid, hopcount, RIO_DEV_INFO_CAR,
+                                 &rdev->device_rev);
+        rio_mport_read_config_32(port, destid, hopcount, RIO_ASM_ID_CAR,
+                                 &result);
+        rdev->asm_did = result >> 16;
+        rdev->asm_vid = result & 0xffff;
+        rio_mport_read_config_32(port, destid, hopcount, RIO_ASM_INFO_CAR,
+                                 &result);
+        rdev->asm_rev = result >> 16;
+        rio_mport_read_config_32(port, destid, hopcount, RIO_PEF_CAR,
+                                 &rdev->pef);
+        if (rdev->pef & RIO_PEF_EXT_FEATURES)
+                rdev->efptr = result & 0xffff;
+
+        rio_mport_read_config_32(port, destid, hopcount, RIO_SRC_OPS_CAR,
+                                 &rdev->src_ops);
+        rio_mport_read_config_32(port, destid, hopcount, RIO_DST_OPS_CAR,
+                                 &rdev->dst_ops);
+
+        if (rio_device_has_destid(port, rdev->src_ops, rdev->dst_ops)
+            && do_enum) {
+                rio_set_device_id(port, destid, hopcount, next_destid);
+                rdev->destid = next_destid++;
+                if (next_destid == port->host_deviceid)
+                        next_destid++;
+        } else
+                rdev->destid = rio_get_device_id(port, destid, hopcount);
+
+        /* If a PE has both switch and other functions, show it as a switch */
+        if (rio_is_switch(rdev)) {
+                rio_mport_read_config_32(port, destid, hopcount,
+                                         RIO_SWP_INFO_CAR, &rdev->swpinfo);
+                rswitch = kmalloc(sizeof(struct rio_switch), GFP_KERNEL);
+                if (!rswitch) {
+                        kfree(rdev);
+                        rdev = NULL;
+                        goto out;
+                }
+                rswitch->switchid = next_switchid;
+                rswitch->hopcount = hopcount;
+                rswitch->destid = 0xffff;
+                /* Initialize switch route table */
+                for (rdid = 0; rdid < RIO_MAX_ROUTE_ENTRIES; rdid++)
+                        rswitch->route_table[rdid] = RIO_INVALID_ROUTE;
+                rdev->rswitch = rswitch;
+                sprintf(rio_name(rdev), "%02x:s:%04x", rdev->net->id,
+                        rdev->rswitch->switchid);
+                rio_route_set_ops(rdev);
+
+                list_add_tail(&rswitch->node, &rio_switches);
+
+        } else
+                sprintf(rio_name(rdev), "%02x:e:%04x", rdev->net->id,
+                        rdev->destid);
+
+        rdev->dev.bus = &rio_bus_type;
+
+        device_initialize(&rdev->dev);
+        rdev->dev.release = rio_release_dev;
+        rio_dev_get(rdev);
+
+        rdev->dma_mask = DMA_32BIT_MASK;
+        rdev->dev.dma_mask = &rdev->dma_mask;
+        rdev->dev.coherent_dma_mask = DMA_32BIT_MASK;
+
+        if ((rdev->pef & RIO_PEF_INB_DOORBELL) &&
+            (rdev->dst_ops & RIO_DST_OPS_DOORBELL))
+                rio_init_dbell_res(&rdev->riores[RIO_DOORBELL_RESOURCE],
+                                   0, 0xffff);
+
+        rio_add_device(rdev);
+
+      out:
+        return rdev;
+}
+
+/**
+ * rio_sport_is_active- Tests if a switch port has an active connection.
+ * @port: Master port to send transaction
+ * @destid: Associated destination ID for switch
+ * @hopcount: Hopcount to reach switch
+ * @sport: Switch port number
+ *
+ * Reads the port error status CSR for a particular switch port to
+ * determine if the port has an active link.  Returns
+ * %PORT_N_ERR_STS_PORT_OK if the port is active or %0 if it is
+ * inactive.
+ */
+static int
+rio_sport_is_active(struct rio_mport *port, u16 destid, u8 hopcount, int sport)
+{
+        u32 result;
+        u32 ext_ftr_ptr;
+
+        int *entry = rio_sport_phys_table;
+
+        do {
+                if ((ext_ftr_ptr =
+                     rio_mport_get_feature(port, 0, destid, hopcount, *entry)))
+
+                        break;
+        } while (*++entry >= 0);
+
+        if (ext_ftr_ptr)
+                rio_mport_read_config_32(port, destid, hopcount,
+                                         ext_ftr_ptr +
+                                         RIO_PORT_N_ERR_STS_CSR(sport),
+                                         &result);
+
+        return (result & PORT_N_ERR_STS_PORT_OK);
+}
+
+/**
+ * rio_route_add_entry- Add a route entry to a switch routing table
+ * @mport: Master port to send transaction
+ * @rdev: Switch device
+ * @table: Routing table ID
+ * @route_destid: Destination ID to be routed
+ * @route_port: Port number to be routed
+ *
+ * Calls the switch specific add_entry() method to add a route entry
+ * on a switch. The route table can be specified using the @table
+ * argument if a switch has per port routing tables or the normal
+ * use is to specific all tables (or the global table) by passing
+ * %RIO_GLOBAL_TABLE in @table. Returns %0 on success or %-EINVAL
+ * on failure.
+ */
+static int rio_route_add_entry(struct rio_mport *mport, struct rio_dev *rdev,
+                               u16 table, u16 route_destid, u8 route_port)
+{
+        return rdev->rswitch->add_entry(mport, rdev->rswitch->destid,
+                                        rdev->rswitch->hopcount, table,
+                                        route_destid, route_port);
+}
+
+/**
+ * rio_route_get_entry- Read a route entry in a switch routing table
+ * @mport: Master port to send transaction
+ * @rdev: Switch device
+ * @table: Routing table ID
+ * @route_destid: Destination ID to be routed
+ * @route_port: Pointer to read port number into
+ *
+ * Calls the switch specific get_entry() method to read a route entry
+ * in a switch. The route table can be specified using the @table
+ * argument if a switch has per port routing tables or the normal
+ * use is to specific all tables (or the global table) by passing
+ * %RIO_GLOBAL_TABLE in @table. Returns %0 on success or %-EINVAL
+ * on failure.
+ */
+static int
+rio_route_get_entry(struct rio_mport *mport, struct rio_dev *rdev, u16 table,
+                    u16 route_destid, u8 * route_port)
+{
+        return rdev->rswitch->get_entry(mport, rdev->rswitch->destid,
+                                        rdev->rswitch->hopcount, table,
+                                        route_destid, route_port);
+}
+
+/**
+ * rio_get_host_deviceid_lock- Reads the Host Device ID Lock CSR on a device
+ * @port: Master port to send transaction
+ * @hopcount: Number of hops to the device
+ *
+ * Used during enumeration to read the Host Device ID Lock CSR on a
+ * RIO device. Returns the value of the lock register.
+ */
+static u16 rio_get_host_deviceid_lock(struct rio_mport *port, u8 hopcount)
+{
+        u32 result;
+
+        rio_mport_read_config_32(port, RIO_ANY_DESTID, hopcount,
+                                 RIO_HOST_DID_LOCK_CSR, &result);
+
+        return (u16) (result & 0xffff);
+}
+
+/**
+ * rio_get_swpinfo_inport- Gets the ingress port number
+ * @mport: Master port to send transaction
+ * @destid: Destination ID associated with the switch
+ * @hopcount: Number of hops to the device
+ *
+ * Returns port number being used to access the switch device.
+ */
+static u8
+rio_get_swpinfo_inport(struct rio_mport *mport, u16 destid, u8 hopcount)
+{
+        u32 result;
+
+        rio_mport_read_config_32(mport, destid, hopcount, RIO_SWP_INFO_CAR,
+                                 &result);
+
+        return (u8) (result & 0xff);
+}
+
+/**
+ * rio_get_swpinfo_tports- Gets total number of ports on the switch
+ * @mport: Master port to send transaction
+ * @destid: Destination ID associated with the switch
+ * @hopcount: Number of hops to the device
+ *
+ * Returns total numbers of ports implemented by the switch device.
+ */
+static u8 rio_get_swpinfo_tports(struct rio_mport *mport, u16 destid,
+                                 u8 hopcount)
+{
+        u32 result;
+
+        rio_mport_read_config_32(mport, destid, hopcount, RIO_SWP_INFO_CAR,
+                                 &result);
+
+        return RIO_GET_TOTAL_PORTS(result);
+}
+
+/**
+ * rio_net_add_mport- Add a master port to a RIO network
+ * @net: RIO network
+ * @port: Master port to add
+ *
+ * Adds a master port to the network list of associated master
+ * ports..
+ */
+static void rio_net_add_mport(struct rio_net *net, struct rio_mport *port)
+{
+        spin_lock(&rio_global_list_lock);
+        list_add_tail(&port->nnode, &net->mports);
+        spin_unlock(&rio_global_list_lock);
+}
+
+/**
+ * rio_enum_peer- Recursively enumerate a RIO network through a master port
+ * @net: RIO network being enumerated
+ * @port: Master port to send transactions
+ * @hopcount: Number of hops into the network
+ *
+ * Recursively enumerates a RIO network.  Transactions are sent via the
+ * master port passed in @port.
+ */
+static int rio_enum_peer(struct rio_net *net, struct rio_mport *port,
+                         u8 hopcount)
+{
+        int port_num;
+        int num_ports;
+        int cur_destid;
+        struct rio_dev *rdev;
+        u16 destid;
+        int tmp;
+
+        if (rio_get_host_deviceid_lock(port, hopcount) == port->host_deviceid) {
+                pr_debug("RIO: PE already discovered by this host\n");
+                /*
+                 * Already discovered by this host. Add it as another
+                 * master port for the current network.
+                 */
+                rio_net_add_mport(net, port);
+                return 0;
+        }
+
+        /* Attempt to acquire device lock */
+        rio_mport_write_config_32(port, RIO_ANY_DESTID, hopcount,
+                                  RIO_HOST_DID_LOCK_CSR, port->host_deviceid);
+        while ((tmp = rio_get_host_deviceid_lock(port, hopcount))
+               < port->host_deviceid) {
+                /* Delay a bit */
+                mdelay(1);
+                /* Attempt to acquire device lock again */
+                rio_mport_write_config_32(port, RIO_ANY_DESTID, hopcount,
+                                          RIO_HOST_DID_LOCK_CSR,
+                                          port->host_deviceid);
+        }
+
+        if (rio_get_host_deviceid_lock(port, hopcount) > port->host_deviceid) {
+                pr_debug(
+                    "RIO: PE locked by a higher priority host...retreating\n");
+                return -1;
+        }
+
+        /* Setup new RIO device */
+        if ((rdev = rio_setup_device(net, port, RIO_ANY_DESTID, hopcount, 1))) {
+                /* Add device to the global and bus/net specific list. */
+                list_add_tail(&rdev->net_list, &net->devices);
+        } else
+                return -1;
+
+        if (rio_is_switch(rdev)) {
+                next_switchid++;
+
+                for (destid = 0; destid < next_destid; destid++) {
+                        rio_route_add_entry(port, rdev, RIO_GLOBAL_TABLE,
+                                            destid, rio_get_swpinfo_inport(port,
+                                                                           RIO_ANY_DESTID,
+                                                                           hopcount));
+                        rdev->rswitch->route_table[destid] =
+                            rio_get_swpinfo_inport(port, RIO_ANY_DESTID,
+                                                   hopcount);
+                }
+
+                num_ports =
+                    rio_get_swpinfo_tports(port, RIO_ANY_DESTID, hopcount);
+                pr_debug(
+                    "RIO: found %s (vid %4.4x did %4.4x) with %d ports\n",
+                    rio_name(rdev), rdev->vid, rdev->did, num_ports);
+                for (port_num = 0; port_num < num_ports; port_num++) {
+                        if (rio_get_swpinfo_inport
+                            (port, RIO_ANY_DESTID, hopcount) == port_num)
+                                continue;
+
+                        cur_destid = next_destid;
+
+                        if (rio_sport_is_active
+                            (port, RIO_ANY_DESTID, hopcount, port_num)) {
+                                pr_debug(
+                                    "RIO: scanning device on port %d\n",
+                                    port_num);
+                                rio_route_add_entry(port, rdev,
+                                                    RIO_GLOBAL_TABLE,
+                                                    RIO_ANY_DESTID, port_num);
+
+                                if (rio_enum_peer(net, port, hopcount + 1) < 0)
+                                        return -1;
+
+                                /* Update routing tables */
+                                if (next_destid > cur_destid) {
+                                        for (destid = cur_destid;
+                                             destid < next_destid; destid++) {
+                                                rio_route_add_entry(port, rdev,
+                                                                    RIO_GLOBAL_TABLE,
+                                                                    destid,
+                                                                    port_num);
+                                                rdev->rswitch->
+                                                    route_table[destid] =
+                                                    port_num;
+                                        }
+                                        rdev->rswitch->destid = cur_destid;
+                                }
+                        }
+                }
+        } else
+                pr_debug("RIO: found %s (vid %4.4x did %4.4x)\n",
+                    rio_name(rdev), rdev->vid, rdev->did);
+
+        return 0;
+}
+
+/**
+ * rio_enum_complete- Tests if enumeration of a network is complete
+ * @port: Master port to send transaction
+ *
+ * Tests the Component Tag CSR for presence of the magic enumeration
+ * complete flag. Return %1 if enumeration is complete or %0 if
+ * enumeration is incomplete.
+ */
+static int rio_enum_complete(struct rio_mport *port)
+{
+        u32 tag_csr;
+        int ret = 0;
+
+        rio_local_read_config_32(port, RIO_COMPONENT_TAG_CSR, &tag_csr);
+
+        if (tag_csr == RIO_ENUM_CMPL_MAGIC)
+                ret = 1;
+
+        return ret;
+}
+
+/**
+ * rio_disc_peer- Recursively discovers a RIO network through a master port
+ * @net: RIO network being discovered
+ * @port: Master port to send transactions
+ * @destid: Current destination ID in network
+ * @hopcount: Number of hops into the network
+ *
+ * Recursively discovers a RIO network.  Transactions are sent via the
+ * master port passed in @port.
+ */
+static int
+rio_disc_peer(struct rio_net *net, struct rio_mport *port, u16 destid,
+              u8 hopcount)
+{
+        u8 port_num, route_port;
+        int num_ports;
+        struct rio_dev *rdev;
+        u16 ndestid;
+
+        /* Setup new RIO device */
+        if ((rdev = rio_setup_device(net, port, destid, hopcount, 0))) {
+                /* Add device to the global and bus/net specific list. */
+                list_add_tail(&rdev->net_list, &net->devices);
+        } else
+                return -1;
+
+        if (rio_is_switch(rdev)) {
+                next_switchid++;
+
+                /* Associated destid is how we accessed this switch */
+                rdev->rswitch->destid = destid;
+
+                num_ports = rio_get_swpinfo_tports(port, destid, hopcount);
+                pr_debug(
+                    "RIO: found %s (vid %4.4x did %4.4x) with %d ports\n",
+                    rio_name(rdev), rdev->vid, rdev->did, num_ports);
+                for (port_num = 0; port_num < num_ports; port_num++) {
+                        if (rio_get_swpinfo_inport(port, destid, hopcount) ==
+                            port_num)
+                                continue;
+
+                        if (rio_sport_is_active
+                            (port, destid, hopcount, port_num)) {
+                                pr_debug(
+                                    "RIO: scanning device on port %d\n",
+                                    port_num);
+                                for (ndestid = 0; ndestid < RIO_ANY_DESTID;
+                                     ndestid++) {
+                                        rio_route_get_entry(port, rdev,
+                                                            RIO_GLOBAL_TABLE,
+                                                            ndestid,
+                                                            &route_port);
+                                        if (route_port == port_num)
+                                                break;
+                                }
+
+                                if (rio_disc_peer
+                                    (net, port, ndestid, hopcount + 1) < 0)
+                                        return -1;
+                        }
+                }
+        } else
+                pr_debug("RIO: found %s (vid %4.4x did %4.4x)\n",
+                    rio_name(rdev), rdev->vid, rdev->did);
+
+        return 0;
+}
+
+/**
+ * rio_mport_is_active- Tests if master port link is active
+ * @port: Master port to test
+ *
+ * Reads the port error status CSR for the master port to
+ * determine if the port has an active link.  Returns
+ * %PORT_N_ERR_STS_PORT_OK if the  master port is active
+ * or %0 if it is inactive.
+ */
+static int rio_mport_is_active(struct rio_mport *port)
+{
+        u32 result = 0;
+        u32 ext_ftr_ptr;
+        int *entry = rio_mport_phys_table;
+
+        do {
+                if ((ext_ftr_ptr =
+                     rio_mport_get_feature(port, 1, 0, 0, *entry)))
+                        break;
+        } while (*++entry >= 0);
+
+        if (ext_ftr_ptr)
+                rio_local_read_config_32(port,
+                                         ext_ftr_ptr +
+                                         RIO_PORT_N_ERR_STS_CSR(port->index),
+                                         &result);
+
+        return (result & PORT_N_ERR_STS_PORT_OK);
+}
+
+/**
+ * rio_alloc_net- Allocate and configure a new RIO network
+ * @port: Master port associated with the RIO network
+ *
+ * Allocates a RIO network structure, initializes per-network
+ * list heads, and adds the associated master port to the
+ * network list of associated master ports. Returns a
+ * RIO network pointer on success or %NULL on failure.
+ */
+static struct rio_net __devinit *rio_alloc_net(struct rio_mport *port)
+{
+        struct rio_net *net;
+
+        net = kmalloc(sizeof(struct rio_net), GFP_KERNEL);
+        if (net) {
+                memset(net, 0, sizeof(struct rio_net));
+                INIT_LIST_HEAD(&net->node);
+                INIT_LIST_HEAD(&net->devices);
+                INIT_LIST_HEAD(&net->mports);
+                list_add_tail(&port->nnode, &net->mports);
+                net->hport = port;
+                net->id = next_net++;
+        }
+        return net;
+}
+
+/**
+ * rio_enum_mport- Start enumeration through a master port
+ * @mport: Master port to send transactions
+ *
+ * Starts the enumeration process. If somebody has enumerated our
+ * master port device, then give up. If not and we have an active
+ * link, then start recursive peer enumeration. Returns %0 if
+ * enumeration succeeds or %-EBUSY if enumeration fails.
+ */
+int rio_enum_mport(struct rio_mport *mport)
+{
+        struct rio_net *net = NULL;
+        int rc = 0;
+
+        printk(KERN_INFO "RIO: enumerate master port %d, %s\n", mport->id,
+               mport->name);
+        /* If somebody else enumerated our master port device, bail. */
+        if (rio_enum_host(mport) < 0) {
+                printk(KERN_INFO
+                       "RIO: master port %d device has been enumerated by a remote host\n",
+                       mport->id);
+                rc = -EBUSY;
+                goto out;
+        }
+
+        /* If master port has an active link, allocate net and enum peers */
+        if (rio_mport_is_active(mport)) {
+                if (!(net = rio_alloc_net(mport))) {
+                        printk(KERN_ERR "RIO: failed to allocate new net\n");
+                        rc = -ENOMEM;
+                        goto out;
+                }
+                if (rio_enum_peer(net, mport, 0) < 0) {
+                        /* A higher priority host won enumeration, bail. */
+                        printk(KERN_INFO
+                               "RIO: master port %d device has lost enumeration to a remote host\n",
+                               mport->id);
+                        rio_clear_locks(mport);
+                        rc = -EBUSY;
+                        goto out;
+                }
+                rio_clear_locks(mport);
+        } else {
+                printk(KERN_INFO "RIO: master port %d link inactive\n",
+                       mport->id);
+                rc = -EINVAL;
+        }
+
+      out:
+        return rc;
+}
+
+/**
+ * rio_build_route_tables- Generate route tables from switch route entries
+ *
+ * For each switch device, generate a route table by copying existing
+ * route entries from the switch.
+ */
+static void rio_build_route_tables(void)
+{
+        struct rio_dev *rdev;
+        int i;
+        u8 sport;
+
+        list_for_each_entry(rdev, &rio_devices, global_list)
+            if (rio_is_switch(rdev))
+                for (i = 0; i < RIO_MAX_ROUTE_ENTRIES; i++) {
+                        if (rio_route_get_entry
+                            (rdev->net->hport, rdev, RIO_GLOBAL_TABLE, i,
+                             &sport) < 0)
+                                continue;
+                        rdev->rswitch->route_table[i] = sport;
+                }
+}
+
+/**
+ * rio_enum_timeout- Signal that enumeration timed out
+ * @data: Address of timeout flag.
+ *
+ * When the enumeration complete timer expires, set a flag that
+ * signals to the discovery process that enumeration did not
+ * complete in a sane amount of time.
+ */
+static void rio_enum_timeout(unsigned long data)
+{
+        /* Enumeration timed out, set flag */
+        *(int *)data = 1;
+}
+
+/**
+ * rio_disc_mport- Start discovery through a master port
+ * @mport: Master port to send transactions
+ *
+ * Starts the discovery process. If we have an active link,
+ * then wait for the signal that enumeration is complete.
+ * When enumeration completion is signaled, start recursive
+ * peer discovery. Returns %0 if discovery succeeds or %-EBUSY
+ * on failure.
+ */
+int rio_disc_mport(struct rio_mport *mport)
+{
+        struct rio_net *net = NULL;
+        int enum_timeout_flag = 0;
+
+        printk(KERN_INFO "RIO: discover master port %d, %s\n", mport->id,
+               mport->name);
+
+        /* If master port has an active link, allocate net and discover peers */
+        if (rio_mport_is_active(mport)) {
+                if (!(net = rio_alloc_net(mport))) {
+                        printk(KERN_ERR "RIO: Failed to allocate new net\n");
+                        goto bail;
+                }
+
+                pr_debug("RIO: wait for enumeration complete...");
+
+                rio_enum_timer.expires =
+                    jiffies + CONFIG_RAPIDIO_DISC_TIMEOUT * HZ;
+                rio_enum_timer.data = (unsigned long)&enum_timeout_flag;
+                add_timer(&rio_enum_timer);
+                while (!rio_enum_complete(mport)) {
+                        mdelay(1);
+                        if (enum_timeout_flag) {
+                                del_timer_sync(&rio_enum_timer);
+                                goto timeout;
+                        }
+                }
+                del_timer_sync(&rio_enum_timer);
+
+                pr_debug("done\n");
+                if (rio_disc_peer(net, mport, RIO_ANY_DESTID, 0) < 0) {
+                        printk(KERN_INFO
+                               "RIO: master port %d device has failed discovery\n",
+                               mport->id);
+                        goto bail;
+                }
+
+                rio_build_route_tables();
+        }
+
+        return 0;
+
+      timeout:
+        pr_debug("timeout\n");
+      bail:
+        return -EBUSY;
+}
diff --git a/drivers/rapidio/rio-sysfs.c b/drivers/rapidio/rio-sysfs.c
new file mode 100644
index 000000000000..30a11436e241
--- /dev/null
+++ b/drivers/rapidio/rio-sysfs.c
@@ -0,0 +1,230 @@
+/*
+ * RapidIO sysfs attributes and support
+ *
+ * Copyright 2005 MontaVista Software, Inc.
+ * Matt Porter <mporter@kernel.crashing.org>
+ *
+ * This program is free software; you can redistribute  it and/or modify it
+ * under  the terms of  the GNU General  Public License as published by the
+ * Free Software Foundation;  either version 2 of the  License, or (at your
+ * option) any later version.
+ */
+
+#include <linux/config.h>
+#include <linux/kernel.h>
+#include <linux/rio.h>
+#include <linux/rio_drv.h>
+#include <linux/stat.h>
+
+#include "rio.h"
+
+/* Sysfs support */
+#define rio_config_attr(field, format_string)                                   \
+static ssize_t                                                          \
+field##_show(struct device *dev, struct device_attribute *attr, char *buf)                      \
+{                                                                       \
+        struct rio_dev *rdev = to_rio_dev(dev);                         \
+                                                                        \
+        return sprintf(buf, format_string, rdev->field);                \
+}                                                                       \
+
+rio_config_attr(did, "0x%04x\n");
+rio_config_attr(vid, "0x%04x\n");
+rio_config_attr(device_rev, "0x%08x\n");
+rio_config_attr(asm_did, "0x%04x\n");
+rio_config_attr(asm_vid, "0x%04x\n");
+rio_config_attr(asm_rev, "0x%04x\n");
+
+static ssize_t routes_show(struct device *dev, struct device_attribute *attr, char *buf)
+{
+        struct rio_dev *rdev = to_rio_dev(dev);
+        char *str = buf;
+        int i;
+
+        if (!rdev->rswitch)
+                goto out;
+
+        for (i = 0; i < RIO_MAX_ROUTE_ENTRIES; i++) {
+                if (rdev->rswitch->route_table[i] == RIO_INVALID_ROUTE)
+                        continue;
+                str +=
+                    sprintf(str, "%04x %02x\n", i,
+                            rdev->rswitch->route_table[i]);
+        }
+
+      out:
+        return (str - buf);
+}
+
+struct device_attribute rio_dev_attrs[] = {
+        __ATTR_RO(did),
+        __ATTR_RO(vid),
+        __ATTR_RO(device_rev),
+        __ATTR_RO(asm_did),
+        __ATTR_RO(asm_vid),
+        __ATTR_RO(asm_rev),
+        __ATTR_RO(routes),
+        __ATTR_NULL,
+};
+
+static ssize_t
+rio_read_config(struct kobject *kobj, char *buf, loff_t off, size_t count)
+{
+        struct rio_dev *dev =
+            to_rio_dev(container_of(kobj, struct device, kobj));
+        unsigned int size = 0x100;
+        loff_t init_off = off;
+        u8 *data = (u8 *) buf;
+
+        /* Several chips lock up trying to read undefined config space */
+        if (capable(CAP_SYS_ADMIN))
+                size = 0x200000;
+
+        if (off > size)
+                return 0;
+        if (off + count > size) {
+                size -= off;
+                count = size;
+        } else {
+                size = count;
+        }
+
+        if ((off & 1) && size) {
+                u8 val;
+                rio_read_config_8(dev, off, &val);
+                data[off - init_off] = val;
+                off++;
+                size--;
+        }
+
+        if ((off & 3) && size > 2) {
+                u16 val;
+                rio_read_config_16(dev, off, &val);
+                data[off - init_off] = (val >> 8) & 0xff;
+                data[off - init_off + 1] = val & 0xff;
+                off += 2;
+                size -= 2;
+        }
+
+        while (size > 3) {
+                u32 val;
+                rio_read_config_32(dev, off, &val);
+                data[off - init_off] = (val >> 24) & 0xff;
+                data[off - init_off + 1] = (val >> 16) & 0xff;
+                data[off - init_off + 2] = (val >> 8) & 0xff;
+                data[off - init_off + 3] = val & 0xff;
+                off += 4;
+                size -= 4;
+        }
+
+        if (size >= 2) {
+                u16 val;
+                rio_read_config_16(dev, off, &val);
+                data[off - init_off] = (val >> 8) & 0xff;
+                data[off - init_off + 1] = val & 0xff;
+                off += 2;
+                size -= 2;
+        }
+
+        if (size > 0) {
+                u8 val;
+                rio_read_config_8(dev, off, &val);
+                data[off - init_off] = val;
+                off++;
+                --size;
+        }
+
+        return count;
+}
+
+static ssize_t
+rio_write_config(struct kobject *kobj, char *buf, loff_t off, size_t count)
+{
+        struct rio_dev *dev =
+            to_rio_dev(container_of(kobj, struct device, kobj));
+        unsigned int size = count;
+        loff_t init_off = off;
+        u8 *data = (u8 *) buf;
+
+        if (off > 0x200000)
+                return 0;
+        if (off + count > 0x200000) {
+                size = 0x200000 - off;
+                count = size;
+        }
+
+        if ((off & 1) && size) {
+                rio_write_config_8(dev, off, data[off - init_off]);
+                off++;
+                size--;
+        }
+
+        if ((off & 3) && (size > 2)) {
+                u16 val = data[off - init_off + 1];
+                val |= (u16) data[off - init_off] << 8;
+                rio_write_config_16(dev, off, val);
+                off += 2;
+                size -= 2;
+        }
+
+        while (size > 3) {
+                u32 val = data[off - init_off + 3];
+                val |= (u32) data[off - init_off + 2] << 8;
+                val |= (u32) data[off - init_off + 1] << 16;
+                val |= (u32) data[off - init_off] << 24;
+                rio_write_config_32(dev, off, val);
+                off += 4;
+                size -= 4;
+        }
+
+        if (size >= 2) {
+                u16 val = data[off - init_off + 1];
+                val |= (u16) data[off - init_off] << 8;
+                rio_write_config_16(dev, off, val);
+                off += 2;
+                size -= 2;
+        }
+
+        if (size) {
+                rio_write_config_8(dev, off, data[off - init_off]);
+                off++;
+                --size;
+        }
+
+        return count;
+}
+
+static struct bin_attribute rio_config_attr = {
+        .attr = {
+                 .name = "config",
+                 .mode = S_IRUGO | S_IWUSR,
+                 .owner = THIS_MODULE,
+                 },
+        .size = 0x200000,
+        .read = rio_read_config,
+        .write = rio_write_config,
+};
+
+/**
+ * rio_create_sysfs_dev_files - create RIO specific sysfs files
+ * @rdev: device whose entries should be created
+ *
+ * Create files when @rdev is added to sysfs.
+ */
+int rio_create_sysfs_dev_files(struct rio_dev *rdev)
+{
+        sysfs_create_bin_file(&rdev->dev.kobj, &rio_config_attr);
+
+        return 0;
+}
+
+/**
+ * rio_remove_sysfs_dev_files - cleanup RIO specific sysfs files
+ * @rdev: device whose entries we should free
+ *
+ * Cleanup when @rdev is removed from sysfs.
+ */
+void rio_remove_sysfs_dev_files(struct rio_dev *rdev)
+{
+        sysfs_remove_bin_file(&rdev->dev.kobj, &rio_config_attr);
+}
diff --git a/drivers/rapidio/rio.c b/drivers/rapidio/rio.c
new file mode 100644
index 000000000000..3ca1011ceaac
--- /dev/null
+++ b/drivers/rapidio/rio.c
@@ -0,0 +1,510 @@
+/*
+ * RapidIO interconnect services
+ * (RapidIO Interconnect Specification, http://www.rapidio.org)
+ *
+ * Copyright 2005 MontaVista Software, Inc.
+ * Matt Porter <mporter@kernel.crashing.org>
+ *
+ * This program is free software; you can redistribute  it and/or modify it
+ * under  the terms of  the GNU General  Public License as published by the
+ * Free Software Foundation;  either version 2 of the  License, or (at your
+ * option) any later version.
+ */
+
+#include <linux/config.h>
+#include <linux/types.h>
+#include <linux/kernel.h>
+
+#include <linux/delay.h>
+#include <linux/init.h>
+#include <linux/rio.h>
+#include <linux/rio_drv.h>
+#include <linux/rio_ids.h>
+#include <linux/rio_regs.h>
+#include <linux/module.h>
+#include <linux/spinlock.h>
+
+#include "rio.h"
+
+static LIST_HEAD(rio_mports);
+
+/**
+ * rio_local_get_device_id - Get the base/extended device id for a port
+ * @port: RIO master port from which to get the deviceid
+ *
+ * Reads the base/extended device id from the local device
+ * implementing the master port. Returns the 8/16-bit device
+ * id.
+ */
+u16 rio_local_get_device_id(struct rio_mport *port)
+{
+        u32 result;
+
+        rio_local_read_config_32(port, RIO_DID_CSR, &result);
+
+        return (RIO_GET_DID(result));
+}
+
+/**
+ * rio_request_inb_mbox - request inbound mailbox service
+ * @mport: RIO master port from which to allocate the mailbox resource
+ * @dev_id: Device specific pointer to pass on event
+ * @mbox: Mailbox number to claim
+ * @entries: Number of entries in inbound mailbox queue
+ * @minb: Callback to execute when inbound message is received
+ *
+ * Requests ownership of an inbound mailbox resource and binds
+ * a callback function to the resource. Returns %0 on success.
+ */
+int rio_request_inb_mbox(struct rio_mport *mport,
+                         void *dev_id,
+                         int mbox,
+                         int entries,
+                         void (*minb) (struct rio_mport * mport, void *dev_id, int mbox,
+                                       int slot))
+{
+        int rc = 0;
+
+        struct resource *res = kmalloc(sizeof(struct resource), GFP_KERNEL);
+
+        if (res) {
+                rio_init_mbox_res(res, mbox, mbox);
+
+                /* Make sure this mailbox isn't in use */
+                if ((rc =
+                     request_resource(&mport->riores[RIO_INB_MBOX_RESOURCE],
+                                      res)) < 0) {
+                        kfree(res);
+                        goto out;
+                }
+
+                mport->inb_msg[mbox].res = res;
+
+                /* Hook the inbound message callback */
+                mport->inb_msg[mbox].mcback = minb;
+
+                rc = rio_open_inb_mbox(mport, dev_id, mbox, entries);
+        } else
+                rc = -ENOMEM;
+
+      out:
+        return rc;
+}
+
+/**
+ * rio_release_inb_mbox - release inbound mailbox message service
+ * @mport: RIO master port from which to release the mailbox resource
+ * @mbox: Mailbox number to release
+ *
+ * Releases ownership of an inbound mailbox resource. Returns 0
+ * if the request has been satisfied.
+ */
+int rio_release_inb_mbox(struct rio_mport *mport, int mbox)
+{
+        rio_close_inb_mbox(mport, mbox);
+
+        /* Release the mailbox resource */
+        return release_resource(mport->inb_msg[mbox].res);
+}
+
+/**
+ * rio_request_outb_mbox - request outbound mailbox service
+ * @mport: RIO master port from which to allocate the mailbox resource
+ * @dev_id: Device specific pointer to pass on event
+ * @mbox: Mailbox number to claim
+ * @entries: Number of entries in outbound mailbox queue
+ * @moutb: Callback to execute when outbound message is sent
+ *
+ * Requests ownership of an outbound mailbox resource and binds
+ * a callback function to the resource. Returns 0 on success.
+ */
+int rio_request_outb_mbox(struct rio_mport *mport,
+                          void *dev_id,
+                          int mbox,
+                          int entries,
+                          void (*moutb) (struct rio_mport * mport, void *dev_id, int mbox, int slot))
+{
+        int rc = 0;
+
+        struct resource *res = kmalloc(sizeof(struct resource), GFP_KERNEL);
+
+        if (res) {
+                rio_init_mbox_res(res, mbox, mbox);
+
+                /* Make sure this outbound mailbox isn't in use */
+                if ((rc =
+                     request_resource(&mport->riores[RIO_OUTB_MBOX_RESOURCE],
+                                      res)) < 0) {
+                        kfree(res);
+                        goto out;
+                }
+
+                mport->outb_msg[mbox].res = res;
+
+                /* Hook the inbound message callback */
+                mport->outb_msg[mbox].mcback = moutb;
+
+                rc = rio_open_outb_mbox(mport, dev_id, mbox, entries);
+        } else
+                rc = -ENOMEM;
+
+      out:
+        return rc;
+}
+
+/**
+ * rio_release_outb_mbox - release outbound mailbox message service
+ * @mport: RIO master port from which to release the mailbox resource
+ * @mbox: Mailbox number to release
+ *
+ * Releases ownership of an inbound mailbox resource. Returns 0
+ * if the request has been satisfied.
+ */
+int rio_release_outb_mbox(struct rio_mport *mport, int mbox)
+{
+        rio_close_outb_mbox(mport, mbox);
+
+        /* Release the mailbox resource */
+        return release_resource(mport->outb_msg[mbox].res);
+}
+
+/**
+ * rio_setup_inb_dbell - bind inbound doorbell callback
+ * @mport: RIO master port to bind the doorbell callback
+ * @dev_id: Device specific pointer to pass on event
+ * @res: Doorbell message resource
+ * @dinb: Callback to execute when doorbell is received
+ *
+ * Adds a doorbell resource/callback pair into a port's
+ * doorbell event list. Returns 0 if the request has been
+ * satisfied.
+ */
+static int
+rio_setup_inb_dbell(struct rio_mport *mport, void *dev_id, struct resource *res,
+                    void (*dinb) (struct rio_mport * mport, void *dev_id, u16 src, u16 dst,
+                                  u16 info))
+{
+        int rc = 0;
+        struct rio_dbell *dbell;
+
+        if (!(dbell = kmalloc(sizeof(struct rio_dbell), GFP_KERNEL))) {
+                rc = -ENOMEM;
+                goto out;
+        }
+
+        dbell->res = res;
+        dbell->dinb = dinb;
+        dbell->dev_id = dev_id;
+
+        list_add_tail(&dbell->node, &mport->dbells);
+
+      out:
+        return rc;
+}
+
+/**
+ * rio_request_inb_dbell - request inbound doorbell message service
+ * @mport: RIO master port from which to allocate the doorbell resource
+ * @dev_id: Device specific pointer to pass on event
+ * @start: Doorbell info range start
+ * @end: Doorbell info range end
+ * @dinb: Callback to execute when doorbell is received
+ *
+ * Requests ownership of an inbound doorbell resource and binds
+ * a callback function to the resource. Returns 0 if the request
+ * has been satisfied.
+ */
+int rio_request_inb_dbell(struct rio_mport *mport,
+                          void *dev_id,
+                          u16 start,
+                          u16 end,
+                          void (*dinb) (struct rio_mport * mport, void *dev_id, u16 src,
+                                        u16 dst, u16 info))
+{
+        int rc = 0;
+
+        struct resource *res = kmalloc(sizeof(struct resource), GFP_KERNEL);
+
+        if (res) {
+                rio_init_dbell_res(res, start, end);
+
+                /* Make sure these doorbells aren't in use */
+                if ((rc =
+                     request_resource(&mport->riores[RIO_DOORBELL_RESOURCE],
+                                      res)) < 0) {
+                        kfree(res);
+                        goto out;
+                }
+
+                /* Hook the doorbell callback */
+                rc = rio_setup_inb_dbell(mport, dev_id, res, dinb);
+        } else
+                rc = -ENOMEM;
+
+      out:
+        return rc;
+}
+
+/**
+ * rio_release_inb_dbell - release inbound doorbell message service
+ * @mport: RIO master port from which to release the doorbell resource
+ * @start: Doorbell info range start
+ * @end: Doorbell info range end
+ *
+ * Releases ownership of an inbound doorbell resource and removes
+ * callback from the doorbell event list. Returns 0 if the request
+ * has been satisfied.
+ */
+int rio_release_inb_dbell(struct rio_mport *mport, u16 start, u16 end)
+{
+        int rc = 0, found = 0;
+        struct rio_dbell *dbell;
+
+        list_for_each_entry(dbell, &mport->dbells, node) {
+                if ((dbell->res->start == start) && (dbell->res->end == end)) {
+                        found = 1;
+                        break;
+                }
+        }
+
+        /* If we can't find an exact match, fail */
+        if (!found) {
+                rc = -EINVAL;
+                goto out;
+        }
+
+        /* Delete from list */
+        list_del(&dbell->node);
+
+        /* Release the doorbell resource */
+        rc = release_resource(dbell->res);
+
+        /* Free the doorbell event */
+        kfree(dbell);
+
+      out:
+        return rc;
+}
+
+/**
+ * rio_request_outb_dbell - request outbound doorbell message range
+ * @rdev: RIO device from which to allocate the doorbell resource
+ * @start: Doorbell message range start
+ * @end: Doorbell message range end
+ *
+ * Requests ownership of a doorbell message range. Returns a resource
+ * if the request has been satisfied or %NULL on failure.
+ */
+struct resource *rio_request_outb_dbell(struct rio_dev *rdev, u16 start,
+                                        u16 end)
+{
+        struct resource *res = kmalloc(sizeof(struct resource), GFP_KERNEL);
+
+        if (res) {
+                rio_init_dbell_res(res, start, end);
+
+                /* Make sure these doorbells aren't in use */
+                if (request_resource(&rdev->riores[RIO_DOORBELL_RESOURCE], res)
+                    < 0) {
+                        kfree(res);
+                        res = NULL;
+                }
+        }
+
+        return res;
+}
+
+/**
+ * rio_release_outb_dbell - release outbound doorbell message range
+ * @rdev: RIO device from which to release the doorbell resource
+ * @res: Doorbell resource to be freed
+ *
+ * Releases ownership of a doorbell message range. Returns 0 if the
+ * request has been satisfied.
+ */
+int rio_release_outb_dbell(struct rio_dev *rdev, struct resource *res)
+{
+        int rc = release_resource(res);
+
+        kfree(res);
+
+        return rc;
+}
+
+/**
+ * rio_mport_get_feature - query for devices' extended features
+ * @port: Master port to issue transaction
+ * @local: Indicate a local master port or remote device access
+ * @destid: Destination ID of the device
+ * @hopcount: Number of switch hops to the device
+ * @ftr: Extended feature code
+ *
+ * Tell if a device supports a given RapidIO capability.
+ * Returns the offset of the requested extended feature
+ * block within the device's RIO configuration space or
+ * 0 in case the device does not support it.  Possible
+ * values for @ftr:
+ *
+ * %RIO_EFB_PAR_EP_ID           LP/LVDS EP Devices
+ *
+ * %RIO_EFB_PAR_EP_REC_ID       LP/LVDS EP Recovery Devices
+ *
+ * %RIO_EFB_PAR_EP_FREE_ID      LP/LVDS EP Free Devices
+ *
+ * %RIO_EFB_SER_EP_ID           LP/Serial EP Devices
+ *
+ * %RIO_EFB_SER_EP_REC_ID       LP/Serial EP Recovery Devices
+ *
+ * %RIO_EFB_SER_EP_FREE_ID      LP/Serial EP Free Devices
+ */
+u32
+rio_mport_get_feature(struct rio_mport * port, int local, u16 destid,
+                      u8 hopcount, int ftr)
+{
+        u32 asm_info, ext_ftr_ptr, ftr_header;
+
+        if (local)
+                rio_local_read_config_32(port, RIO_ASM_INFO_CAR, &asm_info);
+        else
+                rio_mport_read_config_32(port, destid, hopcount,
+                                         RIO_ASM_INFO_CAR, &asm_info);
+
+        ext_ftr_ptr = asm_info & RIO_EXT_FTR_PTR_MASK;
+
+        while (ext_ftr_ptr) {
+                if (local)
+                        rio_local_read_config_32(port, ext_ftr_ptr,
+                                                 &ftr_header);
+                else
+                        rio_mport_read_config_32(port, destid, hopcount,
+                                                 ext_ftr_ptr, &ftr_header);
+                if (RIO_GET_BLOCK_ID(ftr_header) == ftr)
+                        return ext_ftr_ptr;
+                if (!(ext_ftr_ptr = RIO_GET_BLOCK_PTR(ftr_header)))
+                        break;
+        }
+
+        return 0;
+}
+
+/**
+ * rio_get_asm - Begin or continue searching for a RIO device by vid/did/asm_vid/asm_did
+ * @vid: RIO vid to match or %RIO_ANY_ID to match all vids
+ * @did: RIO did to match or %RIO_ANY_ID to match all dids
+ * @asm_vid: RIO asm_vid to match or %RIO_ANY_ID to match all asm_vids
+ * @asm_did: RIO asm_did to match or %RIO_ANY_ID to match all asm_dids
+ * @from: Previous RIO device found in search, or %NULL for new search
+ *
+ * Iterates through the list of known RIO devices. If a RIO device is
+ * found with a matching @vid, @did, @asm_vid, @asm_did, the reference
+ * count to the device is incrememted and a pointer to its device
+ * structure is returned. Otherwise, %NULL is returned. A new search
+ * is initiated by passing %NULL to the @from argument. Otherwise, if
+ * @from is not %NULL, searches continue from next device on the global
+ * list. The reference count for @from is always decremented if it is
+ * not %NULL.
+ */
+struct rio_dev *rio_get_asm(u16 vid, u16 did,
+                            u16 asm_vid, u16 asm_did, struct rio_dev *from)
+{
+        struct list_head *n;
+        struct rio_dev *rdev;
+
+        WARN_ON(in_interrupt());
+        spin_lock(&rio_global_list_lock);
+        n = from ? from->global_list.next : rio_devices.next;
+
+        while (n && (n != &rio_devices)) {
+                rdev = rio_dev_g(n);
+                if ((vid == RIO_ANY_ID || rdev->vid == vid) &&
+                    (did == RIO_ANY_ID || rdev->did == did) &&
+                    (asm_vid == RIO_ANY_ID || rdev->asm_vid == asm_vid) &&
+                    (asm_did == RIO_ANY_ID || rdev->asm_did == asm_did))
+                        goto exit;
+                n = n->next;
+        }
+        rdev = NULL;
+      exit:
+        rio_dev_put(from);
+        rdev = rio_dev_get(rdev);
+        spin_unlock(&rio_global_list_lock);
+        return rdev;
+}
+
+/**
+ * rio_get_device - Begin or continue searching for a RIO device by vid/did
+ * @vid: RIO vid to match or %RIO_ANY_ID to match all vids
+ * @did: RIO did to match or %RIO_ANY_ID to match all dids
+ * @from: Previous RIO device found in search, or %NULL for new search
+ *
+ * Iterates through the list of known RIO devices. If a RIO device is
+ * found with a matching @vid and @did, the reference count to the
+ * device is incrememted and a pointer to its device structure is returned.
+ * Otherwise, %NULL is returned. A new search is initiated by passing %NULL
+ * to the @from argument. Otherwise, if @from is not %NULL, searches
+ * continue from next device on the global list. The reference count for
+ * @from is always decremented if it is not %NULL.
+ */
+struct rio_dev *rio_get_device(u16 vid, u16 did, struct rio_dev *from)
+{
+        return rio_get_asm(vid, did, RIO_ANY_ID, RIO_ANY_ID, from);
+}
+
+static void rio_fixup_device(struct rio_dev *dev)
+{
+}
+
+static int __devinit rio_init(void)
+{
+        struct rio_dev *dev = NULL;
+
+        while ((dev = rio_get_device(RIO_ANY_ID, RIO_ANY_ID, dev)) != NULL) {
+                rio_fixup_device(dev);
+        }
+        return 0;
+}
+
+device_initcall(rio_init);
+
+int rio_init_mports(void)
+{
+        int rc = 0;
+        struct rio_mport *port;
+
+        list_for_each_entry(port, &rio_mports, node) {
+                if (!request_mem_region(port->iores.start,
+                                        port->iores.end - port->iores.start,
+                                        port->name)) {
+                        printk(KERN_ERR
+                               "RIO: Error requesting master port region %8.8lx-%8.8lx\n",
+                               port->iores.start, port->iores.end - 1);
+                        rc = -ENOMEM;
+                        goto out;
+                }
+
+                if (port->host_deviceid >= 0)
+                        rio_enum_mport(port);
+                else
+                        rio_disc_mport(port);
+        }
+
+      out:
+        return rc;
+}
+
+void rio_register_mport(struct rio_mport *port)
+{
+        list_add_tail(&port->node, &rio_mports);
+}
+
+EXPORT_SYMBOL_GPL(rio_local_get_device_id);
+EXPORT_SYMBOL_GPL(rio_get_device);
+EXPORT_SYMBOL_GPL(rio_get_asm);
+EXPORT_SYMBOL_GPL(rio_request_inb_dbell);
+EXPORT_SYMBOL_GPL(rio_release_inb_dbell);
+EXPORT_SYMBOL_GPL(rio_request_outb_dbell);
+EXPORT_SYMBOL_GPL(rio_release_outb_dbell);
+EXPORT_SYMBOL_GPL(rio_request_inb_mbox);
+EXPORT_SYMBOL_GPL(rio_release_inb_mbox);
+EXPORT_SYMBOL_GPL(rio_request_outb_mbox);
+EXPORT_SYMBOL_GPL(rio_release_outb_mbox);
diff --git a/drivers/rapidio/rio.h b/drivers/rapidio/rio.h
new file mode 100644
index 000000000000..b242cee656e7
--- /dev/null
+++ b/drivers/rapidio/rio.h
@@ -0,0 +1,60 @@
+/*
+ * RapidIO interconnect services
+ *
+ * Copyright 2005 MontaVista Software, Inc.
+ * Matt Porter <mporter@kernel.crashing.org>
+ *
+ * This program is free software; you can redistribute  it and/or modify it
+ * under  the terms of  the GNU General  Public License as published by the
+ * Free Software Foundation;  either version 2 of the  License, or (at your
+ * option) any later version.
+ */
+
+#include <linux/device.h>
+#include <linux/list.h>
+#include <linux/rio.h>
+
+/* Functions internal to the RIO core code */
+
+extern u32 rio_mport_get_feature(struct rio_mport *mport, int local, u16 destid,
+                                 u8 hopcount, int ftr);
+extern int rio_create_sysfs_dev_files(struct rio_dev *rdev);
+extern int rio_enum_mport(struct rio_mport *mport);
+extern int rio_disc_mport(struct rio_mport *mport);
+
+/* Structures internal to the RIO core code */
+extern struct device_attribute rio_dev_attrs[];
+extern spinlock_t rio_global_list_lock;
+
+extern struct rio_route_ops __start_rio_route_ops[];
+extern struct rio_route_ops __end_rio_route_ops[];
+
+/* Helpers internal to the RIO core code */
+#define DECLARE_RIO_ROUTE_SECTION(section, vid, did, add_hook, get_hook)  \
+        static struct rio_route_ops __rio_route_ops __attribute_used__   \
+                __attribute__((__section__(#section))) = { vid, did, add_hook, get_hook };
+
+/**
+ * DECLARE_RIO_ROUTE_OPS - Registers switch routing operations
+ * @vid: RIO vendor ID
+ * @did: RIO device ID
+ * @add_hook: Callback that adds a route entry
+ * @get_hook: Callback that gets a route entry
+ *
+ * Manipulating switch route tables in RIO is switch specific. This
+ * registers a switch by vendor and device ID with two callbacks for
+ * modifying and retrieving route entries in a switch. A &struct
+ * rio_route_ops is initialized with the ops and placed into a
+ * RIO-specific kernel section.
+ */
+#define DECLARE_RIO_ROUTE_OPS(vid, did, add_hook, get_hook)             \
+        DECLARE_RIO_ROUTE_SECTION(.rio_route_ops,                       \
+                        vid, did, add_hook, get_hook)
+
+#ifdef CONFIG_RAPIDIO_8_BIT_TRANSPORT
+#define RIO_GET_DID(x)  ((x & 0x00ff0000) >> 16)
+#define RIO_SET_DID(x)  ((x & 0x000000ff) << 16)
+#else
+#define RIO_GET_DID(x)  (x & 0xffff)
+#define RIO_SET_DID(x)  (x & 0xffff)
+#endif
diff --git a/drivers/rapidio/switches/Makefile b/drivers/rapidio/switches/Makefile
new file mode 100644
index 000000000000..b924f8301761
--- /dev/null
+++ b/drivers/rapidio/switches/Makefile
@@ -0,0 +1,5 @@
+#
+# Makefile for RIO switches
+#
+
+obj-$(CONFIG_RAPIDIO)   += tsi500.o
diff --git a/drivers/rapidio/switches/tsi500.c b/drivers/rapidio/switches/tsi500.c
new file mode 100644
index 000000000000..c77c23bd9840
--- /dev/null
+++ b/drivers/rapidio/switches/tsi500.c
@@ -0,0 +1,60 @@
+/*
+ * RapidIO Tsi500 switch support
+ *
+ * Copyright 2005 MontaVista Software, Inc.
+ * Matt Porter <mporter@kernel.crashing.org>
+ *
+ * This program is free software; you can redistribute  it and/or modify it
+ * under  the terms of  the GNU General  Public License as published by the
+ * Free Software Foundation;  either version 2 of the  License, or (at your
+ * option) any later version.
+ */
+
+#include <linux/rio.h>
+#include <linux/rio_drv.h>
+#include <linux/rio_ids.h>
+#include "../rio.h"
+
+static int
+tsi500_route_add_entry(struct rio_mport *mport, u16 destid, u8 hopcount, u16 table, u16 route_destid, u8 route_port)
+{
+        int i;
+        u32 offset = 0x10000 + 0xa00 + ((route_destid / 2)&~0x3);
+        u32 result;
+
+        if (table == 0xff) {
+                rio_mport_read_config_32(mport, destid, hopcount, offset, &result);
+                result &= ~(0xf << (4*(route_destid & 0x7)));
+                for (i=0;i<4;i++)
+                        rio_mport_write_config_32(mport, destid, hopcount, offset + (0x20000*i), result | (route_port << (4*(route_destid & 0x7))));
+        }
+        else {
+                rio_mport_read_config_32(mport, destid, hopcount, offset + (0x20000*table), &result);
+                result &= ~(0xf << (4*(route_destid & 0x7)));
+                rio_mport_write_config_32(mport, destid, hopcount, offset + (0x20000*table), result | (route_port << (4*(route_destid & 0x7))));
+        }
+
+        return 0;
+}
+
+static int
+tsi500_route_get_entry(struct rio_mport *mport, u16 destid, u8 hopcount, u16 table, u16 route_destid, u8 *route_port)
+{
+        int ret = 0;
+        u32 offset = 0x10000 + 0xa00 + ((route_destid / 2)&~0x3);
+        u32 result;
+
+        if (table == 0xff)
+                rio_mport_read_config_32(mport, destid, hopcount, offset, &result);
+        else
+                rio_mport_read_config_32(mport, destid, hopcount, offset + (0x20000*table), &result);
+
+        result &= 0xf << (4*(route_destid & 0x7));
+        *route_port = result >> (4*(route_destid & 0x7));
+        if (*route_port > 3)
+                ret = -1;
+
+        return ret;
+}
+
+DECLARE_RIO_ROUTE_OPS(RIO_VID_TUNDRA, RIO_DID_TSI500, tsi500_route_add_entry, tsi500_route_get_entry);
diff --git a/drivers/s390/block/dasd.c b/drivers/s390/block/dasd.c
index 8fc891a9d47f..7008d32433bf 100644
--- a/drivers/s390/block/dasd.c
+++ b/drivers/s390/block/dasd.c
@@ -115,8 +115,7 @@ dasd_alloc_device(void)
 void
 dasd_free_device(struct dasd_device *device)
 {
-        if (device->private)
-                kfree(device->private);
+        kfree(device->private);
         free_page((unsigned long) device->erp_mem);
         free_pages((unsigned long) device->ccw_mem, 1);
         kfree(device);
@@ -539,8 +538,7 @@ dasd_kmalloc_request(char *magic, int cplength, int datasize,
         if (datasize > 0) {
                 cqr->data = kmalloc(datasize, GFP_ATOMIC | GFP_DMA);
                 if (cqr->data == NULL) {
-                        if (cqr->cpaddr != NULL)
-                                kfree(cqr->cpaddr);
+                        kfree(cqr->cpaddr);
                         kfree(cqr);
                         return ERR_PTR(-ENOMEM);
                 }
@@ -615,10 +613,8 @@ dasd_kfree_request(struct dasd_ccw_req * cqr, struct dasd_device * device)
                 clear_normalized_cda(ccw);
         } while (ccw++->flags & (CCW_FLAG_CC | CCW_FLAG_DC));
 #endif
-        if (cqr->cpaddr != NULL)
-                kfree(cqr->cpaddr);
-        if (cqr->data != NULL)
-                kfree(cqr->data);
+        kfree(cqr->cpaddr);
+        kfree(cqr->data);
         kfree(cqr);
         dasd_put_device(device);
 }
diff --git a/drivers/s390/block/dasd_devmap.c b/drivers/s390/block/dasd_devmap.c
index bda896d9d788..caee16a3dc62 100644
--- a/drivers/s390/block/dasd_devmap.c
+++ b/drivers/s390/block/dasd_devmap.c
@@ -387,8 +387,7 @@ dasd_add_busid(char *bus_id, int features)
                 new = 0;
         }
         spin_unlock(&dasd_devmap_lock);
-        if (new)
-                kfree(new);
+        kfree(new);
         return devmap;
 }
 
diff --git a/drivers/s390/block/dasd_diag.c b/drivers/s390/block/dasd_diag.c
index 7478423b53bb..ab8754e566bc 100644
--- a/drivers/s390/block/dasd_diag.c
+++ b/drivers/s390/block/dasd_diag.c
@@ -6,7 +6,7 @@
  * Bugreports.to..: <Linux390@de.ibm.com>
  * (C) IBM Corporation, IBM Deutschland Entwicklung GmbH, 1999,2000
  *
- * $Revision: 1.49 $
+ * $Revision: 1.51 $
  */
 
 #include <linux/config.h>
@@ -67,9 +67,9 @@ static const u8 DASD_DIAG_CMS1[] = { 0xc3, 0xd4, 0xe2, 0xf1 };/* EBCDIC CMS1 */
 static __inline__ int
 dia250(void *iob, int cmd)
 {
-        typedef struct {
-                char _[max(sizeof (struct dasd_diag_init_io),
-                           sizeof (struct dasd_diag_rw_io))];
+        typedef union {
+                struct dasd_diag_init_io init_io;
+                struct dasd_diag_rw_io rw_io;
         } addr_type;
         int rc;
 
@@ -190,7 +190,7 @@ dasd_start_diag(struct dasd_ccw_req * cqr)
         private->iob.flags = DASD_DIAG_RWFLAG_ASYNC;
         private->iob.block_count = dreq->block_count;
         private->iob.interrupt_params = (addr_t) cqr;
-        private->iob.bio_list = __pa(dreq->bio);
+        private->iob.bio_list = dreq->bio;
         private->iob.flaga = DASD_DIAG_FLAGA_DEFAULT;
 
         cqr->startclk = get_clock();
@@ -394,47 +394,57 @@ dasd_diag_check_device(struct dasd_device *device)
                 memset(&bio, 0, sizeof (struct dasd_diag_bio));
                 bio.type = MDSK_READ_REQ;
                 bio.block_number = private->pt_block + 1;
-                bio.buffer = __pa(label);
+                bio.buffer = label;
                 memset(&private->iob, 0, sizeof (struct dasd_diag_rw_io));
                 private->iob.dev_nr = rdc_data->dev_nr;
                 private->iob.key = 0;
                 private->iob.flags = 0; /* do synchronous io */
                 private->iob.block_count = 1;
                 private->iob.interrupt_params = 0;
-                private->iob.bio_list = __pa(&bio);
+                private->iob.bio_list = &bio;
                 private->iob.flaga = DASD_DIAG_FLAGA_DEFAULT;
                 rc = dia250(&private->iob, RW_BIO);
-                if (rc == 0 || rc == 3)
-                        break;
+                if (rc == 3) {
+                        DEV_MESSAGE(KERN_WARNING, device, "%s",
+                                "DIAG call failed");
+                        rc = -EOPNOTSUPP;
+                        goto out;
+                }
                 mdsk_term_io(device);
+                if (rc == 0)
+                        break;
         }
-        if (rc == 3) {
-                DEV_MESSAGE(KERN_WARNING, device, "%s", "DIAG call failed");
-                rc = -EOPNOTSUPP;
-        } else if (rc != 0) {
+        if (bsize > PAGE_SIZE) {
                 DEV_MESSAGE(KERN_WARNING, device, "device access failed "
                             "(rc=%d)", rc);
                 rc = -EIO;
+                goto out;
+        }
+        /* check for label block */
+        if (memcmp(label->label_id, DASD_DIAG_CMS1,
+                  sizeof(DASD_DIAG_CMS1)) == 0) {
+                /* get formatted blocksize from label block */
+                bsize = (unsigned int) label->block_size;
+                device->blocks = (unsigned long) label->block_count;
+        } else
+                device->blocks = end_block;
+        device->bp_block = bsize;
+        device->s2b_shift = 0;  /* bits to shift 512 to get a block */
+        for (sb = 512; sb < bsize; sb = sb << 1)
+                device->s2b_shift++;
+        rc = mdsk_init_io(device, device->bp_block, 0, NULL);
+        if (rc) {
+                DEV_MESSAGE(KERN_WARNING, device, "DIAG initialization "
+                        "failed (rc=%d)", rc);
+                rc = -EIO;
         } else {
-                if (memcmp(label->label_id, DASD_DIAG_CMS1,
-                          sizeof(DASD_DIAG_CMS1)) == 0) {
-                        /* get formatted blocksize from label block */
-                        bsize = (unsigned int) label->block_size;
-                        device->blocks = (unsigned long) label->block_count;
-                } else
-                        device->blocks = end_block;
-                device->bp_block = bsize;
-                device->s2b_shift = 0;  /* bits to shift 512 to get a block */
-                for (sb = 512; sb < bsize; sb = sb << 1)
-                        device->s2b_shift++;
-                
                 DEV_MESSAGE(KERN_INFO, device,
                             "(%ld B/blk): %ldkB",
                             (unsigned long) device->bp_block,
                             (unsigned long) (device->blocks <<
                                 device->s2b_shift) >> 1);
-                rc = 0;
         }
+out:
         free_page((long) label);
         return rc;
 }
@@ -529,7 +539,7 @@ dasd_diag_build_cp(struct dasd_device * device, struct request *req)
                                 memset(dbio, 0, sizeof (struct dasd_diag_bio));
                                 dbio->type = rw_cmd;
                                 dbio->block_number = recid + 1;
-                                dbio->buffer = __pa(dst);
+                                dbio->buffer = dst;
                                 dbio++;
                                 dst += blksize;
                                 recid++;
diff --git a/drivers/s390/block/dasd_diag.h b/drivers/s390/block/dasd_diag.h
index b26eb28df4bf..df31484d73a7 100644
--- a/drivers/s390/block/dasd_diag.h
+++ b/drivers/s390/block/dasd_diag.h
@@ -6,7 +6,7 @@
  * Bugreports.to..: <Linux390@de.ibm.com>
  * (C) IBM Corporation, IBM Deutschland Entwicklung GmbH, 1999,2000
  *
- * $Revision: 1.7 $
+ * $Revision: 1.8 $
  */
 
 #define MDSK_WRITE_REQ 0x01
@@ -78,7 +78,7 @@ struct dasd_diag_bio {
         u8 spare1[2];
         u32 alet;
         blocknum_t block_number;
-        u64 buffer;
+        void *buffer;
 } __attribute__ ((packed, aligned(8)));
 
 struct dasd_diag_init_io {
@@ -104,7 +104,7 @@ struct dasd_diag_rw_io {
         u32 alet;
         u8  spare3[4];
         u64 interrupt_params;
-        u64 bio_list;
+        struct dasd_diag_bio *bio_list;
         u8  spare4[8];
 } __attribute__ ((packed, aligned(8)));
 #else /* CONFIG_ARCH_S390X */
@@ -119,7 +119,7 @@ struct dasd_diag_bio {
         u16 spare1;
         blocknum_t block_number;
         u32 alet;
-        u32 buffer;
+        void *buffer;
 } __attribute__ ((packed, aligned(8)));
 
 struct dasd_diag_init_io {
@@ -142,7 +142,7 @@ struct dasd_diag_rw_io {
         u8 spare2[2];
         u32 block_count;
         u32 alet;
-        u32 bio_list;
+        struct dasd_diag_bio *bio_list;
         u32 interrupt_params;
         u8 spare3[20];
 } __attribute__ ((packed, aligned(8)));
diff --git a/drivers/s390/char/con3215.c b/drivers/s390/char/con3215.c
index f11a67fda40e..75419cf9d353 100644
--- a/drivers/s390/char/con3215.c
+++ b/drivers/s390/char/con3215.c
@@ -727,8 +727,7 @@ raw3215_remove (struct ccw_device *cdev)
         raw = cdev->dev.driver_data;
         if (raw) {
                 cdev->dev.driver_data = NULL;
-                if (raw->buffer)
-                        kfree(raw->buffer);
+                kfree(raw->buffer);
                 kfree(raw);
         }
 }
diff --git a/drivers/s390/char/keyboard.c b/drivers/s390/char/keyboard.c
index fd43d99b45a3..5bda2340a39d 100644
--- a/drivers/s390/char/keyboard.c
+++ b/drivers/s390/char/keyboard.c
@@ -99,13 +99,11 @@ out_fn_handler:
         kfree(kbd->fn_handler);
 out_func:
         for (i = 0; i < ARRAY_SIZE(func_table); i++)
-                if (kbd->func_table[i])
-                        kfree(kbd->func_table[i]);
+                kfree(kbd->func_table[i]);
         kfree(kbd->func_table);
 out_maps:
         for (i = 0; i < ARRAY_SIZE(key_maps); i++)
-                if (kbd->key_maps[i])
-                        kfree(kbd->key_maps[i]);
+                kfree(kbd->key_maps[i]);
         kfree(kbd->key_maps);
 out_kbd:
         kfree(kbd);
@@ -121,12 +119,10 @@ kbd_free(struct kbd_data *kbd)
         kfree(kbd->accent_table);
         kfree(kbd->fn_handler);
         for (i = 0; i < ARRAY_SIZE(func_table); i++)
-                if (kbd->func_table[i])
-                        kfree(kbd->func_table[i]);
+                kfree(kbd->func_table[i]);
         kfree(kbd->func_table);
         for (i = 0; i < ARRAY_SIZE(key_maps); i++)
-                if (kbd->key_maps[i])
-                        kfree(kbd->key_maps[i]);
+                kfree(kbd->key_maps[i]);
         kfree(kbd->key_maps);
         kfree(kbd);
 }
@@ -452,8 +448,7 @@ do_kdgkb_ioctl(struct kbd_data *kbd, struct kbsentry __user *u_kbs,
                         return -EFAULT;
                 }
                 p[len] = 0;
-                if (kbd->func_table[kb_func])
-                        kfree(kbd->func_table[kb_func]);
+                kfree(kbd->func_table[kb_func]);
                 kbd->func_table[kb_func] = p;
                 break;
         }
diff --git a/drivers/s390/char/raw3270.c b/drivers/s390/char/raw3270.c
index d66946443dfc..f5b7d360fc10 100644
--- a/drivers/s390/char/raw3270.c
+++ b/drivers/s390/char/raw3270.c
@@ -183,8 +183,7 @@ raw3270_request_alloc_bootmem(size_t size)
 void
 raw3270_request_free (struct raw3270_request *rq)
 {
-        if (rq->buffer)
-                kfree(rq->buffer);
+        kfree(rq->buffer);
         kfree(rq);
 }
 
diff --git a/drivers/s390/char/tape_core.c b/drivers/s390/char/tape_core.c
index 6c52e8307dc5..8f486e1a8507 100644
--- a/drivers/s390/char/tape_core.c
+++ b/drivers/s390/char/tape_core.c
@@ -682,8 +682,7 @@ tape_alloc_request(int cplength, int datasize)
                 request->cpdata = kmalloc(datasize, GFP_KERNEL | GFP_DMA);
                 if (request->cpdata == NULL) {
                         DBF_EXCEPTION(1, "cqra nomem\n");
-                        if (request->cpaddr != NULL)
-                                kfree(request->cpaddr);
+                        kfree(request->cpaddr);
                         kfree(request);
                         return ERR_PTR(-ENOMEM);
                 }
@@ -706,10 +705,8 @@ tape_free_request (struct tape_request * request)
         if (request->device != NULL) {
                 request->device = tape_put_device(request->device);
         }
-        if (request->cpdata != NULL)
-                kfree(request->cpdata);
-        if (request->cpaddr != NULL)
-                kfree(request->cpaddr);
+        kfree(request->cpdata);
+        kfree(request->cpaddr);
         kfree(request);
 }
 
diff --git a/drivers/s390/char/vmcp.c b/drivers/s390/char/vmcp.c
index 8990d8076e7d..19762f3476aa 100644
--- a/drivers/s390/char/vmcp.c
+++ b/drivers/s390/char/vmcp.c
@@ -103,8 +103,10 @@ vmcp_write(struct file *file, const char __user * buff, size_t count,
         }
         cmd[count] = '\0';
         session = (struct vmcp_session *)file->private_data;
-        if (down_interruptible(&session->mutex))
+        if (down_interruptible(&session->mutex)) {
+                kfree(cmd);
                 return -ERESTARTSYS;
+        }
         if (!session->response)
                 session->response = (char *)__get_free_pages(GFP_KERNEL
                                                 | __GFP_REPEAT  | GFP_DMA,
diff --git a/drivers/s390/cio/ccwgroup.c b/drivers/s390/cio/ccwgroup.c
index dbb3eb0e330b..e7bd7f37f080 100644
--- a/drivers/s390/cio/ccwgroup.c
+++ b/drivers/s390/cio/ccwgroup.c
@@ -1,7 +1,7 @@
 /*
  *  drivers/s390/cio/ccwgroup.c
  *  bus driver for ccwgroup
- *   $Revision: 1.29 $
+ *   $Revision: 1.32 $
  *
  *    Copyright (C) 2002 IBM Deutschland Entwicklung GmbH,
  *                       IBM Corporation
@@ -274,7 +274,7 @@ ccwgroup_set_online(struct ccwgroup_device *gdev)
                 goto out;
         }
         gdrv = to_ccwgroupdrv (gdev->dev.driver);
-        if ((ret = gdrv->set_online(gdev)))
+        if ((ret = gdrv->set_online ? gdrv->set_online(gdev) : 0))
                 goto out;
 
         gdev->state = CCWGROUP_ONLINE;
@@ -300,7 +300,7 @@ ccwgroup_set_offline(struct ccwgroup_device *gdev)
                 goto out;
         }
         gdrv = to_ccwgroupdrv (gdev->dev.driver);
-        if ((ret = gdrv->set_offline(gdev)))
+        if ((ret = gdrv->set_offline ? gdrv->set_offline(gdev) : 0))
                 goto out;
 
         gdev->state = CCWGROUP_OFFLINE;
diff --git a/drivers/s390/cio/cmf.c b/drivers/s390/cio/cmf.c
index c05b069c2996..b978f7fe8327 100644
--- a/drivers/s390/cio/cmf.c
+++ b/drivers/s390/cio/cmf.c
@@ -642,8 +642,7 @@ static void
 free_cmbe (struct ccw_device *cdev)
 {
         spin_lock_irq(cdev->ccwlock);
-        if (cdev->private->cmb)
-                kfree(cdev->private->cmb);
+        kfree(cdev->private->cmb);
         cdev->private->cmb = NULL;
         spin_unlock_irq(cdev->ccwlock);
 
diff --git a/drivers/s390/cio/device_ops.c b/drivers/s390/cio/device_ops.c
index ad3fe5aeb663..85a3026e6900 100644
--- a/drivers/s390/cio/device_ops.c
+++ b/drivers/s390/cio/device_ops.c
@@ -550,10 +550,8 @@ ccw_device_stlck(struct ccw_device *cdev)
         /* Clear irb. */
         memset(&cdev->private->irb, 0, sizeof(struct irb));
 out_unlock:
-        if (buf)
-                kfree(buf);
-        if (buf2)
-                kfree(buf2);
+        kfree(buf);
+        kfree(buf2);
         spin_unlock_irqrestore(&sch->lock, flags);
         return ret;
 }
diff --git a/drivers/s390/cio/qdio.c b/drivers/s390/cio/qdio.c
index 381f339e3200..eb39218b925e 100644
--- a/drivers/s390/cio/qdio.c
+++ b/drivers/s390/cio/qdio.c
@@ -56,7 +56,7 @@
 #include "ioasm.h"
 #include "chsc.h"
 
-#define VERSION_QDIO_C "$Revision: 1.101 $"
+#define VERSION_QDIO_C "$Revision: 1.108 $"
 
 /****************** MODULE PARAMETER VARIABLES ********************/
 MODULE_AUTHOR("Utz Bacher <utz.bacher@de.ibm.com>");
@@ -1338,16 +1338,14 @@ qdio_release_irq_memory(struct qdio_irq *irq_ptr)
                 if (!irq_ptr->input_qs[i])
                         goto next;
 
-                if (irq_ptr->input_qs[i]->slib)
-                        kfree(irq_ptr->input_qs[i]->slib);
+                kfree(irq_ptr->input_qs[i]->slib);
                 kfree(irq_ptr->input_qs[i]);
 
 next:
                 if (!irq_ptr->output_qs[i])
                         continue;
 
-                if (irq_ptr->output_qs[i]->slib)
-                        kfree(irq_ptr->output_qs[i]->slib);
+                kfree(irq_ptr->output_qs[i]->slib);
                 kfree(irq_ptr->output_qs[i]);
 
         }
@@ -2873,10 +2871,10 @@ qdio_establish(struct qdio_initialize *init_data)
                 return result;
         }
         
-        wait_event_interruptible_timeout(cdev->private->wait_q,
+        /* Timeout is cared for already by using ccw_device_start_timeout(). */
+        wait_event_interruptible(cdev->private->wait_q,
                  irq_ptr->state == QDIO_IRQ_STATE_ESTABLISHED ||
-                 irq_ptr->state == QDIO_IRQ_STATE_ERR,
-                 QDIO_ESTABLISH_TIMEOUT);
+                 irq_ptr->state == QDIO_IRQ_STATE_ERR);
 
         if (irq_ptr->state == QDIO_IRQ_STATE_ESTABLISHED)
                 result = 0;
@@ -3315,8 +3313,7 @@ qdio_get_qdio_memory(void)
 static void
 qdio_release_qdio_memory(void)
 {
-        if (indicators)
-                kfree(indicators);
+        kfree(indicators);
 }
 
 static void
diff --git a/drivers/s390/crypto/z90main.c b/drivers/s390/crypto/z90main.c
index 0cb47eca91f3..04c2ef778ec6 100644
--- a/drivers/s390/crypto/z90main.c
+++ b/drivers/s390/crypto/z90main.c
@@ -3051,8 +3051,7 @@ destroy_crypto_device(int index)
         if (dev_ptr) {
                 disabledFlag = dev_ptr->disabled;
                 t = dev_ptr->dev_type;
-                if (dev_ptr->dev_resp_p)
-                        kfree(dev_ptr->dev_resp_p);
+                kfree(dev_ptr->dev_resp_p);
                 kfree(dev_ptr);
         } else {
                 disabledFlag = 0;
@@ -3080,11 +3079,11 @@ static void
 destroy_z90crypt(void)
 {
         int i;
+
         for (i = 0; i < z90crypt.max_count; i++)
                 if (z90crypt.device_p[i])
                         destroy_crypto_device(i);
-        if (z90crypt.hdware_info)
-                kfree((void *)z90crypt.hdware_info);
+        kfree(z90crypt.hdware_info);
         memset((void *)&z90crypt, 0, sizeof(z90crypt));
 }
 
diff --git a/drivers/s390/net/claw.c b/drivers/s390/net/claw.c
index 3092473991a7..1a1c3decea72 100644
--- a/drivers/s390/net/claw.c
+++ b/drivers/s390/net/claw.c
@@ -2743,14 +2743,10 @@ probe_error( struct ccwgroup_device *cgdev)
 #endif
         privptr=(struct claw_privbk *)cgdev->dev.driver_data;
         if (privptr!=NULL) {
-                if (privptr->p_env != NULL) {
-                        kfree(privptr->p_env);
-                        privptr->p_env=NULL;
-                }
-                if (privptr->p_mtc_envelope!=NULL) {
-                        kfree(privptr->p_mtc_envelope);
-                        privptr->p_mtc_envelope=NULL;
-                }
+                kfree(privptr->p_env);
+                privptr->p_env=NULL;
+                kfree(privptr->p_mtc_envelope);
+                privptr->p_mtc_envelope=NULL;
                 kfree(privptr);
                 privptr=NULL;
         }
@@ -4121,22 +4117,14 @@ claw_remove_device(struct ccwgroup_device *cgdev)
         if (cgdev->state == CCWGROUP_ONLINE)
                 claw_shutdown_device(cgdev);
         claw_remove_files(&cgdev->dev);
-        if (priv->p_mtc_envelope!=NULL) {
-                kfree(priv->p_mtc_envelope);
-                priv->p_mtc_envelope=NULL;
-        }
-        if (priv->p_env != NULL) {
-                kfree(priv->p_env);
-                priv->p_env=NULL;
-        }
-        if (priv->channel[0].irb != NULL) {
-                kfree(priv->channel[0].irb);
-                priv->channel[0].irb=NULL;
-        }
-        if (priv->channel[1].irb != NULL) {
-                kfree(priv->channel[1].irb);
-                priv->channel[1].irb=NULL;
-        }
+        kfree(priv->p_mtc_envelope);
+        priv->p_mtc_envelope=NULL;
+        kfree(priv->p_env);
+        priv->p_env=NULL;
+        kfree(priv->channel[0].irb);
+        priv->channel[0].irb=NULL;
+        kfree(priv->channel[1].irb);
+        priv->channel[1].irb=NULL;
         kfree(priv);
         cgdev->dev.driver_data=NULL;
         cgdev->cdev[READ]->dev.driver_data = NULL;
diff --git a/drivers/s390/net/fsm.c b/drivers/s390/net/fsm.c
index 38f50b7129a2..24029bd9c7d0 100644
--- a/drivers/s390/net/fsm.c
+++ b/drivers/s390/net/fsm.c
@@ -78,8 +78,7 @@ kfree_fsm(fsm_instance *this)
 {
         if (this) {
                 if (this->f) {
-                        if (this->f->jumpmatrix)
-                                kfree(this->f->jumpmatrix);
+                        kfree(this->f->jumpmatrix);
                         kfree(this->f);
                 }
                 kfree(this);
diff --git a/drivers/s390/net/iucv.c b/drivers/s390/net/iucv.c
index e08e74e16124..df7647c3c100 100644
--- a/drivers/s390/net/iucv.c
+++ b/drivers/s390/net/iucv.c
@@ -447,14 +447,10 @@ static void
 iucv_exit(void)
 {
         iucv_retrieve_buffer();
-        if (iucv_external_int_buffer) {
-                kfree(iucv_external_int_buffer);
-                iucv_external_int_buffer = NULL;
-        }
-        if (iucv_param_pool) {
-                kfree(iucv_param_pool);
-                iucv_param_pool = NULL;
-        }
+        kfree(iucv_external_int_buffer);
+        iucv_external_int_buffer = NULL;
+        kfree(iucv_param_pool);
+        iucv_param_pool = NULL;
         s390_root_dev_unregister(iucv_root);
         bus_unregister(&iucv_bus);
         printk(KERN_INFO "IUCV lowlevel driver unloaded\n");
diff --git a/drivers/s390/net/lcs.c b/drivers/s390/net/lcs.c
index 46f34ba93ac5..1c8ad2fcad8a 100644
--- a/drivers/s390/net/lcs.c
+++ b/drivers/s390/net/lcs.c
@@ -145,8 +145,7 @@ lcs_free_channel(struct lcs_channel *channel)
 
         LCS_DBF_TEXT(2, setup, "ichfree");
         for (cnt = 0; cnt < LCS_NUM_BUFFS; cnt++) {
-                if (channel->iob[cnt].data != NULL)
-                        kfree(channel->iob[cnt].data);
+                kfree(channel->iob[cnt].data);
                 channel->iob[cnt].data = NULL;
         }
 }
diff --git a/drivers/s390/net/qeth_eddp.c b/drivers/s390/net/qeth_eddp.c
index f94f1f25eec6..011915d5e243 100644
--- a/drivers/s390/net/qeth_eddp.c
+++ b/drivers/s390/net/qeth_eddp.c
@@ -62,8 +62,7 @@ qeth_eddp_free_context(struct qeth_eddp_context *ctx)
         for (i = 0; i < ctx->num_pages; ++i)
                 free_page((unsigned long)ctx->pages[i]);
         kfree(ctx->pages);
-        if (ctx->elements != NULL)
-                kfree(ctx->elements);
+        kfree(ctx->elements);
         kfree(ctx);
 }
 
diff --git a/drivers/s390/scsi/zfcp_aux.c b/drivers/s390/scsi/zfcp_aux.c
index cab098556b44..c218b5c944a6 100644
--- a/drivers/s390/scsi/zfcp_aux.c
+++ b/drivers/s390/scsi/zfcp_aux.c
@@ -450,8 +450,7 @@ zfcp_cfdc_dev_ioctl(struct file *file, unsigned int command,
                 kfree(sg_list);
         }
 
-        if (sense_data != NULL)
-                kfree(sense_data);
+        kfree(sense_data);
 
         return retval;
 }
diff --git a/drivers/sbus/char/cpwatchdog.c b/drivers/sbus/char/cpwatchdog.c
index c82abeb59d3a..071ae24be892 100644
--- a/drivers/sbus/char/cpwatchdog.c
+++ b/drivers/sbus/char/cpwatchdog.c
@@ -26,6 +26,7 @@
 #include <linux/interrupt.h>
 #include <linux/ioport.h>
 #include <linux/timer.h>
+#include <linux/smp_lock.h>
 #include <asm/irq.h>
 #include <asm/ebus.h>
 #include <asm/oplib.h>
@@ -394,6 +395,28 @@ static int wd_ioctl(struct inode *inode, struct file *file,
         return(0);
 }
 
+static long wd_compat_ioctl(struct file *file, unsigned int cmd,
+                unsigned long arg)
+{
+        int rval = -ENOIOCTLCMD;
+
+        switch (cmd) {
+        /* solaris ioctls are specific to this driver */
+        case WIOCSTART:
+        case WIOCSTOP:
+        case WIOCGSTAT:
+                lock_kernel();
+                rval = wd_ioctl(file->f_dentry->d_inode, file, cmd, arg);
+                lock_kernel();
+                break;
+        /* everything else is handled by the generic compat layer */
+        default:
+                break;
+        }
+
+        return rval;
+}
+
 static ssize_t wd_write(struct file     *file, 
                         const char      __user *buf, 
                         size_t          count, 
@@ -441,6 +464,7 @@ static irqreturn_t wd_interrupt(int irq, void *dev_id, struct pt_regs *regs)
 static struct file_operations wd_fops = {
         .owner =        THIS_MODULE,
         .ioctl =        wd_ioctl,
+        .compat_ioctl = wd_compat_ioctl,
         .open =         wd_open,
         .write =        wd_write,
         .read =         wd_read,
diff --git a/drivers/sbus/char/display7seg.c b/drivers/sbus/char/display7seg.c
index 24ed5893b4f0..39f54213a6d5 100644
--- a/drivers/sbus/char/display7seg.c
+++ b/drivers/sbus/char/display7seg.c
@@ -15,6 +15,7 @@
 #include <linux/init.h>
 #include <linux/miscdevice.h>
 #include <linux/ioport.h>               /* request_region */
+#include <linux/smp_lock.h>
 #include <asm/atomic.h>
 #include <asm/ebus.h>                   /* EBus device                                  */
 #include <asm/oplib.h>                  /* OpenProm Library                     */
@@ -114,22 +115,25 @@ static int d7s_release(struct inode *inode, struct file *f)
         return 0;
 }
 
-static int d7s_ioctl(struct inode *inode, struct file *f, 
-                     unsigned int cmd, unsigned long arg)
+static long d7s_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
 {
         __u8 regs = readb(d7s_regs);
         __u8 ireg = 0;
+        int error = 0
 
-        if (D7S_MINOR != iminor(inode))
+        if (D7S_MINOR != iminor(file->f_dentry->d_inode))
                 return -ENODEV;
 
+        lock_kernel();
         switch (cmd) {
         case D7SIOCWR:
                 /* assign device register values
                  * we mask-out D7S_FLIP if in sol_compat mode
                  */
-                if (get_user(ireg, (int __user *) arg))
-                        return -EFAULT;
+                if (get_user(ireg, (int __user *) arg)) {
+                        error = -EFAULT;
+                        break;
+                }
                 if (0 != sol_compat) {
                         (regs & D7S_FLIP) ? 
                                 (ireg |= D7S_FLIP) : (ireg &= ~D7S_FLIP);
@@ -144,8 +148,10 @@ static int d7s_ioctl(struct inode *inode, struct file *f,
                  * This driver will not misinform you about the state
                  * of your hardware while in sol_compat mode
                  */
-                if (put_user(regs, (int __user *) arg))
-                        return -EFAULT;
+                if (put_user(regs, (int __user *) arg)) {
+                        error = -EFAULT;
+                        break;
+                }
                 break;
 
         case D7SIOCTM:
@@ -155,15 +161,17 @@ static int d7s_ioctl(struct inode *inode, struct file *f,
                 writeb(regs, d7s_regs);
                 break;
         };
+        lock_kernel();
 
-        return 0;
+        return error;
 }
 
 static struct file_operations d7s_fops = {
-        .owner =        THIS_MODULE,
-        .ioctl =        d7s_ioctl,
-        .open =         d7s_open,
-        .release =      d7s_release,
+        .owner =                THIS_MODULE,
+        .unlocked_ioctl =       d7s_ioctl,
+        .compat_ioctl =         d7s_ioctl,
+        .open =                 d7s_open,
+        .release =              d7s_release,
 };
 
 static struct miscdevice d7s_miscdev = { D7S_MINOR, D7S_DEVNAME, &d7s_fops };
diff --git a/drivers/sbus/char/envctrl.c b/drivers/sbus/char/envctrl.c
index b0cc3c2588fd..19e8eddf887a 100644
--- a/drivers/sbus/char/envctrl.c
+++ b/drivers/sbus/char/envctrl.c
@@ -654,9 +654,8 @@ envctrl_read(struct file *file, char __user *buf, size_t count, loff_t *ppos)
 /* Function Description: Command what to read.  Mapped to user ioctl().
  * Return: Gives 0 for implemented commands, -EINVAL otherwise.
  */
-static int
-envctrl_ioctl(struct inode *inode, struct file *file,
-              unsigned int cmd, unsigned long arg)
+static long
+envctrl_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
 {
         char __user *infobuf;
 
@@ -715,11 +714,14 @@ envctrl_release(struct inode *inode, struct file *file)
 }
 
 static struct file_operations envctrl_fops = {
-        .owner =        THIS_MODULE,
-        .read =         envctrl_read,
-        .ioctl =        envctrl_ioctl,
-        .open =         envctrl_open,
-        .release =      envctrl_release,
+        .owner =                THIS_MODULE,
+        .read =                 envctrl_read,
+        .unlocked_ioctl =       envctrl_ioctl,
+#ifdef CONFIG_COMPAT
+        .compat_ioctl =         envctrl_ioctl,
+#endif
+        .open =                 envctrl_open,
+        .release =              envctrl_release,
 };      
 
 static struct miscdevice envctrl_dev = {
@@ -1125,10 +1127,9 @@ out_deregister:
         misc_deregister(&envctrl_dev);
 out_iounmap:
         iounmap(i2c);
-        for (i = 0; i < ENVCTRL_MAX_CPU * 2; i++) {
-                if (i2c_childlist[i].tables)
-                        kfree(i2c_childlist[i].tables);
-        }
+        for (i = 0; i < ENVCTRL_MAX_CPU * 2; i++)
+                kfree(i2c_childlist[i].tables);
+
         return err;
 }
 
@@ -1141,10 +1142,8 @@ static void __exit envctrl_cleanup(void)
         iounmap(i2c);
         misc_deregister(&envctrl_dev);
 
-        for (i = 0; i < ENVCTRL_MAX_CPU * 2; i++) {
-                if (i2c_childlist[i].tables)
-                        kfree(i2c_childlist[i].tables);
-        }
+        for (i = 0; i < ENVCTRL_MAX_CPU * 2; i++)
+                kfree(i2c_childlist[i].tables);
 }
 
 module_init(envctrl_init);
diff --git a/drivers/sbus/char/openprom.c b/drivers/sbus/char/openprom.c
index 58ed33749571..5028ac214326 100644
--- a/drivers/sbus/char/openprom.c
+++ b/drivers/sbus/char/openprom.c
@@ -39,6 +39,7 @@
 #include <linux/slab.h>
 #include <linux/string.h>
 #include <linux/miscdevice.h>
+#include <linux/smp_lock.h>
 #include <linux/init.h>
 #include <linux/fs.h>
 #include <asm/oplib.h>
@@ -565,6 +566,38 @@ static int openprom_ioctl(struct inode * inode, struct file * file,
         }
 }
 
+static long openprom_compat_ioctl(struct file *file, unsigned int cmd,
+                unsigned long arg)
+{
+        long rval = -ENOTTY;
+
+        /*
+         * SunOS/Solaris only, the NetBSD one's have embedded pointers in
+         * the arg which we'd need to clean up...
+         */
+        switch (cmd) {
+        case OPROMGETOPT:
+        case OPROMSETOPT:
+        case OPROMNXTOPT:
+        case OPROMSETOPT2:
+        case OPROMNEXT:
+        case OPROMCHILD:
+        case OPROMGETPROP:
+        case OPROMNXTPROP:
+        case OPROMU2P:
+        case OPROMGETCONS:
+        case OPROMGETFBNAME:
+        case OPROMGETBOOTARGS:
+        case OPROMSETCUR:
+        case OPROMPCI2NODE:
+        case OPROMPATH2NODE:
+                lock_kernel();
+                rval = openprom_ioctl(file->f_dentry->d_inode, file, cmd, arg);
+                lock_kernel();
+                break;
+        }
+}
+
 static int openprom_open(struct inode * inode, struct file * file)
 {
         DATA *data;
diff --git a/drivers/scsi/3w-9xxx.c b/drivers/scsi/3w-9xxx.c
index d06ee65d668d..3ff74f472249 100644
--- a/drivers/scsi/3w-9xxx.c
+++ b/drivers/scsi/3w-9xxx.c
@@ -1017,8 +1017,7 @@ static void twa_free_device_extension(TW_Device_Extension *tw_dev)
                                     tw_dev->generic_buffer_virt[0],
                                     tw_dev->generic_buffer_phys[0]);
 
-        if (tw_dev->event_queue[0])
-                kfree(tw_dev->event_queue[0]);
+        kfree(tw_dev->event_queue[0]);
 } /* End twa_free_device_extension() */
 
 /* This function will free a request id */
diff --git a/drivers/scsi/NCR5380.c b/drivers/scsi/NCR5380.c
index cc9ecb35b412..cba9655d0f14 100644
--- a/drivers/scsi/NCR5380.c
+++ b/drivers/scsi/NCR5380.c
@@ -606,10 +606,7 @@ static int __init NCR5380_probe_irq(struct Scsi_Host *instance, int possible)
         NCR5380_write(INITIATOR_COMMAND_REG, ICR_BASE | ICR_ASSERT_DATA | ICR_ASSERT_SEL);
 
         while (probe_irq == SCSI_IRQ_NONE && time_before(jiffies, timeout))
-        {
-                set_current_state(TASK_UNINTERRUPTIBLE);
-                schedule_timeout(1);
-        }
+                schedule_timeout_uninterruptible(1);
         
         NCR5380_write(SELECT_ENABLE_REG, 0);
         NCR5380_write(INITIATOR_COMMAND_REG, ICR_BASE);
diff --git a/drivers/scsi/aacraid/commsup.c b/drivers/scsi/aacraid/commsup.c
index ee9067255930..723c0cea7c04 100644
--- a/drivers/scsi/aacraid/commsup.c
+++ b/drivers/scsi/aacraid/commsup.c
@@ -1164,7 +1164,7 @@ int aac_command_thread(struct aac_dev * dev)
                                                 kfree(hw_fib_pool);
                                                 hw_fib_pool = NULL;
                                         }
-                                } else if (hw_fib_pool) {
+                                } else {
                                         kfree(hw_fib_pool);
                                         hw_fib_pool = NULL;
                                 }
@@ -1247,17 +1247,13 @@ int aac_command_thread(struct aac_dev * dev)
                                 hw_fib_p = hw_fib_pool;
                                 fib_p = fib_pool;
                                 while (hw_fib_p < &hw_fib_pool[num]) {
-                                        if (*hw_fib_p)
-                                                kfree(*hw_fib_p);
-                                        if (*fib_p)
-                                                kfree(*fib_p);
+                                        kfree(*hw_fib_p);
+                                        kfree(*fib_p);
                                         ++fib_p;
                                         ++hw_fib_p;
                                 }
-                                if (hw_fib_pool)
-                                        kfree(hw_fib_pool);
-                                if (fib_pool)
-                                        kfree(fib_pool);
+                                kfree(hw_fib_pool);
+                                kfree(fib_pool);
                         }
                         kfree(fib);
                         spin_lock_irqsave(dev->queues->queue[HostNormCmdQueue].lock, flags);
diff --git a/drivers/scsi/aacraid/rkt.c b/drivers/scsi/aacraid/rkt.c
index fc4c73c2a6a9..e9b775d6bec9 100644
--- a/drivers/scsi/aacraid/rkt.c
+++ b/drivers/scsi/aacraid/rkt.c
@@ -183,8 +183,7 @@ static int rkt_sync_cmd(struct aac_dev *dev, u32 command,
                 /*
                  *      Yield the processor in case we are slow 
                  */
-                set_current_state(TASK_UNINTERRUPTIBLE);
-                schedule_timeout(1);
+                schedule_timeout_uninterruptible(1);
         }
         if (ok != 1) {
                 /*
@@ -452,8 +451,7 @@ int aac_rkt_init(struct aac_dev *dev)
                                         dev->name, instance, status);
                         goto error_iounmap;
                 }
-                set_current_state(TASK_UNINTERRUPTIBLE);
-                schedule_timeout(1);
+                schedule_timeout_uninterruptible(1);
         }
         if (request_irq(dev->scsi_host_ptr->irq, aac_rkt_intr, SA_SHIRQ|SA_INTERRUPT, "aacraid", (void *)dev)<0) 
         {
diff --git a/drivers/scsi/aacraid/rx.c b/drivers/scsi/aacraid/rx.c
index da99046e5393..6998bc877dd6 100644
--- a/drivers/scsi/aacraid/rx.c
+++ b/drivers/scsi/aacraid/rx.c
@@ -183,8 +183,7 @@ static int rx_sync_cmd(struct aac_dev *dev, u32 command,
                 /*
                  *      Yield the processor in case we are slow 
                  */
-                set_current_state(TASK_UNINTERRUPTIBLE);
-                schedule_timeout(1);
+                schedule_timeout_uninterruptible(1);
         }
         if (ok != 1) {
                 /*
@@ -452,8 +451,7 @@ int aac_rx_init(struct aac_dev *dev)
                                         dev->name, instance, status);
                         goto error_iounmap;
                 }
-                set_current_state(TASK_UNINTERRUPTIBLE);
-                schedule_timeout(1);
+                schedule_timeout_uninterruptible(1);
         }
         if (request_irq(dev->scsi_host_ptr->irq, aac_rx_intr, SA_SHIRQ|SA_INTERRUPT, "aacraid", (void *)dev)<0) 
         {
diff --git a/drivers/scsi/aacraid/sa.c b/drivers/scsi/aacraid/sa.c
index 8b9596209164..466f05cfbf0c 100644
--- a/drivers/scsi/aacraid/sa.c
+++ b/drivers/scsi/aacraid/sa.c
@@ -189,8 +189,7 @@ static int sa_sync_cmd(struct aac_dev *dev, u32 command,
                         ok = 1;
                         break;
                 }
-                set_current_state(TASK_UNINTERRUPTIBLE);
-                schedule_timeout(1);
+                schedule_timeout_uninterruptible(1);
         }
 
         if (ok != 1)
@@ -325,8 +324,7 @@ int aac_sa_init(struct aac_dev *dev)
                                         name, instance, status);
                         goto error_iounmap;
                 }
-                set_current_state(TASK_UNINTERRUPTIBLE);
-                schedule_timeout(1);
+                schedule_timeout_uninterruptible(1);
         }
 
         if (request_irq(dev->scsi_host_ptr->irq, aac_sa_intr, SA_SHIRQ|SA_INTERRUPT, "aacraid", (void *)dev ) < 0) {
diff --git a/drivers/scsi/advansys.c b/drivers/scsi/advansys.c
index 37ec5411e325..f4cfb8f29620 100644
--- a/drivers/scsi/advansys.c
+++ b/drivers/scsi/advansys.c
@@ -5402,10 +5402,8 @@ advansys_detect(struct scsi_host_template *tpnt)
                 release_region(shp->io_port, boardp->asc_n_io_port);
                 if (ASC_WIDE_BOARD(boardp)) {
                     iounmap(boardp->ioremap_addr);
-                    if (boardp->orig_carrp) {
-                        kfree(boardp->orig_carrp);
-                        boardp->orig_carrp = NULL;
-                    }
+                    kfree(boardp->orig_carrp);
+                    boardp->orig_carrp = NULL;
                     if (boardp->orig_reqp) {
                         kfree(boardp->orig_reqp);
                         boardp->orig_reqp = boardp->adv_reqp = NULL;
@@ -5457,10 +5455,8 @@ advansys_release(struct Scsi_Host *shp)
         adv_sgblk_t    *sgp = NULL;
 
         iounmap(boardp->ioremap_addr);
-        if (boardp->orig_carrp) {
-            kfree(boardp->orig_carrp);
-            boardp->orig_carrp = NULL;
-        }
+        kfree(boardp->orig_carrp);
+        boardp->orig_carrp = NULL;
         if (boardp->orig_reqp) {
             kfree(boardp->orig_reqp);
             boardp->orig_reqp = boardp->adv_reqp = NULL;
diff --git a/drivers/scsi/aha1542.c b/drivers/scsi/aha1542.c
index adda750412f2..1b1adfb384cb 100644
--- a/drivers/scsi/aha1542.c
+++ b/drivers/scsi/aha1542.c
@@ -543,10 +543,8 @@ static void aha1542_intr_handle(struct Scsi_Host *shost, void *dev_id, struct pt
                         return;
                 }
                 my_done = SCtmp->scsi_done;
-                if (SCtmp->host_scribble) {
-                        kfree(SCtmp->host_scribble);
-                        SCtmp->host_scribble = NULL;
-                }
+                kfree(SCtmp->host_scribble);
+                SCtmp->host_scribble = NULL;
                 /* Fetch the sense data, and tuck it away, in the required slot.  The
                    Adaptec automatically fetches it, and there is no guarantee that
                    we will still have it in the cdb when we come back */
@@ -1432,10 +1430,8 @@ static int aha1542_dev_reset(Scsi_Cmnd * SCpnt)
                     HOSTDATA(SCpnt->host)->SCint[i]->target == SCpnt->target) {
                         Scsi_Cmnd *SCtmp;
                         SCtmp = HOSTDATA(SCpnt->host)->SCint[i];
-                        if (SCtmp->host_scribble) {
-                                kfree(SCtmp->host_scribble);
-                                SCtmp->host_scribble = NULL;
-                        }
+                        kfree(SCtmp->host_scribble);
+                        SCtmp->host_scribble = NULL;
                         HOSTDATA(SCpnt->host)->SCint[i] = NULL;
                         HOSTDATA(SCpnt->host)->mb[i].status = 0;
                 }
@@ -1495,10 +1491,8 @@ static int aha1542_bus_reset(Scsi_Cmnd * SCpnt)
                                  */
                                 continue;
                         }
-                        if (SCtmp->host_scribble) {
-                                kfree(SCtmp->host_scribble);
-                                SCtmp->host_scribble = NULL;
-                        }
+                        kfree(SCtmp->host_scribble);
+                        SCtmp->host_scribble = NULL;
                         HOSTDATA(SCpnt->device->host)->SCint[i] = NULL;
                         HOSTDATA(SCpnt->device->host)->mb[i].status = 0;
                 }
@@ -1565,10 +1559,8 @@ static int aha1542_host_reset(Scsi_Cmnd * SCpnt)
                                  */
                                 continue;
                         }
-                        if (SCtmp->host_scribble) {
-                                kfree(SCtmp->host_scribble);
-                                SCtmp->host_scribble = NULL;
-                        }
+                        kfree(SCtmp->host_scribble);
+                        SCtmp->host_scribble = NULL;
                         HOSTDATA(SCpnt->device->host)->SCint[i] = NULL;
                         HOSTDATA(SCpnt->device->host)->mb[i].status = 0;
                 }
@@ -1711,10 +1703,8 @@ static int aha1542_old_reset(Scsi_Cmnd * SCpnt, unsigned int reset_flags)
                                 Scsi_Cmnd *SCtmp;
                                 SCtmp = HOSTDATA(SCpnt->host)->SCint[i];
                                 SCtmp->result = DID_RESET << 16;
-                                if (SCtmp->host_scribble) {
-                                        kfree(SCtmp->host_scribble);
-                                        SCtmp->host_scribble = NULL;
-                                }
+                                kfree(SCtmp->host_scribble);
+                                SCtmp->host_scribble = NULL;
                                 printk(KERN_WARNING "Sending DID_RESET for target %d\n", SCpnt->target);
                                 SCtmp->scsi_done(SCpnt);
 
@@ -1757,10 +1747,8 @@ fail:
                                                 Scsi_Cmnd *SCtmp;
                                                 SCtmp = HOSTDATA(SCpnt->host)->SCint[i];
                                                 SCtmp->result = DID_RESET << 16;
-                                                if (SCtmp->host_scribble) {
-                                                        kfree(SCtmp->host_scribble);
-                                                        SCtmp->host_scribble = NULL;
-                                                }
+                                                kfree(SCtmp->host_scribble);
+                                                SCtmp->host_scribble = NULL;
                                                 printk(KERN_WARNING "Sending DID_RESET for target %d\n", SCpnt->target);
                                                 SCtmp->scsi_done(SCpnt);
 
diff --git a/drivers/scsi/aic7xxx_old.c b/drivers/scsi/aic7xxx_old.c
index 52b72d7794f5..880e2d9ffe9b 100644
--- a/drivers/scsi/aic7xxx_old.c
+++ b/drivers/scsi/aic7xxx_old.c
@@ -8492,8 +8492,7 @@ aic7xxx_free(struct aic7xxx_host *p)
                                      - scb_dma->dma_offset),
                             scb_dma->dma_address);
       }
-      if (p->scb_data->scb_array[i]->kmalloc_ptr != NULL)
-        kfree(p->scb_data->scb_array[i]->kmalloc_ptr);
+      kfree(p->scb_data->scb_array[i]->kmalloc_ptr);
       p->scb_data->scb_array[i] = NULL;
     }
   
diff --git a/drivers/scsi/arm/queue.c b/drivers/scsi/arm/queue.c
index e6d159270d29..b10750bb5c09 100644
--- a/drivers/scsi/arm/queue.c
+++ b/drivers/scsi/arm/queue.c
@@ -91,8 +91,7 @@ void queue_free (Queue_t *queue)
 {
         if (!list_empty(&queue->head))
                 printk(KERN_WARNING "freeing non-empty queue %p\n", queue);
-        if (queue->alloc)
-                kfree(queue->alloc);
+        kfree(queue->alloc);
 }
      
 
diff --git a/drivers/scsi/atari_dma_emul.c b/drivers/scsi/atari_dma_emul.c
index 7026045527fd..8d5d2a5da961 100644
--- a/drivers/scsi/atari_dma_emul.c
+++ b/drivers/scsi/atari_dma_emul.c
@@ -19,6 +19,8 @@
  * this code.
  */
 
+#include <linux/compiler.h>
+#include <asm/thread_info.h>
 #include <asm/uaccess.h>
 
 #define hades_dma_ctrl          (*(unsigned char *) 0xffff8717)
diff --git a/drivers/scsi/dc395x.c b/drivers/scsi/dc395x.c
index c44af5795b10..c8a32cf47d73 100644
--- a/drivers/scsi/dc395x.c
+++ b/drivers/scsi/dc395x.c
@@ -4270,8 +4270,7 @@ static void adapter_sg_tables_free(struct AdapterCtlBlk *acb)
         const unsigned srbs_per_page = PAGE_SIZE/SEGMENTX_LEN;
 
         for (i = 0; i < DC395x_MAX_SRB_CNT; i += srbs_per_page)
-                if (acb->srb_array[i].segment_x)
-                        kfree(acb->srb_array[i].segment_x);
+                kfree(acb->srb_array[i].segment_x);
 }
 
 
diff --git a/drivers/scsi/dpt_i2o.c b/drivers/scsi/dpt_i2o.c
index 7235f94f1191..c28e3aea1c3c 100644
--- a/drivers/scsi/dpt_i2o.c
+++ b/drivers/scsi/dpt_i2o.c
@@ -1037,18 +1037,10 @@ static void adpt_i2o_delete_hba(adpt_hba* pHba)
         if(pHba->msg_addr_virt != pHba->base_addr_virt){
                 iounmap(pHba->msg_addr_virt);
         }
-        if(pHba->hrt) {
-                kfree(pHba->hrt);
-        }
-        if(pHba->lct){
-                kfree(pHba->lct);
-        }
-        if(pHba->status_block) {
-                kfree(pHba->status_block);
-        }
-        if(pHba->reply_pool){
-                kfree(pHba->reply_pool);
-        }
+        kfree(pHba->hrt);
+        kfree(pHba->lct);
+        kfree(pHba->status_block);
+        kfree(pHba->reply_pool);
 
         for(d = pHba->devices; d ; d = next){
                 next = d->next;
@@ -1218,8 +1210,7 @@ static s32 adpt_i2o_post_this(adpt_hba* pHba, u32* data, int len)
                         printk(KERN_WARNING"dpti%d: Timeout waiting for message frame!\n", pHba->unit);
                         return -ETIMEDOUT;
                 }
-                set_current_state(TASK_UNINTERRUPTIBLE);
-                schedule_timeout(1);
+                schedule_timeout_uninterruptible(1);
         } while(m == EMPTY_QUEUE);
                 
         msg = pHba->msg_addr_virt + m;
@@ -1294,8 +1285,7 @@ static s32 adpt_i2o_reset_hba(adpt_hba* pHba)
                         printk(KERN_WARNING"Timeout waiting for message!\n");
                         return -ETIMEDOUT;
                 }
-                set_current_state(TASK_UNINTERRUPTIBLE);
-                schedule_timeout(1);
+                schedule_timeout_uninterruptible(1);
         } while (m == EMPTY_QUEUE);
 
         status = (u8*)kmalloc(4, GFP_KERNEL|ADDR32);
@@ -1327,8 +1317,7 @@ static s32 adpt_i2o_reset_hba(adpt_hba* pHba)
                         return -ETIMEDOUT;
                 }
                 rmb();
-                set_current_state(TASK_UNINTERRUPTIBLE);
-                schedule_timeout(1);
+                schedule_timeout_uninterruptible(1);
         }
 
         if(*status == 0x01 /*I2O_EXEC_IOP_RESET_IN_PROGRESS*/) {
@@ -1345,8 +1334,7 @@ static s32 adpt_i2o_reset_hba(adpt_hba* pHba)
                                 printk(KERN_ERR "%s:Timeout waiting for IOP Reset.\n",pHba->name);
                                 return -ETIMEDOUT;
                         }
-                        set_current_state(TASK_UNINTERRUPTIBLE);
-                        schedule_timeout(1);
+                        schedule_timeout_uninterruptible(1);
                 } while (m == EMPTY_QUEUE);
                 // Flush the offset
                 adpt_send_nop(pHba, m);
@@ -1917,11 +1905,8 @@ static int adpt_ioctl(struct inode *inode, struct file *file, uint cmd,
                 return -ENXIO;
         }
 
-        while((volatile u32) pHba->state & DPTI_STATE_RESET ) {
-                set_task_state(current,TASK_UNINTERRUPTIBLE);
-                schedule_timeout(2);
-
-        }
+        while((volatile u32) pHba->state & DPTI_STATE_RESET )
+                schedule_timeout_uninterruptible(2);
 
         switch (cmd) {
         // TODO: handle 3 cases
@@ -2635,8 +2620,7 @@ static s32 adpt_send_nop(adpt_hba*pHba,u32 m)
                         printk(KERN_ERR "%s: Timeout waiting for message frame!\n",pHba->name);
                         return 2;
                 }
-                set_current_state(TASK_UNINTERRUPTIBLE);
-                schedule_timeout(1);
+                schedule_timeout_uninterruptible(1);
         }
         msg = (u32 __iomem *)(pHba->msg_addr_virt + m);
         writel( THREE_WORD_MSG_SIZE | SGL_OFFSET_0,&msg[0]);
@@ -2670,8 +2654,7 @@ static s32 adpt_i2o_init_outbound_q(adpt_hba* pHba)
                         printk(KERN_WARNING"%s: Timeout waiting for message frame\n",pHba->name);
                         return -ETIMEDOUT;
                 }
-                set_current_state(TASK_UNINTERRUPTIBLE);
-                schedule_timeout(1);
+                schedule_timeout_uninterruptible(1);
         } while(m == EMPTY_QUEUE);
 
         msg=(u32 __iomem *)(pHba->msg_addr_virt+m);
@@ -2709,21 +2692,18 @@ static s32 adpt_i2o_init_outbound_q(adpt_hba* pHba)
                         printk(KERN_WARNING"%s: Timeout Initializing\n",pHba->name);
                         return -ETIMEDOUT;
                 }
-                set_current_state(TASK_UNINTERRUPTIBLE);
-                schedule_timeout(1);
+                schedule_timeout_uninterruptible(1);
         } while (1);
 
         // If the command was successful, fill the fifo with our reply
         // message packets
         if(*status != 0x04 /*I2O_EXEC_OUTBOUND_INIT_COMPLETE*/) {
-                kfree((void*)status);
+                kfree(status);
                 return -2;
         }
-        kfree((void*)status);
+        kfree(status);
 
-        if(pHba->reply_pool != NULL){
-                kfree(pHba->reply_pool);
-        }
+        kfree(pHba->reply_pool);
 
         pHba->reply_pool = (u32*)kmalloc(pHba->reply_fifo_size * REPLY_FRAME_SIZE * 4, GFP_KERNEL|ADDR32);
         if(!pHba->reply_pool){
@@ -2788,8 +2768,7 @@ static s32 adpt_i2o_status_get(adpt_hba* pHba)
                                         pHba->name);
                         return -ETIMEDOUT;
                 }
-                set_current_state(TASK_UNINTERRUPTIBLE);
-                schedule_timeout(1);
+                schedule_timeout_uninterruptible(1);
         } while(m==EMPTY_QUEUE);
 
         
@@ -2816,8 +2795,7 @@ static s32 adpt_i2o_status_get(adpt_hba* pHba)
                         return -ETIMEDOUT;
                 }
                 rmb();
-                set_current_state(TASK_UNINTERRUPTIBLE);
-                schedule_timeout(1);
+                schedule_timeout_uninterruptible(1);
         }
 
         // Set up our number of outbound and inbound messages
@@ -2941,8 +2919,7 @@ static int adpt_i2o_build_sys_table(void)
         sys_tbl_len = sizeof(struct i2o_sys_tbl) +      // Header + IOPs
                                 (hba_count) * sizeof(struct i2o_sys_tbl_entry);
 
-        if(sys_tbl)
-                kfree(sys_tbl);
+        kfree(sys_tbl);
 
         sys_tbl = kmalloc(sys_tbl_len, GFP_KERNEL|ADDR32);
         if(!sys_tbl) {
diff --git a/drivers/scsi/eata.c b/drivers/scsi/eata.c
index b45a4c730230..b3f9de8f7595 100644
--- a/drivers/scsi/eata.c
+++ b/drivers/scsi/eata.c
@@ -2580,8 +2580,7 @@ static int eata2x_release(struct Scsi_Host *shost)
         unsigned int i;
 
         for (i = 0; i < shost->can_queue; i++)
-                if ((&ha->cp[i])->sglist)
-                        kfree((&ha->cp[i])->sglist);
+                kfree((&ha->cp[i])->sglist);
 
         for (i = 0; i < shost->can_queue; i++)
                 pci_unmap_single(ha->pdev, ha->cp[i].cp_dma_addr,
diff --git a/drivers/scsi/ide-scsi.c b/drivers/scsi/ide-scsi.c
index 50d0cec54777..3553da0e1cd5 100644
--- a/drivers/scsi/ide-scsi.c
+++ b/drivers/scsi/ide-scsi.c
@@ -331,9 +331,9 @@ static int idescsi_check_condition(ide_drive_t *drive, struct request *failed_co
         rq = kmalloc (sizeof (struct request), GFP_ATOMIC);
         buf = kmalloc(SCSI_SENSE_BUFFERSIZE, GFP_ATOMIC);
         if (pc == NULL || rq == NULL || buf == NULL) {
-                if (pc) kfree(pc);
-                if (rq) kfree(rq);
-                if (buf) kfree(buf);
+                kfree(buf);
+                kfree(rq);
+                kfree(pc);
                 return -ENOMEM;
         }
         memset (pc, 0, sizeof (idescsi_pc_t));
@@ -950,8 +950,8 @@ static int idescsi_queue (struct scsi_cmnd *cmd,
         spin_lock_irq(host->host_lock);
         return 0;
 abort:
-        if (pc) kfree (pc);
-        if (rq) kfree (rq);
+        kfree (pc);
+        kfree (rq);
         cmd->result = DID_ERROR << 16;
         done(cmd);
         return 0;
diff --git a/drivers/scsi/ips.c b/drivers/scsi/ips.c
index d0c51a2d40ba..cae3262a2957 100644
--- a/drivers/scsi/ips.c
+++ b/drivers/scsi/ips.c
@@ -4514,10 +4514,8 @@ ips_free(ips_ha_t * ha)
                         ha->enq = NULL;
                 }
 
-                if (ha->conf) {
-                        kfree(ha->conf);
-                        ha->conf = NULL;
-                }
+                kfree(ha->conf);
+                ha->conf = NULL;
 
                 if (ha->adapt) {
                         pci_free_consistent(ha->pcidev,
@@ -4535,15 +4533,11 @@ ips_free(ips_ha_t * ha)
                         ha->logical_drive_info = NULL;
                 }
 
-                if (ha->nvram) {
-                        kfree(ha->nvram);
-                        ha->nvram = NULL;
-                }
+                kfree(ha->nvram);
+                ha->nvram = NULL;
 
-                if (ha->subsys) {
-                        kfree(ha->subsys);
-                        ha->subsys = NULL;
-                }
+                kfree(ha->subsys);
+                ha->subsys = NULL;
 
                 if (ha->ioctl_data) {
                         pci_free_consistent(ha->pcidev, ha->ioctl_len,
diff --git a/drivers/scsi/lpfc/lpfc_els.c b/drivers/scsi/lpfc/lpfc_els.c
index 08a0c00cfc30..bcc29ec126dc 100644
--- a/drivers/scsi/lpfc/lpfc_els.c
+++ b/drivers/scsi/lpfc/lpfc_els.c
@@ -127,8 +127,7 @@ lpfc_prep_els_iocb(struct lpfc_hba * phba,
         if (((pcmd = kmalloc(sizeof (struct lpfc_dmabuf), GFP_KERNEL)) == 0) ||
             ((pcmd->virt = lpfc_mbuf_alloc(phba,
                                            MEM_PRI, &(pcmd->phys))) == 0)) {
-                if (pcmd)
-                        kfree(pcmd);
+                kfree(pcmd);
 
                 spin_lock_irq(phba->host->host_lock);
                 lpfc_sli_release_iocbq(phba, elsiocb);
@@ -145,8 +144,7 @@ lpfc_prep_els_iocb(struct lpfc_hba * phba,
                         prsp->virt = lpfc_mbuf_alloc(phba, MEM_PRI,
                                                      &prsp->phys);
                 if (prsp == 0 || prsp->virt == 0) {
-                        if (prsp)
-                                kfree(prsp);
+                        kfree(prsp);
                         lpfc_mbuf_free(phba, pcmd->virt, pcmd->phys);
                         kfree(pcmd);
                         spin_lock_irq(phba->host->host_lock);
@@ -172,8 +170,7 @@ lpfc_prep_els_iocb(struct lpfc_hba * phba,
                 lpfc_mbuf_free(phba, prsp->virt, prsp->phys);
                 kfree(pcmd);
                 kfree(prsp);
-                if (pbuflist)
-                        kfree(pbuflist);
+                kfree(pbuflist);
                 return NULL;
         }
 
diff --git a/drivers/scsi/lpfc/lpfc_init.c b/drivers/scsi/lpfc/lpfc_init.c
index 4e04470321a2..c90723860a04 100644
--- a/drivers/scsi/lpfc/lpfc_init.c
+++ b/drivers/scsi/lpfc/lpfc_init.c
@@ -894,8 +894,7 @@ lpfc_post_buffer(struct lpfc_hba * phba, struct lpfc_sli_ring * pring, int cnt,
                     mp1->virt = lpfc_mbuf_alloc(phba, MEM_PRI,
                                                 &mp1->phys);
                 if (mp1 == 0 || mp1->virt == 0) {
-                        if (mp1)
-                                kfree(mp1);
+                        kfree(mp1);
                         spin_lock_irq(phba->host->host_lock);
                         lpfc_sli_release_iocbq(phba, iocb);
                         spin_unlock_irq(phba->host->host_lock);
@@ -911,8 +910,7 @@ lpfc_post_buffer(struct lpfc_hba * phba, struct lpfc_sli_ring * pring, int cnt,
                                 mp2->virt = lpfc_mbuf_alloc(phba, MEM_PRI,
                                                             &mp2->phys);
                         if (mp2 == 0 || mp2->virt == 0) {
-                                if (mp2)
-                                        kfree(mp2);
+                                kfree(mp2);
                                 lpfc_mbuf_free(phba, mp1->virt, mp1->phys);
                                 kfree(mp1);
                                 spin_lock_irq(phba->host->host_lock);
diff --git a/drivers/scsi/lpfc/lpfc_mbox.c b/drivers/scsi/lpfc/lpfc_mbox.c
index 31c20cc00609..e3bc8d3f7302 100644
--- a/drivers/scsi/lpfc/lpfc_mbox.c
+++ b/drivers/scsi/lpfc/lpfc_mbox.c
@@ -248,8 +248,7 @@ lpfc_read_sparam(struct lpfc_hba * phba, LPFC_MBOXQ_t * pmb)
 
         if (((mp = kmalloc(sizeof (struct lpfc_dmabuf), GFP_KERNEL)) == 0) ||
             ((mp->virt = lpfc_mbuf_alloc(phba, 0, &(mp->phys))) == 0)) {
-                if (mp)
-                        kfree(mp);
+                kfree(mp);
                 mb->mbxCommand = MBX_READ_SPARM64;
                 /* READ_SPARAM: no buffers */
                 lpfc_printf_log(phba,
@@ -363,9 +362,7 @@ lpfc_reg_login(struct lpfc_hba * phba,
         /* Get a buffer to hold NPorts Service Parameters */
         if (((mp = kmalloc(sizeof (struct lpfc_dmabuf), GFP_KERNEL)) == NULL) ||
             ((mp->virt = lpfc_mbuf_alloc(phba, 0, &(mp->phys))) == 0)) {
-                if (mp)
-                        kfree(mp);
-
+                kfree(mp);
                 mb->mbxCommand = MBX_REG_LOGIN64;
                 /* REG_LOGIN: no buffers */
                 lpfc_printf_log(phba,
diff --git a/drivers/scsi/lpfc/lpfc_scsi.c b/drivers/scsi/lpfc/lpfc_scsi.c
index c34d3cf4f19c..c63275e66e2e 100644
--- a/drivers/scsi/lpfc/lpfc_scsi.c
+++ b/drivers/scsi/lpfc/lpfc_scsi.c
@@ -825,8 +825,7 @@ __lpfc_abort_handler(struct scsi_cmnd *cmnd)
         while (lpfc_cmd->pCmd == cmnd)
         {
                 spin_unlock_irq(phba->host->host_lock);
-                set_current_state(TASK_UNINTERRUPTIBLE);
-                schedule_timeout(LPFC_ABORT_WAIT*HZ);
+                        schedule_timeout_uninterruptible(LPFC_ABORT_WAIT*HZ);
                 spin_lock_irq(phba->host->host_lock);
                 if (++loop_count
                     > (2 * phba->cfg_nodev_tmo)/LPFC_ABORT_WAIT)
@@ -885,8 +884,7 @@ __lpfc_reset_lun_handler(struct scsi_cmnd *cmnd)
 
                 if (pnode->nlp_state != NLP_STE_MAPPED_NODE) {
                         spin_unlock_irq(phba->host->host_lock);
-                        set_current_state(TASK_UNINTERRUPTIBLE);
-                        schedule_timeout( HZ/2);
+                        schedule_timeout_uninterruptible(msecs_to_jiffies(500));
                         spin_lock_irq(phba->host->host_lock);
                 }
                 if ((pnode) && (pnode->nlp_state == NLP_STE_MAPPED_NODE))
@@ -939,8 +937,7 @@ __lpfc_reset_lun_handler(struct scsi_cmnd *cmnd)
                                        cmnd->device->id, cmnd->device->lun,
                                        LPFC_CTX_LUN))) {
                 spin_unlock_irq(phba->host->host_lock);
-                set_current_state(TASK_UNINTERRUPTIBLE);
-                schedule_timeout(LPFC_RESET_WAIT*HZ);
+                schedule_timeout_uninterruptible(LPFC_RESET_WAIT*HZ);
                 spin_lock_irq(phba->host->host_lock);
 
                 if (++loopcnt
@@ -1038,8 +1035,7 @@ __lpfc_reset_bus_handler(struct scsi_cmnd *cmnd)
                                 &phba->sli.ring[phba->sli.fcp_ring],
                                 0, 0, LPFC_CTX_HOST))) {
                 spin_unlock_irq(phba->host->host_lock);
-                set_current_state(TASK_UNINTERRUPTIBLE);
-                schedule_timeout(LPFC_RESET_WAIT*HZ);
+                schedule_timeout_uninterruptible(LPFC_RESET_WAIT*HZ);
                 spin_lock_irq(phba->host->host_lock);
 
                 if (++loopcnt
diff --git a/drivers/scsi/lpfc/lpfc_sli.c b/drivers/scsi/lpfc/lpfc_sli.c
index 508710001ed6..e2c08c5d83fb 100644
--- a/drivers/scsi/lpfc/lpfc_sli.c
+++ b/drivers/scsi/lpfc/lpfc_sli.c
@@ -2269,11 +2269,8 @@ lpfc_sli_hba_down(struct lpfc_hba * phba)
 
                 INIT_LIST_HEAD(&(pring->txq));
 
-                if (pring->fast_lookup) {
-                        kfree(pring->fast_lookup);
-                        pring->fast_lookup = NULL;
-                }
-
+                kfree(pring->fast_lookup);
+                pring->fast_lookup = NULL;
         }
 
         spin_unlock_irqrestore(phba->host->host_lock, flags);
diff --git a/drivers/scsi/megaraid/megaraid_mbox.c b/drivers/scsi/megaraid/megaraid_mbox.c
index 670c7a44ab67..4b5d420d2f4d 100644
--- a/drivers/scsi/megaraid/megaraid_mbox.c
+++ b/drivers/scsi/megaraid/megaraid_mbox.c
@@ -3890,9 +3890,8 @@ megaraid_sysfs_free_resources(adapter_t *adapter)
 {
         mraid_device_t  *raid_dev = ADAP2RAIDDEV(adapter);
 
-        if (raid_dev->sysfs_uioc) kfree(raid_dev->sysfs_uioc);
-
-        if (raid_dev->sysfs_mbox64) kfree(raid_dev->sysfs_mbox64);
+        kfree(raid_dev->sysfs_uioc);
+        kfree(raid_dev->sysfs_mbox64);
 
         if (raid_dev->sysfs_buffer) {
                 pci_free_consistent(adapter->pdev, PAGE_SIZE,
diff --git a/drivers/scsi/megaraid/megaraid_mm.c b/drivers/scsi/megaraid/megaraid_mm.c
index 37d110e864c4..8f3ce0432295 100644
--- a/drivers/scsi/megaraid/megaraid_mm.c
+++ b/drivers/scsi/megaraid/megaraid_mm.c
@@ -995,17 +995,13 @@ pthru_dma_pool_error:
 
 memalloc_error:
 
-        if (adapter->kioc_list)
-                kfree(adapter->kioc_list);
-
-        if (adapter->mbox_list)
-                kfree(adapter->mbox_list);
+        kfree(adapter->kioc_list);
+        kfree(adapter->mbox_list);
 
         if (adapter->pthru_dma_pool)
                 pci_pool_destroy(adapter->pthru_dma_pool);
 
-        if (adapter)
-                kfree(adapter);
+        kfree(adapter);
 
         return rval;
 }
@@ -1157,7 +1153,6 @@ mraid_mm_free_adp_resources(mraid_mmadp_t *adp)
         }
 
         kfree(adp->kioc_list);
-
         kfree(adp->mbox_list);
 
         pci_pool_destroy(adp->pthru_dma_pool);
diff --git a/drivers/scsi/osst.c b/drivers/scsi/osst.c
index 1cf11c3322fb..d9946bd95492 100644
--- a/drivers/scsi/osst.c
+++ b/drivers/scsi/osst.c
@@ -862,8 +862,7 @@ static int osst_recover_wait_frame(struct osst_tape * STp, struct scsi_request *
                                 retval = osst_write_error_recovery(STp, aSRpnt, 0);
                                 break;
                         }
-                        set_current_state(TASK_INTERRUPTIBLE);
-                        schedule_timeout (HZ / OSST_POLL_PER_SEC);
+                        schedule_timeout_interruptible(HZ / OSST_POLL_PER_SEC);
 
                         STp->buffer->b_data = mybuf; STp->buffer->buffer_size = 24;
                         memset(cmd, 0, MAX_COMMAND_SIZE);
@@ -1558,8 +1557,7 @@ static int osst_reposition_and_retry(struct osst_tape * STp, struct scsi_request
                         osst_set_frame_position(STp, aSRpnt, frame + skip, 1);
                         flag = 0;
                         attempts--;
-                        set_current_state(TASK_INTERRUPTIBLE);
-                        schedule_timeout(HZ / 10);
+                        schedule_timeout_interruptible(msecs_to_jiffies(100));
                 }
                 if (osst_get_frame_position(STp, aSRpnt) < 0) {         /* additional write error */
 #if DEBUG
@@ -1620,8 +1618,7 @@ static int osst_reposition_and_retry(struct osst_tape * STp, struct scsi_request
                         debugging = 0;
                 }
 #endif
-                set_current_state(TASK_INTERRUPTIBLE);
-                schedule_timeout(HZ / 10);
+                schedule_timeout_interruptible(msecs_to_jiffies(100));
         }
         printk(KERN_ERR "%s:E: Failed to find valid tape media\n", name);
 #if DEBUG
diff --git a/drivers/scsi/qla2xxx/qla_init.c b/drivers/scsi/qla2xxx/qla_init.c
index 290a6b92616c..72d9090df3df 100644
--- a/drivers/scsi/qla2xxx/qla_init.c
+++ b/drivers/scsi/qla2xxx/qla_init.c
@@ -1977,8 +1977,7 @@ qla2x00_configure_local_loop(scsi_qla_host_t *ha)
         }
 
 cleanup_allocation:
-        if (new_fcport)
-                kfree(new_fcport);
+        kfree(new_fcport);
 
         if (rval != QLA_SUCCESS) {
                 DEBUG2(printk("scsi(%ld): Configure local loop error exit: "
@@ -2348,8 +2347,7 @@ qla2x00_find_all_fabric_devs(scsi_qla_host_t *ha, struct list_head *new_fcports)
         /* Allocate temporary fcport for any new fcports discovered. */
         new_fcport = qla2x00_alloc_fcport(ha, GFP_KERNEL);
         if (new_fcport == NULL) {
-                if (swl)
-                        kfree(swl);
+                kfree(swl);
                 return (QLA_MEMORY_ALLOC_FAILED);
         }
         new_fcport->flags |= (FCF_FABRIC_DEVICE | FCF_LOGIN_NEEDED);
@@ -2485,19 +2483,15 @@ qla2x00_find_all_fabric_devs(scsi_qla_host_t *ha, struct list_head *new_fcports)
                 nxt_d_id.b24 = new_fcport->d_id.b24;
                 new_fcport = qla2x00_alloc_fcport(ha, GFP_KERNEL);
                 if (new_fcport == NULL) {
-                        if (swl)
-                                kfree(swl);
+                        kfree(swl);
                         return (QLA_MEMORY_ALLOC_FAILED);
                 }
                 new_fcport->flags |= (FCF_FABRIC_DEVICE | FCF_LOGIN_NEEDED);
                 new_fcport->d_id.b24 = nxt_d_id.b24;
         }
 
-        if (swl)
-                kfree(swl);
-
-        if (new_fcport)
-                kfree(new_fcport);
+        kfree(swl);
+        kfree(new_fcport);
 
         if (!list_empty(new_fcports))
                 ha->device_flags |= DFLG_FABRIC_DEVICES;
diff --git a/drivers/scsi/raid_class.c b/drivers/scsi/raid_class.c
index a9f99c68556f..5b1c12041a4f 100644
--- a/drivers/scsi/raid_class.c
+++ b/drivers/scsi/raid_class.c
@@ -12,6 +12,8 @@
 #include <linux/init.h>
 #include <linux/module.h>
 #include <linux/list.h>
+#include <linux/slab.h>
+#include <linux/string.h>
 #include <linux/raid_class.h>
 #include <scsi/scsi_device.h>
 #include <scsi/scsi_host.h>
diff --git a/drivers/scsi/scsi_transport_sas.c b/drivers/scsi/scsi_transport_sas.c
index 0cc766a9aa65..edabbd05d258 100644
--- a/drivers/scsi/scsi_transport_sas.c
+++ b/drivers/scsi/scsi_transport_sas.c
@@ -26,6 +26,8 @@
 #include <linux/init.h>
 #include <linux/module.h>
 #include <linux/err.h>
+#include <linux/slab.h>
+#include <linux/string.h>
 
 #include <scsi/scsi_device.h>
 #include <scsi/scsi_host.h>
diff --git a/drivers/scsi/sg.c b/drivers/scsi/sg.c
index 4f30a37db63c..62e3f340cc52 100644
--- a/drivers/scsi/sg.c
+++ b/drivers/scsi/sg.c
@@ -476,8 +476,7 @@ sg_read(struct file *filp, char __user *buf, size_t count, loff_t * ppos)
         sg_finish_rem_req(srp);
         retval = count;
 free_old_hdr:
-        if (old_hdr)
-                kfree(old_hdr);
+        kfree(old_hdr);
         return retval;
 }
 
@@ -1703,10 +1702,8 @@ exit_sg(void)
         sg_sysfs_valid = 0;
         unregister_chrdev_region(MKDEV(SCSI_GENERIC_MAJOR, 0),
                                  SG_MAX_DEVS);
-        if (sg_dev_arr != NULL) {
-                kfree((char *) sg_dev_arr);
-                sg_dev_arr = NULL;
-        }
+        kfree((char *)sg_dev_arr);
+        sg_dev_arr = NULL;
         sg_dev_max = 0;
 }
 
diff --git a/drivers/scsi/st.c b/drivers/scsi/st.c
index 6b85f84c8397..770c4324f3d5 100644
--- a/drivers/scsi/st.c
+++ b/drivers/scsi/st.c
@@ -4107,8 +4107,7 @@ out_free_tape:
         write_unlock(&st_dev_arr_lock);
 out_put_disk:
         put_disk(disk);
-        if (tpnt)
-                kfree(tpnt);
+        kfree(tpnt);
 out_buffer_free:
         kfree(buffer);
 out:
diff --git a/drivers/scsi/sym53c8xx_2/sym_hipd.c b/drivers/scsi/sym53c8xx_2/sym_hipd.c
index a1a58e1d5ad3..a7420cad4547 100644
--- a/drivers/scsi/sym53c8xx_2/sym_hipd.c
+++ b/drivers/scsi/sym53c8xx_2/sym_hipd.c
@@ -39,6 +39,7 @@
  */
 
 #include <linux/slab.h>
+#include <asm/param.h>          /* for timeouts in units of HZ */
 
 #include "sym_glue.h"
 #include "sym_nvram.h"
diff --git a/drivers/scsi/u14-34f.c b/drivers/scsi/u14-34f.c
index cfab8f197084..1ce29ba683eb 100644
--- a/drivers/scsi/u14-34f.c
+++ b/drivers/scsi/u14-34f.c
@@ -1953,11 +1953,11 @@ static int u14_34f_release(struct Scsi_Host *shpnt) {
 
    for (j = 0; sh[j] != NULL && sh[j] != shpnt; j++);
 
-   if (sh[j] == NULL) panic("%s: release, invalid Scsi_Host pointer.\n",
-                            driver_name);
+   if (sh[j] == NULL)
+      panic("%s: release, invalid Scsi_Host pointer.\n", driver_name);
 
    for (i = 0; i < sh[j]->can_queue; i++)
-      if ((&HD(j)->cp[i])->sglist) kfree((&HD(j)->cp[i])->sglist);
+      kfree((&HD(j)->cp[i])->sglist);
 
    for (i = 0; i < sh[j]->can_queue; i++)
       pci_unmap_single(HD(j)->pdev, HD(j)->cp[i].cp_dma_addr,
@@ -1965,7 +1965,8 @@ static int u14_34f_release(struct Scsi_Host *shpnt) {
 
    free_irq(sh[j]->irq, &sha[j]);
 
-   if (sh[j]->dma_channel != NO_DMA) free_dma(sh[j]->dma_channel);
+   if (sh[j]->dma_channel != NO_DMA)
+      free_dma(sh[j]->dma_channel);
 
    release_region(sh[j]->io_port, sh[j]->n_io_port);
    scsi_unregister(sh[j]);
diff --git a/drivers/serial/8250.c b/drivers/serial/8250.c
index f47d2c454e33..98820603e75f 100644
--- a/drivers/serial/8250.c
+++ b/drivers/serial/8250.c
@@ -40,6 +40,7 @@
 #include <linux/serial_core.h>
 #include <linux/serial.h>
 #include <linux/serial_8250.h>
+#include <linux/nmi.h>
 
 #include <asm/io.h>
 #include <asm/irq.h>
@@ -251,9 +252,53 @@ static const struct serial8250_config uart_config[] = {
         },
 };
 
+#ifdef CONFIG_SERIAL_8250_AU1X00
+
+/* Au1x00 UART hardware has a weird register layout */
+static const u8 au_io_in_map[] = {
+        [UART_RX]  = 0,
+        [UART_IER] = 2,
+        [UART_IIR] = 3,
+        [UART_LCR] = 5,
+        [UART_MCR] = 6,
+        [UART_LSR] = 7,
+        [UART_MSR] = 8,
+};
+
+static const u8 au_io_out_map[] = {
+        [UART_TX]  = 1,
+        [UART_IER] = 2,
+        [UART_FCR] = 4,
+        [UART_LCR] = 5,
+        [UART_MCR] = 6,
+};
+
+/* sane hardware needs no mapping */
+static inline int map_8250_in_reg(struct uart_8250_port *up, int offset)
+{
+        if (up->port.iotype != UPIO_AU)
+                return offset;
+        return au_io_in_map[offset];
+}
+
+static inline int map_8250_out_reg(struct uart_8250_port *up, int offset)
+{
+        if (up->port.iotype != UPIO_AU)
+                return offset;
+        return au_io_out_map[offset];
+}
+
+#else
+
+/* sane hardware needs no mapping */
+#define map_8250_in_reg(up, offset) (offset)
+#define map_8250_out_reg(up, offset) (offset)
+
+#endif
+
 static _INLINE_ unsigned int serial_in(struct uart_8250_port *up, int offset)
 {
-        offset <<= up->port.regshift;
+        offset = map_8250_in_reg(up, offset) << up->port.regshift;
 
         switch (up->port.iotype) {
         case UPIO_HUB6:
@@ -266,6 +311,11 @@ static _INLINE_ unsigned int serial_in(struct uart_8250_port *up, int offset)
         case UPIO_MEM32:
                 return readl(up->port.membase + offset);
 
+#ifdef CONFIG_SERIAL_8250_AU1X00
+        case UPIO_AU:
+                return __raw_readl(up->port.membase + offset);
+#endif
+
         default:
                 return inb(up->port.iobase + offset);
         }
@@ -274,7 +324,7 @@ static _INLINE_ unsigned int serial_in(struct uart_8250_port *up, int offset)
 static _INLINE_ void
 serial_out(struct uart_8250_port *up, int offset, int value)
 {
-        offset <<= up->port.regshift;
+        offset = map_8250_out_reg(up, offset) << up->port.regshift;
 
         switch (up->port.iotype) {
         case UPIO_HUB6:
@@ -290,6 +340,12 @@ serial_out(struct uart_8250_port *up, int offset, int value)
                 writel(value, up->port.membase + offset);
                 break;
 
+#ifdef CONFIG_SERIAL_8250_AU1X00
+        case UPIO_AU:
+                __raw_writel(value, up->port.membase + offset);
+                break;
+#endif
+
         default:
                 outb(value, up->port.iobase + offset);
         }
@@ -910,6 +966,13 @@ static void autoconfig(struct uart_8250_port *up, unsigned int probeflags)
                 }
         }
 #endif
+
+#ifdef CONFIG_SERIAL_8250_AU1X00
+        /* if access method is AU, it is a 16550 with a quirk */
+        if (up->port.type == PORT_16550A && up->port.iotype == UPIO_AU)
+                up->bugs |= UART_BUG_NOMSR;
+#endif
+
         serial_outp(up, UART_LCR, save_lcr);
 
         if (up->capabilities != uart_config[up->port.type].flags) {
@@ -1057,6 +1120,10 @@ static void serial8250_enable_ms(struct uart_port *port)
 {
         struct uart_8250_port *up = (struct uart_8250_port *)port;
 
+        /* no MSR capabilities */
+        if (up->bugs & UART_BUG_NOMSR)
+                return;
+
         up->ier |= UART_IER_MSI;
         serial_out(up, UART_IER, up->ier);
 }
@@ -1774,7 +1841,8 @@ serial8250_set_termios(struct uart_port *port, struct termios *termios,
          * CTS flow control flag and modem status interrupts
          */
         up->ier &= ~UART_IER_MSI;
-        if (UART_ENABLE_MS(&up->port, termios->c_cflag))
+        if (!(up->bugs & UART_BUG_NOMSR) &&
+                        UART_ENABLE_MS(&up->port, termios->c_cflag))
                 up->ier |= UART_IER_MSI;
         if (up->capabilities & UART_CAP_UUE)
                 up->ier |= UART_IER_UUE | UART_IER_RTOIE;
@@ -2141,6 +2209,8 @@ serial8250_console_write(struct console *co, const char *s, unsigned int count)
         unsigned int ier;
         int i;
 
+        touch_nmi_watchdog();
+
         /*
          *      First save the UER then disable the interrupts
          */
diff --git a/drivers/serial/8250.h b/drivers/serial/8250.h
index b1b459efda52..a607b98016db 100644
--- a/drivers/serial/8250.h
+++ b/drivers/serial/8250.h
@@ -49,6 +49,7 @@ struct serial8250_config {
 
 #define UART_BUG_QUOT   (1 << 0)        /* UART has buggy quot LSB */
 #define UART_BUG_TXEN   (1 << 1)        /* UART has buggy TX IIR status */
+#define UART_BUG_NOMSR  (1 << 2)        /* UART has buggy MSR status bits (Au1x00) */
 
 #if defined(__i386__) && (defined(CONFIG_M386) || defined(CONFIG_M486))
 #define _INLINE_ inline
diff --git a/drivers/serial/8250_au1x00.c b/drivers/serial/8250_au1x00.c
new file mode 100644
index 000000000000..06ae8fbcc947
--- /dev/null
+++ b/drivers/serial/8250_au1x00.c
@@ -0,0 +1,102 @@
+/*
+ * Serial Device Initialisation for Au1x00
+ *
+ * (C) Copyright Embedded Alley Solutions, Inc 2005
+ * Author: Pantelis Antoniou <pantelis@embeddedalley.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ */
+
+#include <linux/errno.h>
+#include <linux/init.h>
+#include <linux/interrupt.h>
+#include <linux/ioport.h>
+#include <linux/module.h>
+#include <linux/serial_core.h>
+#include <linux/signal.h>
+#include <linux/slab.h>
+#include <linux/types.h>
+
+#include <linux/serial_8250.h>
+
+#include <asm/mach-au1x00/au1000.h>
+
+#include "8250.h"
+
+#define PORT(_base, _irq)                               \
+        {                                               \
+                .iobase         = _base,                \
+                .membase        = (void __iomem *)_base,\
+                .mapbase        = _base,                \
+                .irq            = _irq,                 \
+                .uartclk        = 0,    /* filled */    \
+                .regshift       = 2,                    \
+                .iotype         = UPIO_AU,              \
+                .flags          = UPF_SKIP_TEST |       \
+                                  UPF_IOREMAP,          \
+        }
+
+static struct plat_serial8250_port au1x00_data[] = {
+#if defined(CONFIG_SOC_AU1000)
+        PORT(UART0_ADDR, AU1000_UART0_INT),
+        PORT(UART1_ADDR, AU1000_UART1_INT),
+        PORT(UART2_ADDR, AU1000_UART2_INT),
+        PORT(UART3_ADDR, AU1000_UART3_INT),
+#elif defined(CONFIG_SOC_AU1500)
+        PORT(UART0_ADDR, AU1500_UART0_INT),
+        PORT(UART3_ADDR, AU1500_UART3_INT),
+#elif defined(CONFIG_SOC_AU1100)
+        PORT(UART0_ADDR, AU1100_UART0_INT),
+        PORT(UART1_ADDR, AU1100_UART1_INT),
+        PORT(UART2_ADDR, AU1100_UART2_INT),
+        PORT(UART3_ADDR, AU1100_UART3_INT),
+#elif defined(CONFIG_SOC_AU1550)
+        PORT(UART0_ADDR, AU1550_UART0_INT),
+        PORT(UART1_ADDR, AU1550_UART1_INT),
+        PORT(UART2_ADDR, AU1550_UART2_INT),
+        PORT(UART3_ADDR, AU1550_UART3_INT),
+#elif defined(CONFIG_SOC_AU1200)
+        PORT(UART0_ADDR, AU1200_UART0_INT),
+        PORT(UART1_ADDR, AU1200_UART1_INT),
+#endif
+        { },
+};
+
+static struct platform_device au1x00_device = {
+        .name                   = "serial8250",
+        .id                     = PLAT8250_DEV_AU1X00,
+        .dev                    = {
+                .platform_data  = au1x00_data,
+        },
+};
+
+static int __init au1x00_init(void)
+{
+        int i;
+        unsigned int uartclk;
+
+        /* get uart clock */
+        uartclk = get_au1x00_uart_baud_base() * 16;
+
+        /* fill up uartclk */
+        for (i = 0; au1x00_data[i].flags ; i++)
+                au1x00_data[i].uartclk = uartclk;
+
+        return platform_device_register(&au1x00_device);
+}
+
+/* XXX: Yes, I know this doesn't yet work. */
+static void __exit au1x00_exit(void)
+{
+        platform_device_unregister(&au1x00_device);
+}
+
+module_init(au1x00_init);
+module_exit(au1x00_exit);
+
+MODULE_AUTHOR("Pantelis Antoniou <pantelis@embeddedalley.com>");
+MODULE_DESCRIPTION("8250 serial probe module for Au1x000 cards");
+MODULE_LICENSE("GPL");
diff --git a/drivers/serial/Kconfig b/drivers/serial/Kconfig
index b745a1b9e835..ff36f0c9fdad 100644
--- a/drivers/serial/Kconfig
+++ b/drivers/serial/Kconfig
@@ -207,6 +207,14 @@ config SERIAL_8250_ACORN
           system, say Y to this option.  The driver can handle 1, 2, or 3 port
           cards.  If unsure, say N.
 
+config SERIAL_8250_AU1X00
+        bool "AU1X00 serial port support"
+        depends on SERIAL_8250 != n && SOC_AU1X00
+        help
+          If you have an Au1x00 board and want to use the serial port, say Y
+          to this option.  The driver can handle 1 or 2 serial ports.
+          If unsure, say N.
+
 comment "Non-8250 serial port support"
 
 config SERIAL_AMBA_PL010
diff --git a/drivers/serial/Makefile b/drivers/serial/Makefile
index 11c7dc483f93..d7c7c7180e33 100644
--- a/drivers/serial/Makefile
+++ b/drivers/serial/Makefile
@@ -22,6 +22,7 @@ obj-$(CONFIG_SERIAL_8250_ACCENT) += 8250_accent.o
 obj-$(CONFIG_SERIAL_8250_BOCA) += 8250_boca.o
 obj-$(CONFIG_SERIAL_8250_HUB6) += 8250_hub6.o
 obj-$(CONFIG_SERIAL_8250_MCA) += 8250_mca.o
+obj-$(CONFIG_SERIAL_8250_AU1X00) += 8250_au1x00.o
 obj-$(CONFIG_SERIAL_AMBA_PL010) += amba-pl010.o
 obj-$(CONFIG_SERIAL_AMBA_PL011) += amba-pl011.o
 obj-$(CONFIG_SERIAL_CLPS711X) += clps711x.o
diff --git a/drivers/serial/crisv10.c b/drivers/serial/crisv10.c
index 40d3e7139cfe..08c42c000188 100644
--- a/drivers/serial/crisv10.c
+++ b/drivers/serial/crisv10.c
@@ -4416,10 +4416,8 @@ rs_close(struct tty_struct *tty, struct file * filp)
         info->event = 0;
         info->tty = 0;
         if (info->blocked_open) {
-                if (info->close_delay) {
-                        set_current_state(TASK_INTERRUPTIBLE);
-                        schedule_timeout(info->close_delay);
-                }
+                if (info->close_delay)
+                        schedule_timeout_interruptible(info->close_delay);
                 wake_up_interruptible(&info->open_wait);
         }
         info->flags &= ~(ASYNC_NORMAL_ACTIVE|ASYNC_CLOSING);
@@ -4469,8 +4467,7 @@ static void rs_wait_until_sent(struct tty_struct *tty, int timeout)
         while (info->xmit.head != info->xmit.tail || /* More in send queue */
                (*info->ostatusadr & 0x007f) ||  /* more in FIFO */
                (elapsed_usec < 2*info->char_time_usec)) {
-                set_current_state(TASK_INTERRUPTIBLE);
-                schedule_timeout(1);
+                schedule_timeout_interruptible(1);
                 if (signal_pending(current))
                         break;
                 if (timeout && time_after(jiffies, orig_jiffies + timeout))
diff --git a/drivers/serial/mcfserial.c b/drivers/serial/mcfserial.c
index e2ebdcad553c..47f7404cb045 100644
--- a/drivers/serial/mcfserial.c
+++ b/drivers/serial/mcfserial.c
@@ -57,7 +57,8 @@ struct timer_list mcfrs_timer_struct;
  *      keep going.  Perhaps one day the cflag settings for the
  *      console can be used instead.
  */
-#if defined(CONFIG_ARNEWSH) || defined(CONFIG_MOTOROLA) || defined(CONFIG_senTec) || defined(CONFIG_SNEHA)
+#if defined(CONFIG_ARNEWSH) || defined(CONFIG_FREESCALE) || \
+    defined(CONFIG_senTec) || defined(CONFIG_SNEHA)
 #define CONSOLE_BAUD_RATE       19200
 #define DEFAULT_CBAUD           B19200
 #endif
@@ -67,7 +68,7 @@ struct timer_list mcfrs_timer_struct;
 #define DEFAULT_CBAUD           B38400
 #endif
 
-#if defined(CONFIG_MOD5272)
+#if defined(CONFIG_MOD5272) || defined(CONFIG_M5208EVB)
 #define CONSOLE_BAUD_RATE       115200
 #define DEFAULT_CBAUD           B115200
 #endif
@@ -95,7 +96,8 @@ static struct tty_driver *mcfrs_serial_driver;
 #undef SERIAL_DEBUG_OPEN
 #undef SERIAL_DEBUG_FLOW
 
-#if defined(CONFIG_M523x) || defined(CONFIG_M527x) || defined(CONFIG_M528x)
+#if defined(CONFIG_M523x) || defined(CONFIG_M527x) || defined(CONFIG_M528x) || \
+    defined(CONFIG_M520x)
 #define IRQBASE (MCFINT_VECBASE+MCFINT_UART0)
 #else
 #define IRQBASE 73
@@ -1528,6 +1530,35 @@ static void mcfrs_irqinit(struct mcf_serial *info)
         imrp = (volatile unsigned long *) (MCF_MBAR + MCFICM_INTC0 +
                 MCFINTC_IMRL);
         *imrp &= ~((1 << (info->irq - MCFINT_VECBASE)) | 1);
+#elif defined(CONFIG_M520x)
+        volatile unsigned char *icrp, *uartp;
+        volatile unsigned long *imrp;
+
+        uartp = info->addr;
+
+        icrp = (volatile unsigned char *) (MCF_MBAR + MCFICM_INTC0 +
+                MCFINTC_ICR0 + MCFINT_UART0 + info->line);
+        *icrp = 0x03;
+
+        imrp = (volatile unsigned long *) (MCF_MBAR + MCFICM_INTC0 +
+                MCFINTC_IMRL);
+        *imrp &= ~((1 << (info->irq - MCFINT_VECBASE)) | 1);
+        if (info->line < 2) {
+                unsigned short *uart_par;
+                uart_par = (unsigned short *)(MCF_IPSBAR + MCF_GPIO_PAR_UART);
+                if (info->line == 0)
+                        *uart_par |=  MCF_GPIO_PAR_UART_PAR_UTXD0
+                                  | MCF_GPIO_PAR_UART_PAR_URXD0;
+                else if (info->line == 1)
+                        *uart_par |=  MCF_GPIO_PAR_UART_PAR_UTXD1
+                                  | MCF_GPIO_PAR_UART_PAR_URXD1;
+                } else if (info->line == 2) {
+                        unsigned char *feci2c_par;
+                        feci2c_par = (unsigned char *)(MCF_IPSBAR +  MCF_GPIO_PAR_FECI2C);
+                        *feci2c_par &= ~0x0F;
+                        *feci2c_par |=  MCF_GPIO_PAR_FECI2C_PAR_SCL_UTXD2
+                                    | MCF_GPIO_PAR_FECI2C_PAR_SDA_URXD2;
+                }
 #else
         volatile unsigned char  *icrp, *uartp;
 
diff --git a/drivers/serial/serial_core.c b/drivers/serial/serial_core.c
index 0745ce782974..427a23858076 100644
--- a/drivers/serial/serial_core.c
+++ b/drivers/serial/serial_core.c
@@ -1959,6 +1959,7 @@ uart_report_port(struct uart_driver *drv, struct uart_port *port)
                 break;
         case UPIO_MEM:
         case UPIO_MEM32:
+        case UPIO_AU:
                 snprintf(address, sizeof(address),
                          "MMIO 0x%lx", port->mapbase);
                 break;
diff --git a/drivers/serial/sunsu.c b/drivers/serial/sunsu.c
index 656c0e8d160e..f0738533f39a 100644
--- a/drivers/serial/sunsu.c
+++ b/drivers/serial/sunsu.c
@@ -1441,7 +1441,7 @@ static void sunsu_console_write(struct console *co, const char *s,
  *      - initialize the serial port
  *      Return non-zero if we didn't find a serial port.
  */
-static int __init sunsu_console_setup(struct console *co, char *options)
+static int sunsu_console_setup(struct console *co, char *options)
 {
         struct uart_port *port;
         int baud = 9600;
diff --git a/drivers/sh/superhyway/superhyway-sysfs.c b/drivers/sh/superhyway/superhyway-sysfs.c
index dc119ce68e3e..55434330867b 100644
--- a/drivers/sh/superhyway/superhyway-sysfs.c
+++ b/drivers/sh/superhyway/superhyway-sysfs.c
@@ -30,7 +30,7 @@ superhyway_ro_attr(bot_mb, "0x%02x\n", vcr.bot_mb);
 superhyway_ro_attr(top_mb, "0x%02x\n", vcr.top_mb);
 
 /* Misc */
-superhyway_ro_attr(resource, "0x%08lx\n", resource.start);
+superhyway_ro_attr(resource, "0x%08lx\n", resource[0].start);
 
 struct device_attribute superhyway_dev_attrs[] = {
         __ATTR_RO(perr_flags),
diff --git a/drivers/sh/superhyway/superhyway.c b/drivers/sh/superhyway/superhyway.c
index 28757cb9d246..7bdab2a7f59c 100644
--- a/drivers/sh/superhyway/superhyway.c
+++ b/drivers/sh/superhyway/superhyway.c
@@ -27,19 +27,20 @@ static struct device superhyway_bus_device = {
 
 static void superhyway_device_release(struct device *dev)
 {
-        kfree(to_superhyway_device(dev));
+        struct superhyway_device *sdev = to_superhyway_device(dev);
+
+        kfree(sdev->resource);
+        kfree(sdev);
 }
 
 /**
  * superhyway_add_device - Add a SuperHyway module
- * @mod_id: Module ID (taken from MODULE.VCR.MOD_ID).
  * @base: Physical address where module is mapped.
- * @vcr: VCR value.
+ * @sdev: SuperHyway device to add, or NULL to allocate a new one.
+ * @bus: Bus where SuperHyway module resides.
  *
  * This is responsible for adding a new SuperHyway module. This sets up a new
- * struct superhyway_device for the module being added. Each one of @mod_id,
- * @base, and @vcr are registered with the new device for further use
- * elsewhere.
+ * struct superhyway_device for the module being added if @sdev == NULL.
  *
  * Devices are initially added in the order that they are scanned (from the
  * top-down of the memory map), and are assigned an ID based on the order that
@@ -49,28 +50,40 @@ static void superhyway_device_release(struct device *dev)
  * Further work can and should be done in superhyway_scan_bus(), to be sure
  * that any new modules are properly discovered and subsequently registered.
  */
-int superhyway_add_device(unsigned int mod_id, unsigned long base,
-                          unsigned long long vcr)
+int superhyway_add_device(unsigned long base, struct superhyway_device *sdev,
+                          struct superhyway_bus *bus)
 {
-        struct superhyway_device *dev;
+        struct superhyway_device *dev = sdev;
+
+        if (!dev) {
+                dev = kmalloc(sizeof(struct superhyway_device), GFP_KERNEL);
+                if (!dev)
+                        return -ENOMEM;
 
-        dev = kmalloc(sizeof(struct superhyway_device), GFP_KERNEL);
-        if (!dev)
-                return -ENOMEM;
+                memset(dev, 0, sizeof(struct superhyway_device));
+        }
 
-        memset(dev, 0, sizeof(struct superhyway_device));
+        dev->bus = bus;
+        superhyway_read_vcr(dev, base, &dev->vcr);
 
-        dev->id.id = mod_id;
-        sprintf(dev->name, "SuperHyway device %04x", dev->id.id);
+        if (!dev->resource) {
+                dev->resource = kmalloc(sizeof(struct resource), GFP_KERNEL);
+                if (!dev->resource) {
+                        kfree(dev);
+                        return -ENOMEM;
+                }
+
+                dev->resource->name     = dev->name;
+                dev->resource->start    = base;
+                dev->resource->end      = dev->resource->start + 0x01000000;
+        }
 
-        dev->vcr                = *((struct vcr_info *)(&vcr));
-        dev->resource.name      = dev->name;
-        dev->resource.start     = base;
-        dev->resource.end       = dev->resource.start + 0x01000000;
         dev->dev.parent         = &superhyway_bus_device;
         dev->dev.bus            = &superhyway_bus_type;
         dev->dev.release        = superhyway_device_release;
+        dev->id.id              = dev->vcr.mod_id;
 
+        sprintf(dev->name, "SuperHyway device %04x", dev->id.id);
         sprintf(dev->dev.bus_id, "%02x", superhyway_devices);
 
         superhyway_devices++;
@@ -78,10 +91,31 @@ int superhyway_add_device(unsigned int mod_id, unsigned long base,
         return device_register(&dev->dev);
 }
 
+int superhyway_add_devices(struct superhyway_bus *bus,
+                           struct superhyway_device **devices,
+                           int nr_devices)
+{
+        int i, ret = 0;
+
+        for (i = 0; i < nr_devices; i++) {
+                struct superhyway_device *dev = devices[i];
+                ret |= superhyway_add_device(dev->resource[0].start, dev, bus);
+        }
+
+        return ret;
+}
+
 static int __init superhyway_init(void)
 {
+        struct superhyway_bus *bus;
+        int ret = 0;
+
         device_register(&superhyway_bus_device);
-        return superhyway_scan_bus();
+
+        for (bus = superhyway_channels; bus->ops; bus++)
+                ret |= superhyway_scan_bus(bus);
+
+        return ret;
 }
 
 postcore_initcall(superhyway_init);
@@ -197,6 +231,7 @@ module_exit(superhyway_bus_exit);
 
 EXPORT_SYMBOL(superhyway_bus_type);
 EXPORT_SYMBOL(superhyway_add_device);
+EXPORT_SYMBOL(superhyway_add_devices);
 EXPORT_SYMBOL(superhyway_register_driver);
 EXPORT_SYMBOL(superhyway_unregister_driver);
 
diff --git a/drivers/tc/.gitignore b/drivers/tc/.gitignore
new file mode 100644
index 000000000000..acc0e1e6a650
--- /dev/null
+++ b/drivers/tc/.gitignore
@@ -0,0 +1 @@
+lk201-map.c
diff --git a/drivers/video/68328fb.c b/drivers/video/68328fb.c
index 6a3cfbdc6dc9..3b0ddc55236b 100644
--- a/drivers/video/68328fb.c
+++ b/drivers/video/68328fb.c
@@ -113,7 +113,6 @@ static struct fb_ops mc68x328fb_ops = {
         .fb_fillrect    = cfb_fillrect,
         .fb_copyarea    = cfb_copyarea,
         .fb_imageblit   = cfb_imageblit,
-        .fb_cursor      = soft_cursor,
         .fb_mmap        = mc68x328fb_mmap,
 };
 
diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig
index 7192b770bfb6..44b6ca290ce3 100644
--- a/drivers/video/Kconfig
+++ b/drivers/video/Kconfig
@@ -65,15 +65,6 @@ config FB_CFB_IMAGEBLIT
           blitting. This is used by drivers that don't provide their own
           (accelerated) version.
 
-config FB_SOFT_CURSOR
-        tristate
-        depends on FB
-        default n
-        ---help---
-          Include the soft_cursor function for generic software cursor support.
-          This is used by drivers that don't provide their own (accelerated)
-          version.
-
 config FB_MACMODES
        tristate
        depends on FB
@@ -114,7 +105,6 @@ config FB_CIRRUS
         select FB_CFB_FILLRECT
         select FB_CFB_COPYAREA
         select FB_CFB_IMAGEBLIT
-        select FB_SOFT_CURSOR
         ---help---
           This enables support for Cirrus Logic GD542x/543x based boards on
           Amiga: SD64, Piccolo, Picasso II/II+, Picasso IV, or EGS Spectrum.
@@ -133,7 +123,6 @@ config FB_PM2
         select FB_CFB_FILLRECT
         select FB_CFB_COPYAREA
         select FB_CFB_IMAGEBLIT
-        select FB_SOFT_CURSOR
         help
           This is the frame buffer device driver for the Permedia2 AGP frame
           buffer card from ASK, aka `Graphic Blaster Exxtreme'.  There is a
@@ -152,7 +141,6 @@ config FB_ARMCLCD
         select FB_CFB_FILLRECT
         select FB_CFB_COPYAREA
         select FB_CFB_IMAGEBLIT
-        select FB_SOFT_CURSOR
         help
           This framebuffer device driver is for the ARM PrimeCell PL110
           Colour LCD controller.  ARM PrimeCells provide the building
@@ -169,7 +157,6 @@ config FB_ACORN
         select FB_CFB_FILLRECT
         select FB_CFB_COPYAREA
         select FB_CFB_IMAGEBLIT
-        select FB_SOFT_CURSOR
         help
           This is the frame buffer device driver for the Acorn VIDC graphics
           hardware found in Acorn RISC PCs and other ARM-based machines.  If
@@ -181,7 +168,9 @@ config FB_CLPS711X
         select FB_CFB_FILLRECT
         select FB_CFB_COPYAREA
         select FB_CFB_IMAGEBLIT
-        select FB_SOFT_CURSOR
+        help
+          Say Y to enable the Framebuffer driver for the CLPS7111 and
+          EP7212 processors.
 
 config FB_SA1100
         bool "SA-1100 LCD support"
@@ -189,7 +178,6 @@ config FB_SA1100
         select FB_CFB_FILLRECT
         select FB_CFB_COPYAREA
         select FB_CFB_IMAGEBLIT
-        select FB_SOFT_CURSOR
         help
           This is a framebuffer device for the SA-1100 LCD Controller.
           See <http://www.linux-fbdev.org/> for information on framebuffer
@@ -204,7 +192,6 @@ config FB_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"
@@ -212,7 +199,6 @@ config FB_CYBER2000
         select FB_CFB_FILLRECT
         select FB_CFB_COPYAREA
         select FB_CFB_IMAGEBLIT
-        select FB_SOFT_CURSOR
         help
           This enables support for the Integraphics CyberPro 20x0 and 5000
           VGA chips used in the Rebel.com Netwinder and other machines.
@@ -225,7 +211,6 @@ config FB_APOLLO
         default y
         select FB_CFB_FILLRECT
         select FB_CFB_IMAGEBLIT
-        select FB_SOFT_CURSOR
 
 config FB_Q40
         bool
@@ -234,12 +219,10 @@ config FB_Q40
         select FB_CFB_FILLRECT
         select FB_CFB_COPYAREA
         select FB_CFB_IMAGEBLIT
-        select FB_SOFT_CURSOR
 
 config FB_AMIGA
         tristate "Amiga native chipset support"
         depends on FB && AMIGA
-        select FB_SOFT_CURSOR
         help
           This is the frame buffer device driver for the builtin graphics
           chipset found in Amigas.
@@ -279,7 +262,6 @@ config FB_CYBER
         select FB_CFB_FILLRECT
         select FB_CFB_COPYAREA
         select FB_CFB_IMAGEBLIT
-        select FB_SOFT_CURSOR
         help
           This enables support for the Cybervision 64 graphics card from
           Phase5. Please note that its use is not all that intuitive (i.e. if
@@ -294,7 +276,6 @@ config FB_VIRGE
         select FB_CFB_FILLRECT
         select FB_CFB_COPYAREA
         select FB_CFB_IMAGEBLIT
-        select FB_SOFT_CURSOR
         help
           This enables support for the Cybervision 64/3D graphics card from
           Phase5. Please note that its use is not all that intuitive (i.e. if
@@ -317,7 +298,6 @@ config FB_FM2
         select FB_CFB_FILLRECT
         select FB_CFB_COPYAREA
         select FB_CFB_IMAGEBLIT
-        select FB_SOFT_CURSOR
         help
           This is the frame buffer device driver for the Amiga FrameMaster
           card from BSC (exhibited 1992 but not shipped as a CBM product).
@@ -328,7 +308,6 @@ config FB_ARC
         select FB_CFB_FILLRECT
         select FB_CFB_COPYAREA
         select FB_CFB_IMAGEBLIT
-        select FB_SOFT_CURSOR
         help
           This enables support for the Arc Monochrome LCD board. The board
           is based on the KS-108 lcd controller and is typically a matrix
@@ -351,7 +330,6 @@ config FB_OF
         select FB_CFB_FILLRECT
         select FB_CFB_COPYAREA
         select FB_CFB_IMAGEBLIT
-        select FB_SOFT_CURSOR
         select FB_MACMODES
         help
           Say Y if you want support with Open Firmware for your graphics
@@ -363,7 +341,6 @@ config FB_CONTROL
         select FB_CFB_FILLRECT
         select FB_CFB_COPYAREA
         select FB_CFB_IMAGEBLIT
-        select FB_SOFT_CURSOR
         select FB_MACMODES
         help
           This driver supports a frame buffer for the graphics adapter in the
@@ -375,7 +352,6 @@ config FB_PLATINUM
         select FB_CFB_FILLRECT
         select FB_CFB_COPYAREA
         select FB_CFB_IMAGEBLIT
-        select FB_SOFT_CURSOR
         select FB_MACMODES
         help
           This driver supports a frame buffer for the "platinum" graphics
@@ -387,7 +363,6 @@ config FB_VALKYRIE
         select FB_CFB_FILLRECT
         select FB_CFB_COPYAREA
         select FB_CFB_IMAGEBLIT
-        select FB_SOFT_CURSOR
         select FB_MACMODES
         help
           This driver supports a frame buffer for the "valkyrie" graphics
@@ -399,42 +374,32 @@ config FB_CT65550
         select FB_CFB_FILLRECT
         select FB_CFB_COPYAREA
         select FB_CFB_IMAGEBLIT
-        select FB_SOFT_CURSOR
         help
           This is the frame buffer device driver for the Chips & Technologies
           65550 graphics chip in PowerBooks.
 
 config FB_ASILIANT
-        bool "Chips 69000 display support"
+        bool "Asiliant (Chips) 69000 display support"
         depends on (FB = y) && PCI
         select FB_CFB_FILLRECT
         select FB_CFB_COPYAREA
         select FB_CFB_IMAGEBLIT
-        select FB_SOFT_CURSOR
 
 config FB_IMSTT
         bool "IMS Twin Turbo display support"
         depends on (FB = y) && PCI
         select FB_CFB_IMAGEBLIT
-        select FB_SOFT_CURSOR
         select FB_MACMODES if PPC
         help
           The IMS Twin Turbo is a PCI-based frame buffer card bundled with
           many Macintosh and compatible computers.
 
-config FB_S3TRIO
-        bool "S3 Trio display support"
-        depends on (FB = y) && PPC && BROKEN
-        help
-          If you have a S3 Trio say Y. Say N for S3 Virge.
-
 config FB_VGA16
         tristate "VGA 16-color graphics support"
         depends on FB && (X86 || PPC)
         select FB_CFB_FILLRECT
         select FB_CFB_COPYAREA
         select FB_CFB_IMAGEBLIT
-        select FB_SOFT_CURSOR
         help
           This is the frame buffer device driver for VGA 16 color graphic
           cards. Say Y if you have such a card.
@@ -448,7 +413,6 @@ config FB_STI
         select FB_CFB_FILLRECT
         select FB_CFB_COPYAREA
         select FB_CFB_IMAGEBLIT
-        select FB_SOFT_CURSOR
         default y
         ---help---
           STI refers to the HP "Standard Text Interface" which is a set of
@@ -469,7 +433,6 @@ config FB_MAC
         select FB_CFB_FILLRECT
         select FB_CFB_COPYAREA
         select FB_CFB_IMAGEBLIT
-        select FB_SOFT_CURSOR
         select FB_MACMODES
 
 #      bool '  Apple DAFB display support' CONFIG_FB_DAFB
@@ -478,7 +441,6 @@ config FB_HP300
         depends on (FB = y) && HP300
         select FB_CFB_FILLRECT
         select FB_CFB_IMAGEBLIT
-        select FB_SOFT_CURSOR
         default y
 
 config FB_TGA
@@ -487,7 +449,6 @@ config FB_TGA
         select FB_CFB_FILLRECT
         select FB_CFB_COPYAREA
         select FB_CFB_IMAGEBLIT
-        select FB_SOFT_CURSOR
         help
           This is the frame buffer device driver for generic TGA graphic
           cards. Say Y if you have one of those.
@@ -498,7 +459,6 @@ config FB_VESA
         select FB_CFB_FILLRECT
         select FB_CFB_COPYAREA
         select FB_CFB_IMAGEBLIT
-        select FB_SOFT_CURSOR
         help
           This is the frame buffer device driver for generic VESA 2.0
           compliant graphic cards. The older VESA 1.2 cards are not supported.
@@ -516,7 +476,6 @@ config FB_HGA
         select FB_CFB_FILLRECT
         select FB_CFB_COPYAREA
         select FB_CFB_IMAGEBLIT
-        select FB_SOFT_CURSOR
         help
           Say Y here if you have a Hercules mono graphics card.
 
@@ -545,7 +504,6 @@ config FB_SGIVW
         select FB_CFB_FILLRECT
         select FB_CFB_COPYAREA
         select FB_CFB_IMAGEBLIT
-        select FB_SOFT_CURSOR
         help
           SGI Visual Workstation support for framebuffer graphics.
 
@@ -555,7 +513,6 @@ config FB_GBE
         select FB_CFB_FILLRECT
         select FB_CFB_COPYAREA
         select FB_CFB_IMAGEBLIT
-        select FB_SOFT_CURSOR
         help
           This is the frame buffer device driver for SGI Graphics Backend.
           This chip is used in SGI O2 and Visual Workstation 320/540.
@@ -583,7 +540,6 @@ config FB_BW2
         select FB_CFB_FILLRECT
         select FB_CFB_COPYAREA
         select FB_CFB_IMAGEBLIT
-        select FB_SOFT_CURSOR
         help
           This is the frame buffer device driver for the BWtwo frame buffer.
 
@@ -592,7 +548,6 @@ config FB_CG3
         depends on (FB = y) && ((SPARC32 || SPARC64) && FB_SBUS || (SUN3 || SUN3X) && FB_SUN3)
         select FB_CFB_COPYAREA
         select FB_CFB_IMAGEBLIT
-        select FB_SOFT_CURSOR
         help
           This is the frame buffer device driver for the CGthree frame buffer.
 
@@ -601,7 +556,6 @@ config FB_CG6
         depends on (FB = y) && ((SPARC32 || SPARC64) && FB_SBUS || (SUN3 || SUN3X) && FB_SUN3)
         select FB_CFB_COPYAREA
         select FB_CFB_IMAGEBLIT
-        select FB_SOFT_CURSOR
         help
           This is the frame buffer device driver for the CGsix (GX, TurboGX)
           frame buffer.
@@ -612,7 +566,6 @@ config FB_PVR2
         select FB_CFB_FILLRECT
         select FB_CFB_COPYAREA
         select FB_CFB_IMAGEBLIT
-        select FB_SOFT_CURSOR
         ---help---
           Say Y here if you have a PowerVR 2 card in your box.  If you plan to
           run linux on your Dreamcast, you will have to say Y here.
@@ -634,13 +587,55 @@ config FB_EPSON1355
         select FB_CFB_FILLRECT
         select FB_CFB_COPYAREA
         select FB_CFB_IMAGEBLIT
-        select FB_SOFT_CURSOR
         help
           Build in support for the SED1355 Epson Research Embedded RAMDAC
           LCD/CRT Controller (since redesignated as the S1D13505) as a
           framebuffer.  Product specs at
           <http://www.erd.epson.com/vdc/html/products.htm>.
 
+config FB_E1356
+        tristate "Epson SED1356 framebuffer support"
+        depends on FB && EXPERIMENTAL && PCI && MIPS
+
+config PB1000_CRT
+        bool "Use CRT on Pb1000 (J65)"
+        depends on MIPS_PB1000=y && FB_E1356
+
+config PB1000_NTSC
+        bool "Use Compsite NTSC on Pb1000 (J63)"
+        depends on MIPS_PB1000=y && FB_E1356
+
+config PB1000_TFT
+        bool "Use TFT Panel on Pb1000 (J64)"
+        depends on MIPS_PB1000=y && FB_E1356
+
+config PB1500_CRT
+        bool "Use CRT on Pb1500 " if MIPS_PB1500=y
+        depends on FB_E1356
+
+config PB1500_CRT
+        prompt "Use CRT on Pb1100 "
+        depends on FB_E1356 && MIPS_PB1100=y
+
+config PB1500_TFT
+        bool "Use TFT Panel on Pb1500 " if MIPS_PB1500=y
+        depends on FB_E1356
+
+config PB1500_TFT
+        prompt "Use TFT Panel on Pb1100 "
+        depends on FB_E1356 && MIPS_PB1100=y
+
+config FB_S1D13XXX
+        tristate "Epson S1D13XXX framebuffer support"
+        depends on FB
+        select FB_CFB_FILLRECT
+        select FB_CFB_COPYAREA
+        select FB_CFB_IMAGEBLIT
+        help
+          Support for S1D13XXX framebuffer device family (currently only
+          working with S1D13806). Product specs at
+          <http://www.erd.epson.com/vdc/html/legacy_13xxx.htm>
+
 config FB_NVIDIA
         tristate "nVidia Framebuffer Support"
         depends on FB && PCI
@@ -650,7 +645,6 @@ config FB_NVIDIA
         select FB_CFB_FILLRECT
         select FB_CFB_COPYAREA
         select FB_CFB_IMAGEBLIT
-        select FB_SOFT_CURSOR
         help
           This driver supports graphics boards with the nVidia chips, TNT
           and newer. For very old chipsets, such as the RIVA128, then use
@@ -662,7 +656,7 @@ config FB_NVIDIA
 
 config FB_NVIDIA_I2C
        bool "Enable DDC Support"
-       depends on FB_NVIDIA && !PPC_OF
+       depends on FB_NVIDIA
        help
           This enables I2C support for nVidia Chipsets.  This is used
           only for getting EDID information from the attached display
@@ -768,7 +762,6 @@ config FB_INTEL
         select FB_CFB_FILLRECT
         select FB_CFB_COPYAREA
         select FB_CFB_IMAGEBLIT
-        select FB_SOFT_CURSOR
         help
           This driver supports the on-board graphics built in to the Intel
           830M/845G/852GM/855GM/865G chipsets.
@@ -791,7 +784,6 @@ config FB_MATROX
         select FB_CFB_FILLRECT
         select FB_CFB_COPYAREA
         select FB_CFB_IMAGEBLIT
-        select FB_SOFT_CURSOR
         select FB_TILEBLITTING
         select FB_MACMODES if PPC_PMAC
         ---help---
@@ -932,7 +924,6 @@ config FB_RADEON_OLD
         select FB_CFB_FILLRECT
         select FB_CFB_COPYAREA
         select FB_CFB_IMAGEBLIT
-        select FB_SOFT_CURSOR
         select FB_MACMODES if PPC
         help
           Choose this option if you want to use an ATI Radeon graphics card as
@@ -950,7 +941,6 @@ config FB_RADEON
         select FB_CFB_FILLRECT
         select FB_CFB_COPYAREA
         select FB_CFB_IMAGEBLIT
-        select FB_SOFT_CURSOR
         select FB_MACMODES if PPC_OF
         help
           Choose this option if you want to use an ATI Radeon graphics card as
@@ -988,7 +978,6 @@ config FB_ATY128
         select FB_CFB_FILLRECT
         select FB_CFB_COPYAREA
         select FB_CFB_IMAGEBLIT
-        select FB_SOFT_CURSOR
         select FB_MACMODES if PPC_PMAC
         help
           This driver supports graphics boards with the ATI Rage128 chips.
@@ -1004,7 +993,6 @@ config FB_ATY
         select FB_CFB_FILLRECT
         select FB_CFB_COPYAREA
         select FB_CFB_IMAGEBLIT
-        select FB_SOFT_CURSOR
         select FB_MACMODES if PPC
         help
           This driver supports graphics boards with the ATI Mach64 chips.
@@ -1047,6 +1035,12 @@ config FB_ATY_GX
           is at
           <http://support.ati.com/products/pc/mach64/graphics_xpression.html>.
 
+config FB_S3TRIO
+        bool "S3 Trio display support"
+        depends on (FB = y) && PPC && BROKEN
+        help
+          If you have a S3 Trio say Y. Say N for S3 Virge.
+
 config FB_SAVAGE
         tristate "S3 Savage support"
         depends on FB && PCI && EXPERIMENTAL
@@ -1056,7 +1050,6 @@ config FB_SAVAGE
         select FB_CFB_FILLRECT
         select FB_CFB_COPYAREA
         select FB_CFB_IMAGEBLIT
-        select FB_SOFT_CURSOR
         help
           This driver supports notebooks and computers with S3 Savage PCI/AGP
           chips.
@@ -1093,7 +1086,6 @@ config FB_SIS
         select FB_CFB_FILLRECT
         select FB_CFB_COPYAREA
         select FB_CFB_IMAGEBLIT
-        select FB_SOFT_CURSOR
         help
           This is the frame buffer device driver for the SiS 300, 315, 330
           and 340 series as well as XGI V3XT, V5, V8, Z7 graphics chipsets.
@@ -1123,7 +1115,6 @@ config FB_NEOMAGIC
         select FB_CFB_FILLRECT
         select FB_CFB_COPYAREA
         select FB_CFB_IMAGEBLIT
-        select FB_SOFT_CURSOR
         help
           This driver supports notebooks with NeoMagic PCI chips.
           Say Y if you have such a graphics card. 
@@ -1137,7 +1128,6 @@ config FB_KYRO
         select FB_CFB_FILLRECT
         select FB_CFB_COPYAREA
         select FB_CFB_IMAGEBLIT
-        select FB_SOFT_CURSOR
         help
           Say Y here if you have a STG4000 / Kyro / PowerVR 3 based
           graphics board.
@@ -1151,7 +1141,6 @@ config FB_3DFX
         select FB_CFB_IMAGEBLIT
         select FB_CFB_FILLRECT
         select FB_CFB_COPYAREA
-        select FB_SOFT_CURSOR
         help
           This driver supports graphics boards with the 3Dfx Banshee/Voodoo3
           chips. Say Y if you have such a graphics board.
@@ -1173,7 +1162,6 @@ config FB_VOODOO1
         select FB_CFB_FILLRECT
         select FB_CFB_COPYAREA
         select FB_CFB_IMAGEBLIT
-        select FB_SOFT_CURSOR
         ---help---
           Say Y here if you have a 3Dfx Voodoo Graphics (Voodoo1/sst1) or 
           Voodoo2 (cvg) based graphics card.
@@ -1190,7 +1178,6 @@ config FB_CYBLA
         tristate "Cyberblade/i1 support"
         depends on FB && PCI
         select FB_CFB_IMAGEBLIT
-        select FB_SOFT_CURSOR
         select VIDEO_SELECT
         ---help---
           This driver is supposed to support the Trident Cyberblade/i1
@@ -1218,7 +1205,6 @@ config FB_TRIDENT
         select FB_CFB_FILLRECT
         select FB_CFB_COPYAREA
         select FB_CFB_IMAGEBLIT
-        select FB_SOFT_CURSOR
         ---help---
           This driver is supposed to support graphics boards with the
           Trident CyberXXXX/Image/CyberBlade chips mostly found in laptops
@@ -1250,38 +1236,6 @@ config FB_PM3
           similar boards, 3DLabs Permedia3 Create!, Appian Jeronimo 2000
           and maybe other boards.
 
-config FB_E1356
-        tristate "Epson SED1356 framebuffer support"
-        depends on FB && EXPERIMENTAL && PCI && MIPS
-
-config PB1000_CRT
-        bool "Use CRT on Pb1000 (J65)"
-        depends on MIPS_PB1000=y && FB_E1356
-
-config PB1000_NTSC
-        bool "Use Compsite NTSC on Pb1000 (J63)"
-        depends on MIPS_PB1000=y && FB_E1356
-
-config PB1000_TFT
-        bool "Use TFT Panel on Pb1000 (J64)"
-        depends on MIPS_PB1000=y && FB_E1356
-
-config PB1500_CRT
-        bool "Use CRT on Pb1500 " if MIPS_PB1500=y
-        depends on FB_E1356
-
-config PB1500_CRT
-        prompt "Use CRT on Pb1100 "
-        depends on FB_E1356 && MIPS_PB1100=y
-
-config PB1500_TFT
-        bool "Use TFT Panel on Pb1500 " if MIPS_PB1500=y
-        depends on FB_E1356
-
-config PB1500_TFT
-        prompt "Use TFT Panel on Pb1100 "
-        depends on FB_E1356 && MIPS_PB1100=y
-
 config FB_AU1100
         bool "Au1100 LCD Driver"
         depends on (FB = y) && EXPERIMENTAL && PCI && MIPS && MIPS_PB1100=y
@@ -1299,7 +1253,6 @@ config FB_FFB
         depends on FB_SBUS && SPARC64
         select FB_CFB_COPYAREA
         select FB_CFB_IMAGEBLIT
-        select FB_SOFT_CURSOR
         help
           This is the frame buffer device driver for the Creator, Creator3D,
           and Elite3D graphics boards.
@@ -1310,7 +1263,6 @@ config FB_TCX
         select FB_CFB_FILLRECT
         select FB_CFB_COPYAREA
         select FB_CFB_IMAGEBLIT
-        select FB_SOFT_CURSOR
         help
           This is the frame buffer device driver for the TCX 24/8bit frame
           buffer.
@@ -1321,7 +1273,6 @@ config FB_CG14
         select FB_CFB_FILLRECT
         select FB_CFB_COPYAREA
         select FB_CFB_IMAGEBLIT
-        select FB_SOFT_CURSOR
         help
           This is the frame buffer device driver for the CGfourteen frame
           buffer on Desktop SPARCsystems with the SX graphics option.
@@ -1332,7 +1283,6 @@ config FB_P9100
         select FB_CFB_FILLRECT
         select FB_CFB_COPYAREA
         select FB_CFB_IMAGEBLIT
-        select FB_SOFT_CURSOR
         help
           This is the frame buffer device driver for the P9100 card
           supported on Sparcbook 3 machines.
@@ -1343,7 +1293,6 @@ config FB_LEO
         select FB_CFB_FILLRECT
         select FB_CFB_COPYAREA
         select FB_CFB_IMAGEBLIT
-        select FB_SOFT_CURSOR
         help
           This is the frame buffer device driver for the SBUS-based Sun ZX
           (leo) frame buffer cards.
@@ -1358,7 +1307,6 @@ config FB_IGA
         select FB_CFB_FILLRECT
         select FB_CFB_COPYAREA
         select FB_CFB_IMAGEBLIT
-        select FB_SOFT_CURSOR
         help
           This is the framebuffer device for the INTERGRAPHICS 1680 and
           successor frame buffer cards.
@@ -1369,7 +1317,6 @@ config FB_HIT
         select FB_CFB_FILLRECT
         select FB_CFB_COPYAREA
         select FB_CFB_IMAGEBLIT
-        select FB_SOFT_CURSOR
         help
           This is the frame buffer device driver for the Hitachi HD64461 LCD
           frame buffer card.
@@ -1380,7 +1327,6 @@ config FB_PMAG_AA
         select FB_CFB_FILLRECT
         select FB_CFB_COPYAREA
         select FB_CFB_IMAGEBLIT
-        select FB_SOFT_CURSOR
         help
           Support for the PMAG-AA TURBOchannel framebuffer card (1280x1024x1)
           used mainly in the MIPS-based DECstation series.
@@ -1391,7 +1337,6 @@ config FB_PMAG_BA
         select FB_CFB_FILLRECT
         select FB_CFB_COPYAREA
         select FB_CFB_IMAGEBLIT
-        select FB_SOFT_CURSOR
         help
           Support for the PMAG-BA TURBOchannel framebuffer card (1024x864x8)
           used mainly in the MIPS-based DECstation series.
@@ -1402,7 +1347,6 @@ config FB_PMAGB_B
         select FB_CFB_FILLRECT
         select FB_CFB_COPYAREA
         select FB_CFB_IMAGEBLIT
-        select FB_SOFT_CURSOR
         help
           Support for the PMAGB-B TURBOchannel framebuffer card used mainly
           in the MIPS-based DECstation series. The card is currently only
@@ -1414,7 +1358,6 @@ config FB_MAXINE
         select FB_CFB_FILLRECT
         select FB_CFB_COPYAREA
         select FB_CFB_IMAGEBLIT
-        select FB_SOFT_CURSOR
         help
           Support for the onboard framebuffer (1024x768x8) in the Personal
           DECstation series (Personal DECstation 5000/20, /25, /33, /50,
@@ -1426,7 +1369,6 @@ config FB_TX3912
         select FB_CFB_FILLRECT
         select FB_CFB_COPYAREA
         select FB_CFB_IMAGEBLIT
-        select FB_SOFT_CURSOR
         help
           The TX3912 is a Toshiba RISC processor based on the MIPS 3900 core
           see <http://www.toshiba.com/taec/components/Generic/risc/tx3912.htm>.
@@ -1439,7 +1381,6 @@ config FB_G364
         select FB_CFB_FILLRECT
         select FB_CFB_COPYAREA
         select FB_CFB_IMAGEBLIT
-        select FB_SOFT_CURSOR
         help
           The G364 driver is the framebuffer used in MIPS Magnum 4000 and
           Olivetti M700-10 systems.
@@ -1450,7 +1391,6 @@ config FB_68328
         select FB_CFB_FILLRECT
         select FB_CFB_COPYAREA
         select FB_CFB_IMAGEBLIT
-        select FB_SOFT_CURSOR
         help
           Say Y here if you want to support the built-in frame buffer of
           the Motorola 68328 CPU family.
@@ -1461,7 +1401,6 @@ config FB_PXA
         select FB_CFB_FILLRECT
         select FB_CFB_COPYAREA
         select FB_CFB_IMAGEBLIT
-        select FB_SOFT_CURSOR
         ---help---
           Frame buffer driver for the built-in LCD controller in the Intel
           PXA2x0 processor.
@@ -1473,23 +1412,6 @@ config FB_PXA
 
           If unsure, say N.
 
-config FB_W100
-        tristate "W100 frame buffer support"
-        depends on FB && PXA_SHARPSL
-        select FB_CFB_FILLRECT
-        select FB_CFB_COPYAREA
-        select FB_CFB_IMAGEBLIT
-        select FB_SOFT_CURSOR
-        ---help---
-          Frame buffer driver for the w100 as found on the Sharp SL-Cxx series.
-
-          This driver is also available as a module ( = code which can be
-          inserted and removed from the running kernel whenever you want). The
-          module will be called vfb. If you want to compile it as a module,
-          say M here and read <file:Documentation/modules.txt>.
-
-          If unsure, say N.
-
 config FB_PXA_PARAMETERS
         bool "PXA LCD command line parameters"
         default n
@@ -1507,17 +1429,21 @@ config FB_PXA_PARAMETERS
 
           <file:Documentation/fb/pxafb.txt> describes the available parameters.
 
-config FB_S1D13XXX
-        tristate "Epson S1D13XXX framebuffer support"
-        depends on FB
-        select FB_CFB_FILLRECT
-        select FB_CFB_COPYAREA
-        select FB_CFB_IMAGEBLIT
-        select FB_SOFT_CURSOR
-        help
-          Support for S1D13XXX framebuffer device family (currently only
-          working with S1D13806). Product specs at
-          <http://www.erd.epson.com/vdc/html/legacy_13xxx.htm>
+config FB_W100
+        tristate "W100 frame buffer support"
+        depends on FB && PXA_SHARPSL
+        select FB_CFB_FILLRECT
+        select FB_CFB_COPYAREA
+        select FB_CFB_IMAGEBLIT
+        ---help---
+          Frame buffer driver for the w100 as found on the Sharp SL-Cxx series.
+
+          This driver is also available as a module ( = code which can be
+          inserted and removed from the running kernel whenever you want). The
+          module will be called vfb. If you want to compile it as a module,
+          say M here and read <file:Documentation/modules.txt>.
+
+          If unsure, say N.
 
 config FB_S3C2410
         tristate "S3C2410 LCD framebuffer support"
@@ -1525,7 +1451,6 @@ config FB_S3C2410
         select FB_CFB_FILLRECT
         select FB_CFB_COPYAREA
         select FB_CFB_IMAGEBLIT
-        select FB_SOFT_CURSOR
         ---help---
           Frame buffer driver for the built-in LCD controller in the Samsung
           S3C2410 processor.
@@ -1549,7 +1474,6 @@ config FB_VIRTUAL
         select FB_CFB_FILLRECT
         select FB_CFB_COPYAREA
         select FB_CFB_IMAGEBLIT
-        select FB_SOFT_CURSOR
         ---help---
           This is a `virtual' frame buffer device. It operates on a chunk of
           unswappable kernel memory instead of on the memory of a graphics
diff --git a/drivers/video/Makefile b/drivers/video/Makefile
index 97c5d03ac8d9..aa434e725c0d 100644
--- a/drivers/video/Makefile
+++ b/drivers/video/Makefile
@@ -16,7 +16,6 @@ fb-objs                           := $(fb-y)
 obj-$(CONFIG_FB_CFB_FILLRECT)  += cfbfillrect.o
 obj-$(CONFIG_FB_CFB_COPYAREA)  += cfbcopyarea.o
 obj-$(CONFIG_FB_CFB_IMAGEBLIT) += cfbimgblt.o
-obj-$(CONFIG_FB_SOFT_CURSOR)   += softcursor.o
 obj-$(CONFIG_FB_MACMODES)      += macmodes.o
 
 # Hardware specific drivers go first
diff --git a/drivers/video/acornfb.c b/drivers/video/acornfb.c
index 9b6a39348f81..193b482570c7 100644
--- a/drivers/video/acornfb.c
+++ b/drivers/video/acornfb.c
@@ -926,7 +926,6 @@ static struct fb_ops acornfb_ops = {
         .fb_copyarea    = cfb_copyarea,
         .fb_imageblit   = cfb_imageblit,
         .fb_mmap        = acornfb_mmap,
-        .fb_cursor      = soft_cursor,
 };
 
 /*
diff --git a/drivers/video/amba-clcd.c b/drivers/video/amba-clcd.c
index 4fc93dc2b4d3..467a1d7ebbde 100644
--- a/drivers/video/amba-clcd.c
+++ b/drivers/video/amba-clcd.c
@@ -333,7 +333,6 @@ static struct fb_ops clcdfb_ops = {
         .fb_fillrect    = cfb_fillrect,
         .fb_copyarea    = cfb_copyarea,
         .fb_imageblit   = cfb_imageblit,
-        .fb_cursor      = soft_cursor,
         .fb_mmap        = clcdfb_mmap,
 };
 
diff --git a/drivers/video/amifb.c b/drivers/video/amifb.c
index cf8bb67462dc..d549e215f3c5 100644
--- a/drivers/video/amifb.c
+++ b/drivers/video/amifb.c
@@ -1185,7 +1185,6 @@ static struct fb_ops amifb_ops = {
         .fb_fillrect    = amifb_fillrect,
         .fb_copyarea    = amifb_copyarea,
         .fb_imageblit   = amifb_imageblit,
-        .fb_cursor      = soft_cursor,
         .fb_ioctl       = amifb_ioctl,
 };
 
diff --git a/drivers/video/arcfb.c b/drivers/video/arcfb.c
index 126daff1c848..a1fc8bbb1090 100644
--- a/drivers/video/arcfb.c
+++ b/drivers/video/arcfb.c
@@ -502,10 +502,6 @@ static ssize_t arcfb_write(struct file *file, const char *buf, size_t count,
         return err;
 }
 
-static void arcfb_platform_release(struct device *device)
-{
-}
-
 static struct fb_ops arcfb_ops = {
         .owner          = THIS_MODULE,
         .fb_open        = arcfb_open,
@@ -515,7 +511,6 @@ static struct fb_ops arcfb_ops = {
         .fb_fillrect    = arcfb_fillrect,
         .fb_copyarea    = arcfb_copyarea,
         .fb_imageblit   = arcfb_imageblit,
-        .fb_cursor      = soft_cursor,
         .fb_ioctl       = arcfb_ioctl,
 };
 
@@ -624,13 +619,7 @@ static struct device_driver arcfb_driver = {
         .remove = arcfb_remove,
 };
 
-static struct platform_device arcfb_device = {
-        .name   = "arcfb",
-        .id     = 0,
-        .dev    = {
-                .release = arcfb_platform_release,
-        }
-};
+static struct platform_device *arcfb_device;
 
 static int __init arcfb_init(void)
 {
@@ -641,9 +630,16 @@ static int __init arcfb_init(void)
 
         ret = driver_register(&arcfb_driver);
         if (!ret) {
-                ret = platform_device_register(&arcfb_device);
-                if (ret)
+                arcfb_device = platform_device_alloc("arcfb", 0);
+                if (arcfb_device) {
+                        ret = platform_device_add(arcfb_device);
+                } else {
+                        ret = -ENOMEM;
+                }
+                if (ret) {
+                        platform_device_put(arcfb_device);
                         driver_unregister(&arcfb_driver);
+                }
         }
         return ret;
 
@@ -651,7 +647,7 @@ static int __init arcfb_init(void)
 
 static void __exit arcfb_exit(void)
 {
-        platform_device_unregister(&arcfb_device);
+        platform_device_unregister(arcfb_device);
         driver_unregister(&arcfb_driver);
 }
 
diff --git a/drivers/video/asiliantfb.c b/drivers/video/asiliantfb.c
index f4729f4df8ce..c64de59398f4 100644
--- a/drivers/video/asiliantfb.c
+++ b/drivers/video/asiliantfb.c
@@ -106,7 +106,6 @@ static struct fb_ops asiliantfb_ops = {
         .fb_fillrect    = cfb_fillrect,
         .fb_copyarea    = cfb_copyarea,
         .fb_imageblit   = cfb_imageblit,
-        .fb_cursor      = soft_cursor,
 };
 
 /* Calculate the ratios for the dot clocks without using a single long long
diff --git a/drivers/video/aty/ati_ids.h b/drivers/video/aty/ati_ids.h
index 13321c689cf6..39ab483fc250 100644
--- a/drivers/video/aty/ati_ids.h
+++ b/drivers/video/aty/ati_ids.h
@@ -150,6 +150,7 @@
 #define PCI_CHIP_RV200_QX               0x5158
 #define PCI_CHIP_RV100_QY               0x5159
 #define PCI_CHIP_RV100_QZ               0x515A
+#define PCI_CHIP_RN50                   0x515E
 #define PCI_CHIP_RAGE128RE              0x5245
 #define PCI_CHIP_RAGE128RF              0x5246
 #define PCI_CHIP_RAGE128RG              0x5247
diff --git a/drivers/video/aty/aty128fb.c b/drivers/video/aty/aty128fb.c
index e380ee8b0247..e686185a076d 100644
--- a/drivers/video/aty/aty128fb.c
+++ b/drivers/video/aty/aty128fb.c
@@ -478,7 +478,6 @@ static struct fb_ops aty128fb_ops = {
         .fb_fillrect    = cfb_fillrect,
         .fb_copyarea    = cfb_copyarea,
         .fb_imageblit   = cfb_imageblit,
-        .fb_cursor      = soft_cursor,
 };
 
 #ifdef CONFIG_PMAC_BACKLIGHT
diff --git a/drivers/video/aty/atyfb_base.c b/drivers/video/aty/atyfb_base.c
index 037fe9d32fe3..08edbfcfca58 100644
--- a/drivers/video/aty/atyfb_base.c
+++ b/drivers/video/aty/atyfb_base.c
@@ -292,7 +292,6 @@ static struct fb_ops atyfb_ops = {
         .fb_fillrect    = atyfb_fillrect,
         .fb_copyarea    = atyfb_copyarea,
         .fb_imageblit   = atyfb_imageblit,
-        .fb_cursor      = soft_cursor,
 #ifdef __sparc__
         .fb_mmap        = atyfb_mmap,
 #endif
@@ -2157,11 +2156,38 @@ static void __init aty_calc_mem_refresh(struct atyfb_par *par, int xclk)
 
 static struct fb_info *fb_list = NULL;
 
+#if defined(__i386__) && defined(CONFIG_FB_ATY_GENERIC_LCD)
+static int __devinit atyfb_get_timings_from_lcd(struct atyfb_par *par,
+                                                struct fb_var_screeninfo *var)
+{
+        int ret = -EINVAL;
+
+        if (par->lcd_table != 0 && (aty_ld_lcd(LCD_GEN_CNTL, par) & LCD_ON)) {
+                *var = default_var;
+                var->xres = var->xres_virtual = par->lcd_hdisp;
+                var->right_margin = par->lcd_right_margin;
+                var->left_margin = par->lcd_hblank_len -
+                        (par->lcd_right_margin + par->lcd_hsync_dly +
+                         par->lcd_hsync_len);
+                var->hsync_len = par->lcd_hsync_len + par->lcd_hsync_dly;
+                var->yres = var->yres_virtual = par->lcd_vdisp;
+                var->lower_margin = par->lcd_lower_margin;
+                var->upper_margin = par->lcd_vblank_len -
+                        (par->lcd_lower_margin + par->lcd_vsync_len);
+                var->vsync_len = par->lcd_vsync_len;
+                var->pixclock = par->lcd_pixclock;
+                ret = 0;
+        }
+
+        return ret;
+}
+#endif /* defined(__i386__) && defined(CONFIG_FB_ATY_GENERIC_LCD) */
+
 static int __init aty_init(struct fb_info *info, const char *name)
 {
         struct atyfb_par *par = (struct atyfb_par *) info->par;
         const char *ramname = NULL, *xtal;
-        int gtb_memsize;
+        int gtb_memsize, has_var = 0;
         struct fb_var_screeninfo var;
         u8 pll_ref_div;
         u32 i;
@@ -2469,8 +2495,8 @@ static int __init aty_init(struct fb_info *info, const char *name)
                  *         applies to all Mac video cards
                  */
                 if (mode) {
-                        if (!mac_find_mode(&var, info, mode, 8))
-                                var = default_var;
+                        if (mac_find_mode(&var, info, mode, 8))
+                                has_var = 1;
                 } else {
                         if (default_vmode == VMODE_CHOOSE) {
                                 if (M64_HAS(G3_PB_1024x768))
@@ -2492,20 +2518,23 @@ static int __init aty_init(struct fb_info *info, const char *name)
                                 default_vmode = VMODE_640_480_60;
                         if (default_cmode < CMODE_8 || default_cmode > CMODE_32)
                                 default_cmode = CMODE_8;
-                        if (mac_vmode_to_var(default_vmode, default_cmode, &var))
-                                var = default_var;
+                        if (!mac_vmode_to_var(default_vmode, default_cmode,
+                                               &var))
+                                has_var = 1;
                 }
-        } else
+        }
+
 #endif /* !CONFIG_PPC */
-        if (
-#if defined(CONFIG_SPARC32) || defined(CONFIG_SPARC64)
-           /* On Sparc, unless the user gave a specific mode
-            * specification, use the PROM probed values in
-            * default_var.
-            */
-            !mode ||
+
+#if defined(__i386__) && defined(CONFIG_FB_ATY_GENERIC_LCD)
+        if (!atyfb_get_timings_from_lcd(par, &var))
+                has_var = 1;
 #endif
-            !fb_find_mode(&var, info, mode, NULL, 0, &defmode, 8))
+
+        if (mode && fb_find_mode(&var, info, mode, NULL, 0, &defmode, 8))
+                has_var = 1;
+
+        if (!has_var)
                 var = default_var;
 
         if (noaccel)
diff --git a/drivers/video/aty/radeon_base.c b/drivers/video/aty/radeon_base.c
index 8a24a66d9ba8..4f01ccc02aa4 100644
--- a/drivers/video/aty/radeon_base.c
+++ b/drivers/video/aty/radeon_base.c
@@ -69,7 +69,6 @@
 #include <linux/pci.h>
 #include <linux/vmalloc.h>
 #include <linux/device.h>
-#include <linux/i2c.h>
 
 #include <asm/io.h>
 #include <asm/uaccess.h>
@@ -113,6 +112,7 @@ static struct pci_device_id radeonfb_pci_table[] = {
         /* Radeon VE/7000 */
         CHIP_DEF(PCI_CHIP_RV100_QY,     RV100,  CHIP_HAS_CRTC2),
         CHIP_DEF(PCI_CHIP_RV100_QZ,     RV100,  CHIP_HAS_CRTC2),
+        CHIP_DEF(PCI_CHIP_RN50,         RV100,  CHIP_HAS_CRTC2),
         /* Radeon IGP320M (U1) */
         CHIP_DEF(PCI_CHIP_RS100_4336,   RS100,  CHIP_HAS_CRTC2 | CHIP_IS_IGP | CHIP_IS_MOBILITY),
         /* Radeon IGP320 (A3) */
@@ -1874,7 +1874,6 @@ static struct fb_ops radeonfb_ops = {
         .fb_fillrect            = radeonfb_fillrect,
         .fb_copyarea            = radeonfb_copyarea,
         .fb_imageblit           = radeonfb_imageblit,
-        .fb_cursor              = soft_cursor,
 };
 
 
diff --git a/drivers/video/aty/radeonfb.h b/drivers/video/aty/radeonfb.h
index 01b8b2f78514..217e00ab4a2d 100644
--- a/drivers/video/aty/radeonfb.h
+++ b/drivers/video/aty/radeonfb.h
@@ -10,9 +10,10 @@
 #include <linux/fb.h>
 
 
+#ifdef CONFIG_FB_RADEON_I2C
 #include <linux/i2c.h>
-#include <linux/i2c-id.h>
 #include <linux/i2c-algo-bit.h>
+#endif
 
 #include <asm/io.h>
 
diff --git a/drivers/video/bw2.c b/drivers/video/bw2.c
index 3d20b2d47d46..f53bf3ba1278 100644
--- a/drivers/video/bw2.c
+++ b/drivers/video/bw2.c
@@ -51,7 +51,6 @@ static struct fb_ops bw2_ops = {
         .fb_imageblit           = cfb_imageblit,
         .fb_mmap                = bw2_mmap,
         .fb_ioctl               = bw2_ioctl,
-        .fb_cursor              = soft_cursor,
 };
 
 /* OBio addresses for the bwtwo registers */
diff --git a/drivers/video/cfbcopyarea.c b/drivers/video/cfbcopyarea.c
index 67711f7b11b1..cdc71572cf35 100644
--- a/drivers/video/cfbcopyarea.c
+++ b/drivers/video/cfbcopyarea.c
@@ -349,46 +349,10 @@ void cfb_copyarea(struct fb_info *p, const struct fb_copyarea *area)
         unsigned long __iomem *dst = NULL, *src = NULL;
         int bits = BITS_PER_LONG, bytes = bits >> 3;
         int dst_idx = 0, src_idx = 0, rev_copy = 0;
-        int x2, y2, vxres, vyres;
 
         if (p->state != FBINFO_STATE_RUNNING)
                 return;
 
-        /* We want rotation but lack hardware to do it for us. */
-        if (!p->fbops->fb_rotate && p->var.rotate) {
-        }
-
-        vxres = p->var.xres_virtual;
-        vyres = p->var.yres_virtual;
-
-        if (area->dx > vxres || area->sx > vxres ||
-            area->dy > vyres || area->sy > vyres)
-                return;
-
-        /* clip the destination
-         * We could use hardware clipping but on many cards you get around
-         * hardware clipping by writing to framebuffer directly.
-         */
-        x2 = area->dx + area->width;
-        y2 = area->dy + area->height;
-        dx = area->dx > 0 ? area->dx : 0;
-        dy = area->dy > 0 ? area->dy : 0;
-        x2 = x2 < vxres ? x2 : vxres;
-        y2 = y2 < vyres ? y2 : vyres;
-        width = x2 - dx;
-        height = y2 - dy;
-
-        if ((width==0) ||(height==0))
-                return;
-
-        /* update sx1,sy1 */
-        sx += (dx - area->dx);
-        sy += (dy - area->dy);
-
-        /* the source must be completely inside the virtual screen */
-        if (sx < 0 || sy < 0 || (sx + width) > vxres || (sy + height) > vyres)
-                return;
-
         /* if the beginning of the target area might overlap with the end of
         the source area, be have to copy the area reverse. */
         if ((dy == sy && dx > sx) || (dy > sy)) {
diff --git a/drivers/video/cfbfillrect.c b/drivers/video/cfbfillrect.c
index e4fc42b013eb..167d9314e6eb 100644
--- a/drivers/video/cfbfillrect.c
+++ b/drivers/video/cfbfillrect.c
@@ -344,7 +344,8 @@ bitfill_unaligned_rev(unsigned long __iomem *dst, int dst_idx, unsigned long pat
 
 void cfb_fillrect(struct fb_info *p, const struct fb_fillrect *rect)
 {
-        unsigned long x2, y2, vxres, vyres, height, width, pat, fg;
+        unsigned long pat, fg;
+        unsigned long width = rect->width, height = rect->height;
         int bits = BITS_PER_LONG, bytes = bits >> 3;
         u32 bpp = p->var.bits_per_pixel;
         unsigned long __iomem *dst;
@@ -353,27 +354,6 @@ void cfb_fillrect(struct fb_info *p, const struct fb_fillrect *rect)
         if (p->state != FBINFO_STATE_RUNNING)
                 return;
 
-        /* We want rotation but lack hardware to do it for us. */
-        if (!p->fbops->fb_rotate && p->var.rotate) {
-        }
-
-        vxres = p->var.xres_virtual;
-        vyres = p->var.yres_virtual;
-
-        if (!rect->width || !rect->height ||
-            rect->dx > vxres || rect->dy > vyres)
-                return;
-
-        /* We could use hardware clipping but on many cards you get around
-         * hardware clipping by writing to framebuffer directly. */
-
-        x2 = rect->dx + rect->width;
-        y2 = rect->dy + rect->height;
-        x2 = x2 < vxres ? x2 : vxres;
-        y2 = y2 < vyres ? y2 : vyres;
-        width = x2 - rect->dx;
-        height = y2 - rect->dy;
-
         if (p->fix.visual == FB_VISUAL_TRUECOLOR ||
             p->fix.visual == FB_VISUAL_DIRECTCOLOR )
                 fg = ((u32 *) (p->pseudo_palette))[rect->color];
diff --git a/drivers/video/cfbimgblt.c b/drivers/video/cfbimgblt.c
index 4c123abaa843..da664cea7eca 100644
--- a/drivers/video/cfbimgblt.c
+++ b/drivers/video/cfbimgblt.c
@@ -272,33 +272,13 @@ void cfb_imageblit(struct fb_info *p, const struct fb_image *image)
 {
         u32 fgcolor, bgcolor, start_index, bitstart, pitch_index = 0;
         u32 bpl = sizeof(u32), bpp = p->var.bits_per_pixel;
-        u32 width = image->width, height = image->height; 
+        u32 width = image->width;
         u32 dx = image->dx, dy = image->dy;
-        int x2, y2, vxres, vyres;
         u8 __iomem *dst1;
 
         if (p->state != FBINFO_STATE_RUNNING)
                 return;
 
-        vxres = p->var.xres_virtual;
-        vyres = p->var.yres_virtual;
-        /* 
-         * We could use hardware clipping but on many cards you get around
-         * hardware clipping by writing to framebuffer directly like we are
-         * doing here. 
-         */
-        if (image->dx > vxres || image->dy > vyres)
-                return;
-
-        x2 = image->dx + image->width;
-        y2 = image->dy + image->height;
-        dx = image->dx > 0 ? image->dx : 0;
-        dy = image->dy > 0 ? image->dy : 0;
-        x2 = x2 < vxres ? x2 : vxres;
-        y2 = y2 < vyres ? y2 : vyres;
-        width  = x2 - dx;
-        height = y2 - dy;
-
         bitstart = (dy * p->fix.line_length * 8) + (dx * bpp);
         start_index = bitstart & (32 - 1);
         pitch_index = (p->fix.line_length & (bpl - 1)) * 8;
diff --git a/drivers/video/cg14.c b/drivers/video/cg14.c
index 18e60b941e21..030d4b13b1c2 100644
--- a/drivers/video/cg14.c
+++ b/drivers/video/cg14.c
@@ -49,7 +49,6 @@ static struct fb_ops cg14_ops = {
         .fb_imageblit           = cfb_imageblit,
         .fb_mmap                = cg14_mmap,
         .fb_ioctl               = cg14_ioctl,
-        .fb_cursor              = soft_cursor,
 };
 
 #define CG14_MCR_INTENABLE_SHIFT        7
diff --git a/drivers/video/cg3.c b/drivers/video/cg3.c
index 6e7d8d45dc68..b94eee8c42d5 100644
--- a/drivers/video/cg3.c
+++ b/drivers/video/cg3.c
@@ -50,7 +50,6 @@ static struct fb_ops cg3_ops = {
         .fb_imageblit           = cfb_imageblit,
         .fb_mmap                = cg3_mmap,
         .fb_ioctl               = cg3_ioctl,
-        .fb_cursor              = soft_cursor,
 };
 
 
diff --git a/drivers/video/cg6.c b/drivers/video/cg6.c
index 49a2545671d9..414c4409e924 100644
--- a/drivers/video/cg6.c
+++ b/drivers/video/cg6.c
@@ -54,7 +54,6 @@ static struct fb_ops cg6_ops = {
         .fb_sync                = cg6_sync,
         .fb_mmap                = cg6_mmap,
         .fb_ioctl               = cg6_ioctl,
-        .fb_cursor              = soft_cursor,
 };
 
 /* Offset of interesting structures in the OBIO space */
@@ -654,12 +653,6 @@ static void cg6_chip_init(struct fb_info *info)
         sbus_writel(0, &fbc->clipminy);
         sbus_writel(info->var.xres - 1, &fbc->clipmaxx);
         sbus_writel(info->var.yres - 1, &fbc->clipmaxy);
-
-        /* Disable cursor in Brooktree DAC. */
-        sbus_writel(0x06 << 24, &par->bt->addr);
-        tmp = sbus_readl(&par->bt->control);
-        tmp &= ~(0x03 << 24);
-        sbus_writel(tmp, &par->bt->control);
 }
 
 struct all_info {
diff --git a/drivers/video/chipsfb.c b/drivers/video/chipsfb.c
index 4131243cfdf8..bc061d4ec786 100644
--- a/drivers/video/chipsfb.c
+++ b/drivers/video/chipsfb.c
@@ -91,7 +91,6 @@ static struct fb_ops chipsfb_ops = {
         .fb_fillrect    = cfb_fillrect,
         .fb_copyarea    = cfb_copyarea,
         .fb_imageblit   = cfb_imageblit,
-        .fb_cursor      = soft_cursor,
 };
 
 static int chipsfb_check_var(struct fb_var_screeninfo *var,
diff --git a/drivers/video/cirrusfb.c b/drivers/video/cirrusfb.c
index 3a26f9cc8585..2858c5c8ba3c 100644
--- a/drivers/video/cirrusfb.c
+++ b/drivers/video/cirrusfb.c
@@ -548,7 +548,6 @@ static struct fb_ops cirrusfb_ops = {
         .fb_fillrect    = cirrusfb_fillrect,
         .fb_copyarea    = cirrusfb_copyarea,
         .fb_imageblit   = cirrusfb_imageblit,
-        .fb_cursor      = soft_cursor,
 };
 
 /*--- Hardware Specific Routines -------------------------------------------*/
diff --git a/drivers/video/clps711xfb.c b/drivers/video/clps711xfb.c
index 8692e002986b..50b78af0fa24 100644
--- a/drivers/video/clps711xfb.c
+++ b/drivers/video/clps711xfb.c
@@ -219,7 +219,6 @@ static struct fb_ops clps7111fb_ops = {
         .fb_fillrect    = cfb_fillrect,
         .fb_copyarea    = cfb_copyarea,
         .fb_imageblit   = cfb_imageblit,
-        .fb_cursor      = soft_cursor,
 };
 
 static int 
diff --git a/drivers/video/console/Kconfig b/drivers/video/console/Kconfig
index 6a9ae2b3d1ab..fadf7c5d216e 100644
--- a/drivers/video/console/Kconfig
+++ b/drivers/video/console/Kconfig
@@ -98,6 +98,8 @@ config FRAMEBUFFER_CONSOLE
         tristate "Framebuffer Console support"
         depends on FB
         select CRC32
+        help
+          Low-level framebuffer-based console driver.
 
 config STI_CONSOLE
         tristate "STI text console" 
@@ -203,5 +205,12 @@ config FONT_10x18
           big letters. It fits between the sun 12x22 and the normal 8x16 font.
           If other fonts are too big or too small for you, say Y, otherwise say N.
 
+config FONT_RL
+        bool "console Roman Large 8x16 font" if FONTS
+        depends on FRAMEBUFFER_CONSOLE
+        help
+          This is the visually-appealing "RL" console font that is
+          included with the kbd package.
+
 endmenu
 
diff --git a/drivers/video/console/Makefile b/drivers/video/console/Makefile
index 42c7b8dcd220..5222628accce 100644
--- a/drivers/video/console/Makefile
+++ b/drivers/video/console/Makefile
@@ -15,6 +15,7 @@ font-objs-$(CONFIG_FONT_10x18)     += font_10x18.o
 font-objs-$(CONFIG_FONT_PEARL_8x8) += font_pearl_8x8.o
 font-objs-$(CONFIG_FONT_ACORN_8x8) += font_acorn_8x8.o
 font-objs-$(CONFIG_FONT_MINI_4x6)  += font_mini_4x6.o
+font-objs-$(CONFIG_FONT_RL)  += font_rl.o
 
 font-objs += $(font-objs-y)
 
@@ -26,7 +27,7 @@ obj-$(CONFIG_PROM_CONSOLE)        += promcon.o promcon_tbl.o
 obj-$(CONFIG_STI_CONSOLE)         += sticon.o sticore.o font.o
 obj-$(CONFIG_VGA_CONSOLE)         += vgacon.o
 obj-$(CONFIG_MDA_CONSOLE)         += mdacon.o
-obj-$(CONFIG_FRAMEBUFFER_CONSOLE) += fbcon.o bitblit.o font.o
+obj-$(CONFIG_FRAMEBUFFER_CONSOLE) += fbcon.o bitblit.o font.o softcursor.o
 ifeq ($(CONFIG_FB_TILEBLITTING),y)
 obj-$(CONFIG_FRAMEBUFFER_CONSOLE)     += tileblit.o
 endif
diff --git a/drivers/video/console/bitblit.c b/drivers/video/console/bitblit.c
index 9f70e512b88b..67857b3cfc8b 100644
--- a/drivers/video/console/bitblit.c
+++ b/drivers/video/console/bitblit.c
@@ -272,6 +272,7 @@ static void bit_cursor(struct vc_data *vc, struct fb_info *info,
         int w = (vc->vc_font.width + 7) >> 3, c;
         int y = real_y(p, vc->vc_y);
         int attribute, use_sw = (vc->vc_cursor_type & 0x10);
+        int err = 1;
         char *src;
 
         cursor.set = 0;
@@ -408,7 +409,11 @@ static void bit_cursor(struct vc_data *vc, struct fb_info *info,
         cursor.image.depth = 1;
         cursor.rop = ROP_XOR;
 
-        info->fbops->fb_cursor(info, &cursor);
+        if (info->fbops->fb_cursor)
+                err = info->fbops->fb_cursor(info, &cursor);
+
+        if (err)
+                soft_cursor(info, &cursor);
 
         ops->cursor_reset = 0;
 }
diff --git a/drivers/video/console/fbcon.c b/drivers/video/console/fbcon.c
index 0fc8bb499c3f..3cf1b61ff1f8 100644
--- a/drivers/video/console/fbcon.c
+++ b/drivers/video/console/fbcon.c
@@ -281,6 +281,18 @@ static inline int get_color(struct vc_data *vc, struct fb_info *info,
         return color;
 }
 
+static void fbcon_update_softback(struct vc_data *vc)
+{
+        int l = fbcon_softback_size / vc->vc_size_row;
+
+        if (l > 5)
+                softback_end = softback_buf + l * vc->vc_size_row;
+        else
+                /* Smaller scrollback makes no sense, and 0 would screw
+                   the operation totally */
+                softback_top = 0;
+}
+
 static void fb_flashcursor(void *private)
 {
         struct fb_info *info = private;
@@ -618,6 +630,15 @@ static int con2fb_release_oldinfo(struct vc_data *vc, struct fb_info *oldinfo,
                 kfree(oldinfo->fbcon_par);
                 oldinfo->fbcon_par = NULL;
                 module_put(oldinfo->fbops->owner);
+                /*
+                  If oldinfo and newinfo are driving the same hardware,
+                  the fb_release() method of oldinfo may attempt to
+                  restore the hardware state.  This will leave the
+                  newinfo in an undefined state. Thus, a call to
+                  fb_set_par() may be needed for the newinfo.
+                */
+                if (newinfo->fbops->fb_set_par)
+                        newinfo->fbops->fb_set_par(newinfo);
         }
 
         return err;
@@ -1007,16 +1028,8 @@ static void fbcon_init(struct vc_data *vc, int init)
         if (logo)
                 fbcon_prepare_logo(vc, info, cols, rows, new_cols, new_rows);
 
-        if (vc == svc && softback_buf) {
-                int l = fbcon_softback_size / vc->vc_size_row;
-                if (l > 5)
-                        softback_end = softback_buf + l * vc->vc_size_row;
-                else {
-                        /* Smaller scrollback makes no sense, and 0 would screw
-                           the operation totally */
-                        softback_top = 0;
-                }
-        }
+        if (vc == svc && softback_buf)
+                fbcon_update_softback(vc);
 }
 
 static void fbcon_deinit(struct vc_data *vc)
@@ -1223,18 +1236,8 @@ static void fbcon_set_disp(struct fb_info *info, struct fb_var_screeninfo *var,
         vc_resize(vc, cols, rows);
         if (CON_IS_VISIBLE(vc)) {
                 update_screen(vc);
-                if (softback_buf) {
-                        int l = fbcon_softback_size / vc->vc_size_row;
-
-                        if (l > 5)
-                                softback_end = softback_buf + l *
-                                        vc->vc_size_row;
-                        else {
-                                /* Smaller scrollback makes no sense, and 0
-                                   would screw the operation totally */
-                                softback_top = 0;
-                        }
-                }
+                if (softback_buf)
+                        fbcon_update_softback(vc);
         }
 }
 
@@ -1892,24 +1895,11 @@ static int fbcon_resize(struct vc_data *vc, unsigned int width,
                 mode = fb_find_best_mode(&var, &info->modelist);
                 if (mode == NULL)
                         return -EINVAL;
+                display_to_var(&var, p);
                 fb_videomode_to_var(&var, mode);
+
                 if (width > var.xres/fw || height > var.yres/fh)
                         return -EINVAL;
-                /*
-                 * The following can probably have any value... Do we need to
-                 * set all of them?
-                 */
-                var.bits_per_pixel = p->bits_per_pixel;
-                var.xres_virtual = p->xres_virtual;
-                var.yres_virtual = p->yres_virtual;
-                var.accel_flags = p->accel_flags;
-                var.width = p->width;
-                var.height = p->height;
-                var.red = p->red;
-                var.green = p->green;
-                var.blue = p->blue;
-                var.transp = p->transp;
-                var.nonstd = p->nonstd;
 
                 DPRINTK("resize now %ix%i\n", var.xres, var.yres);
                 if (CON_IS_VISIBLE(vc)) {
@@ -1933,19 +1923,11 @@ static int fbcon_switch(struct vc_data *vc)
         info = registered_fb[con2fb_map[vc->vc_num]];
 
         if (softback_top) {
-                int l = fbcon_softback_size / vc->vc_size_row;
                 if (softback_lines)
                         fbcon_set_origin(vc);
                 softback_top = softback_curr = softback_in = softback_buf;
                 softback_lines = 0;
-
-                if (l > 5)
-                        softback_end = softback_buf + l * vc->vc_size_row;
-                else {
-                        /* Smaller scrollback makes no sense, and 0 would screw
-                           the operation totally */
-                        softback_top = 0;
-                }
+                fbcon_update_softback(vc);
         }
 
         if (logo_shown >= 0) {
@@ -2235,17 +2217,8 @@ static int fbcon_do_set_font(struct vc_data *vc, int w, int h,
                 /* reset wrap/pan */
                 info->var.xoffset = info->var.yoffset = p->yscroll = 0;
                 vc_resize(vc, info->var.xres / w, info->var.yres / h);
-                if (CON_IS_VISIBLE(vc) && softback_buf) {
-                        int l = fbcon_softback_size / vc->vc_size_row;
-                        if (l > 5)
-                                softback_end =
-                                    softback_buf + l * vc->vc_size_row;
-                        else {
-                                /* Smaller scrollback makes no sense, and 0 would screw
-                                   the operation totally */
-                                softback_top = 0;
-                        }
-                }
+                if (CON_IS_VISIBLE(vc) && softback_buf)
+                        fbcon_update_softback(vc);
         } else if (CON_IS_VISIBLE(vc)
                    && vc->vc_mode == KD_TEXT) {
                 fbcon_clear_margins(vc, 0);
@@ -2615,16 +2588,8 @@ static void fbcon_modechanged(struct fb_info *info)
                 update_var(vc->vc_num, info);
                 fbcon_set_palette(vc, color_table);
                 update_screen(vc);
-                if (softback_buf) {
-                        int l = fbcon_softback_size / vc->vc_size_row;
-                        if (l > 5)
-                                softback_end = softback_buf + l * vc->vc_size_row;
-                        else {
-                                /* Smaller scrollback makes no sense, and 0
-                                   would screw the operation totally */
-                                softback_top = 0;
-                        }
-                }
+                if (softback_buf)
+                        fbcon_update_softback(vc);
         }
 }
 
@@ -2659,16 +2624,8 @@ static void fbcon_set_all_vcs(struct fb_info *info)
                         update_var(vc->vc_num, info);
                         fbcon_set_palette(vc, color_table);
                         update_screen(vc);
-                        if (softback_buf) {
-                                int l = fbcon_softback_size / vc->vc_size_row;
-                                if (l > 5)
-                                        softback_end = softback_buf + l * vc->vc_size_row;
-                                else {
-                                        /* Smaller scrollback makes no sense, and 0
-                                           would screw the operation totally */
-                                        softback_top = 0;
-                                }
-                        }
+                        if (softback_buf)
+                                fbcon_update_softback(vc);
                 }
         }
 }
@@ -2758,7 +2715,8 @@ static void fbcon_new_modelist(struct fb_info *info)
                         continue;
                 vc = vc_cons[i].d;
                 display_to_var(&var, &fb_display[i]);
-                mode = fb_find_nearest_mode(&var, &info->modelist);
+                mode = fb_find_nearest_mode(fb_display[i].mode,
+                                            &info->modelist);
                 fb_videomode_to_var(&var, mode);
 
                 if (vc)
diff --git a/drivers/video/console/fbcon.h b/drivers/video/console/fbcon.h
index 0738cd62def2..b68e0e2c2d16 100644
--- a/drivers/video/console/fbcon.h
+++ b/drivers/video/console/fbcon.h
@@ -167,5 +167,5 @@ extern void fbcon_set_tileops(struct vc_data *vc, struct fb_info *info,
                               struct display *p, struct fbcon_ops *ops);
 #endif
 extern void fbcon_set_bitops(struct fbcon_ops *ops);
-
+extern int  soft_cursor(struct fb_info *info, struct fb_cursor *cursor);
 #endif /* _VIDEO_FBCON_H */
diff --git a/drivers/video/console/font_rl.c b/drivers/video/console/font_rl.c
new file mode 100644
index 000000000000..dfecc27d8ded
--- /dev/null
+++ b/drivers/video/console/font_rl.c
@@ -0,0 +1,4374 @@
+
+/* This font is simply the "rl.fnt" console font from the kbd utility.
+ * Converted by Zack T Smith, fbui@comcast.net.
+ * The original binary file is covered under the GNU Public License.
+ */
+
+#include <linux/font.h>
+
+#define FONTDATAMAX 4096
+
+static unsigned char patterns[4096] = {
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+
+0x00,
+0x00,
+0x3c,
+0x42,
+0x81,
+0xe7,
+0xa5,
+0x99,
+0x81,
+0x81,
+0x99,
+0x42,
+0x3c,
+0x00,
+0x00,
+0x00,
+
+0x00,
+0x00,
+0x3c,
+0x7e,
+0xff,
+0x99,
+0xdb,
+0xe7,
+0xff,
+0xff,
+0xe7,
+0x7e,
+0x3c,
+0x00,
+0x00,
+0x00,
+
+0x00,
+0x00,
+0x00,
+0x6c,
+0xfe,
+0xfe,
+0xfe,
+0xfe,
+0xfe,
+0x7c,
+0x38,
+0x10,
+0x00,
+0x00,
+0x00,
+0x00,
+
+0x00,
+0x00,
+0x00,
+0x00,
+0x10,
+0x38,
+0x7c,
+0xfe,
+0x7c,
+0x38,
+0x10,
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+
+0x00,
+0x00,
+0x38,
+0x38,
+0x10,
+0xd6,
+0xfe,
+0xd6,
+0x10,
+0x10,
+0x38,
+0x7c,
+0x00,
+0x00,
+0x00,
+0x00,
+
+0x00,
+0x00,
+0x10,
+0x38,
+0x7c,
+0xfe,
+0xfe,
+0x54,
+0x10,
+0x10,
+0x38,
+0x7c,
+0x00,
+0x00,
+0x00,
+0x00,
+
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+0x18,
+0x3c,
+0x3c,
+0x18,
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+
+0xff,
+0xff,
+0xff,
+0xff,
+0xff,
+0xff,
+0xe7,
+0xc3,
+0xc3,
+0xe7,
+0xff,
+0xff,
+0xff,
+0xff,
+0xff,
+0xff,
+
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+0x3c,
+0x66,
+0x42,
+0x42,
+0x66,
+0x3c,
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+
+0xff,
+0xff,
+0xff,
+0xff,
+0xff,
+0xc3,
+0x99,
+0xbd,
+0xbd,
+0x99,
+0xc3,
+0xff,
+0xff,
+0xff,
+0xff,
+0xff,
+
+0x00,
+0x00,
+0x0f,
+0x07,
+0x0d,
+0x18,
+0x78,
+0xcc,
+0xcc,
+0xcc,
+0xcc,
+0x78,
+0x00,
+0x00,
+0x00,
+0x00,
+
+0x00,
+0x00,
+0x3c,
+0x66,
+0x66,
+0x66,
+0x3c,
+0x18,
+0x7e,
+0x18,
+0x18,
+0x18,
+0x00,
+0x00,
+0x00,
+0x00,
+
+0x00,
+0x08,
+0x0c,
+0x0a,
+0x0a,
+0x0a,
+0x08,
+0x08,
+0x08,
+0x38,
+0x78,
+0x30,
+0x00,
+0x00,
+0x00,
+0x00,
+
+0x00,
+0x10,
+0x18,
+0x1c,
+0x1e,
+0x1e,
+0x16,
+0x12,
+0x72,
+0xf2,
+0x62,
+0x0e,
+0x1e,
+0x0c,
+0x00,
+0x00,
+
+0x00,
+0x00,
+0x00,
+0x10,
+0x92,
+0x54,
+0x38,
+0xfe,
+0x38,
+0x54,
+0x92,
+0x10,
+0x00,
+0x00,
+0x00,
+0x00,
+
+0x00,
+0x00,
+0x00,
+0x80,
+0xc0,
+0xe0,
+0xb8,
+0x8e,
+0xb8,
+0xe0,
+0xc0,
+0x80,
+0x00,
+0x00,
+0x00,
+0x00,
+
+0x00,
+0x00,
+0x00,
+0x02,
+0x06,
+0x0e,
+0x3a,
+0xe2,
+0x3a,
+0x0e,
+0x06,
+0x02,
+0x00,
+0x00,
+0x00,
+0x00,
+
+0x00,
+0x00,
+0x10,
+0x38,
+0x7c,
+0xd6,
+0x10,
+0x10,
+0x10,
+0x10,
+0xd6,
+0x7c,
+0x38,
+0x10,
+0x00,
+0x00,
+
+0x00,
+0x42,
+0xe7,
+0xe7,
+0xe7,
+0xe7,
+0x42,
+0x42,
+0x42,
+0x00,
+0x66,
+0x66,
+0x66,
+0x00,
+0x00,
+0x00,
+
+0x00,
+0x7f,
+0xca,
+0xca,
+0xca,
+0xca,
+0x7a,
+0x0a,
+0x0a,
+0x0a,
+0x0a,
+0x0a,
+0x1b,
+0x00,
+0x00,
+0x00,
+
+0x00,
+0x1e,
+0x31,
+0x78,
+0xcc,
+0xc6,
+0xc3,
+0x63,
+0x33,
+0x1e,
+0x8c,
+0x78,
+0x00,
+0x00,
+0x00,
+0x00,
+
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+0xfe,
+0xfe,
+0xfe,
+0xfe,
+0x00,
+0x00,
+0x00,
+0x00,
+
+0x00,
+0x00,
+0x10,
+0x38,
+0x7c,
+0xd6,
+0x10,
+0x10,
+0x10,
+0x10,
+0xd6,
+0x7c,
+0x38,
+0x10,
+0xfe,
+0x00,
+
+0x00,
+0x00,
+0x10,
+0x38,
+0x7c,
+0xd6,
+0x10,
+0x10,
+0x10,
+0x10,
+0x10,
+0x10,
+0x10,
+0x10,
+0x00,
+0x00,
+
+0x00,
+0x00,
+0x10,
+0x10,
+0x10,
+0x10,
+0x10,
+0x10,
+0x10,
+0x10,
+0xd6,
+0x7c,
+0x38,
+0x10,
+0x00,
+0x00,
+
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+0x08,
+0x0c,
+0x06,
+0xff,
+0x06,
+0x0c,
+0x08,
+0x00,
+0x00,
+0x00,
+0x00,
+
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+0x10,
+0x30,
+0x60,
+0xff,
+0x60,
+0x30,
+0x10,
+0x00,
+0x00,
+0x00,
+0x00,
+
+0x22,
+0x44,
+0x88,
+0xcc,
+0xee,
+0x44,
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+0x24,
+0x42,
+0xff,
+0x42,
+0x24,
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+
+0x00,
+0x00,
+0x00,
+0x10,
+0x38,
+0x38,
+0x6c,
+0x6c,
+0xc6,
+0xfe,
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+
+0x00,
+0x00,
+0x00,
+0xfe,
+0xc6,
+0x6c,
+0x6c,
+0x38,
+0x38,
+0x10,
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+
+0x00,
+0x18,
+0x3c,
+0x3c,
+0x3c,
+0x3c,
+0x18,
+0x18,
+0x18,
+0x10,
+0x00,
+0x18,
+0x18,
+0x00,
+0x00,
+0x00,
+
+0x22,
+0x77,
+0x33,
+0x11,
+0x22,
+0x44,
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+
+0x00,
+0x00,
+0x12,
+0x12,
+0x12,
+0x7f,
+0x24,
+0x24,
+0x24,
+0xfe,
+0x48,
+0x48,
+0x48,
+0x00,
+0x00,
+0x00,
+
+0x10,
+0x10,
+0x7c,
+0xd2,
+0xd0,
+0xd0,
+0xd0,
+0x7c,
+0x16,
+0x16,
+0x16,
+0x96,
+0x7c,
+0x10,
+0x10,
+0x00,
+
+0x00,
+0x42,
+0xbe,
+0x44,
+0x0c,
+0x08,
+0x18,
+0x10,
+0x30,
+0x20,
+0x64,
+0x4a,
+0xc4,
+0x00,
+0x00,
+0x00,
+
+0x00,
+0x38,
+0x6c,
+0x6c,
+0x6c,
+0x38,
+0x37,
+0x72,
+0xdc,
+0xcc,
+0xcc,
+0xcc,
+0x77,
+0x00,
+0x00,
+0x00,
+
+0x10,
+0x38,
+0x18,
+0x08,
+0x10,
+0x20,
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+
+0x00,
+0x04,
+0x08,
+0x10,
+0x10,
+0x30,
+0x30,
+0x30,
+0x30,
+0x30,
+0x10,
+0x10,
+0x08,
+0x04,
+0x00,
+0x00,
+
+0x00,
+0x20,
+0x10,
+0x08,
+0x08,
+0x0c,
+0x0c,
+0x0c,
+0x0c,
+0x0c,
+0x08,
+0x08,
+0x10,
+0x20,
+0x00,
+0x00,
+
+0x00,
+0x00,
+0x00,
+0x00,
+0x44,
+0x28,
+0x38,
+0xfe,
+0x38,
+0x28,
+0x44,
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+0x18,
+0x18,
+0x7e,
+0x18,
+0x18,
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+0x10,
+0x38,
+0x18,
+0x08,
+0x10,
+0x20,
+
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+0x7e,
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+0x10,
+0x38,
+0x10,
+0x00,
+0x00,
+0x00,
+
+0x00,
+0x06,
+0x06,
+0x0c,
+0x0c,
+0x18,
+0x18,
+0x30,
+0x30,
+0x60,
+0x60,
+0xc0,
+0xc0,
+0x00,
+0x00,
+0x00,
+
+0x00,
+0x00,
+0x00,
+0x00,
+0x3c,
+0x46,
+0xc6,
+0xc6,
+0xc6,
+0xc6,
+0xc6,
+0xc4,
+0x78,
+0x00,
+0x00,
+0x00,
+
+0x00,
+0x00,
+0x00,
+0x00,
+0x08,
+0x18,
+0x78,
+0x18,
+0x18,
+0x18,
+0x18,
+0x18,
+0x7e,
+0x00,
+0x00,
+0x00,
+
+0x00,
+0x00,
+0x00,
+0x00,
+0x7c,
+0x86,
+0x06,
+0x0c,
+0x18,
+0x20,
+0x40,
+0xc1,
+0xfe,
+0x00,
+0x00,
+0x00,
+
+0x00,
+0x00,
+0x00,
+0x00,
+0x3c,
+0x46,
+0x04,
+0x08,
+0x1c,
+0x06,
+0x06,
+0x06,
+0x06,
+0x0c,
+0x70,
+0x00,
+
+0x00,
+0x00,
+0x00,
+0x00,
+0x04,
+0x08,
+0x10,
+0x2c,
+0x4c,
+0x8c,
+0x8c,
+0xfe,
+0x0c,
+0x0c,
+0x0c,
+0x00,
+
+0x00,
+0x00,
+0x00,
+0x02,
+0x3c,
+0x20,
+0x20,
+0x70,
+0x0c,
+0x06,
+0x06,
+0x06,
+0x06,
+0x0c,
+0x70,
+0x00,
+
+0x00,
+0x00,
+0x18,
+0x20,
+0x40,
+0xc0,
+0xdc,
+0xc6,
+0xc6,
+0xc6,
+0xc6,
+0x44,
+0x38,
+0x00,
+0x00,
+0x00,
+
+0x00,
+0x00,
+0x00,
+0x40,
+0x7e,
+0x82,
+0x06,
+0x04,
+0x0c,
+0x18,
+0x18,
+0x30,
+0x30,
+0x30,
+0x30,
+0x00,
+
+0x00,
+0x00,
+0x7c,
+0xc6,
+0xc6,
+0x64,
+0x38,
+0x4c,
+0xc6,
+0xc6,
+0xc6,
+0xc6,
+0x7c,
+0x00,
+0x00,
+0x00,
+
+0x00,
+0x00,
+0x00,
+0x00,
+0x38,
+0x44,
+0xc6,
+0xc6,
+0x76,
+0x06,
+0x06,
+0x06,
+0x04,
+0x08,
+0x30,
+0x00,
+
+0x00,
+0x00,
+0x00,
+0x00,
+0x10,
+0x38,
+0x10,
+0x00,
+0x00,
+0x00,
+0x10,
+0x38,
+0x10,
+0x00,
+0x00,
+0x00,
+
+0x00,
+0x00,
+0x00,
+0x00,
+0x10,
+0x38,
+0x10,
+0x00,
+0x00,
+0x00,
+0x10,
+0x38,
+0x18,
+0x08,
+0x10,
+0x20,
+
+0x00,
+0x06,
+0x0c,
+0x18,
+0x30,
+0x60,
+0xa0,
+0xa0,
+0x60,
+0x30,
+0x18,
+0x0c,
+0x06,
+0x00,
+0x00,
+0x00,
+
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+0x7e,
+0x00,
+0x00,
+0x7e,
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+
+0x00,
+0x60,
+0x30,
+0x18,
+0x0c,
+0x06,
+0x05,
+0x05,
+0x06,
+0x0c,
+0x18,
+0x30,
+0x60,
+0x00,
+0x00,
+0x00,
+
+0x00,
+0x7c,
+0x86,
+0xc6,
+0x06,
+0x04,
+0x08,
+0x10,
+0x10,
+0x18,
+0x00,
+0x18,
+0x18,
+0x00,
+0x00,
+0x00,
+
+0x00,
+0x00,
+0x3c,
+0x46,
+0xc6,
+0xce,
+0xd6,
+0xd6,
+0xd6,
+0xdc,
+0xc0,
+0xc4,
+0x78,
+0x00,
+0x00,
+0x00,
+
+0x00,
+0x18,
+0x18,
+0x18,
+0x3c,
+0x2c,
+0x2c,
+0x2c,
+0x7e,
+0x46,
+0x46,
+0x46,
+0xef,
+0x00,
+0x00,
+0x00,
+
+0x00,
+0xfc,
+0x66,
+0x66,
+0x66,
+0x66,
+0x7c,
+0x66,
+0x66,
+0x66,
+0x66,
+0x66,
+0xfc,
+0x00,
+0x00,
+0x00,
+
+0x00,
+0x3a,
+0x66,
+0xc2,
+0xc0,
+0xc0,
+0xc0,
+0xc0,
+0xc0,
+0xc0,
+0xc0,
+0x62,
+0x3c,
+0x00,
+0x00,
+0x00,
+
+0x00,
+0xfc,
+0x66,
+0x63,
+0x63,
+0x63,
+0x63,
+0x63,
+0x63,
+0x63,
+0x63,
+0x66,
+0xfc,
+0x00,
+0x00,
+0x00,
+
+0x00,
+0xff,
+0x61,
+0x60,
+0x60,
+0x64,
+0x7c,
+0x64,
+0x60,
+0x60,
+0x60,
+0x61,
+0xfe,
+0x00,
+0x00,
+0x00,
+
+0x00,
+0xff,
+0x61,
+0x61,
+0x60,
+0x64,
+0x7c,
+0x64,
+0x60,
+0x60,
+0x60,
+0x60,
+0xf0,
+0x00,
+0x00,
+0x00,
+
+0x00,
+0x3a,
+0x66,
+0xc2,
+0xc0,
+0xc0,
+0xc0,
+0xcf,
+0xc6,
+0xc6,
+0xc6,
+0x66,
+0x38,
+0x00,
+0x00,
+0x00,
+
+0x00,
+0xf7,
+0x62,
+0x62,
+0x62,
+0x62,
+0x7e,
+0x62,
+0x62,
+0x62,
+0x62,
+0x62,
+0xf7,
+0x00,
+0x00,
+0x00,
+
+0x00,
+0x3c,
+0x18,
+0x18,
+0x18,
+0x18,
+0x18,
+0x18,
+0x18,
+0x18,
+0x18,
+0x18,
+0x3c,
+0x00,
+0x00,
+0x00,
+
+0x00,
+0x1e,
+0x0c,
+0x0c,
+0x0c,
+0x0c,
+0x0c,
+0x0c,
+0x0c,
+0x0c,
+0x0c,
+0x0c,
+0x0c,
+0x0c,
+0x08,
+0xf0,
+
+0x00,
+0xf7,
+0x64,
+0x6c,
+0x68,
+0x68,
+0x78,
+0x6c,
+0x6c,
+0x6c,
+0x66,
+0x66,
+0xf7,
+0x00,
+0x00,
+0x00,
+
+0x00,
+0xf8,
+0x60,
+0x60,
+0x60,
+0x60,
+0x60,
+0x60,
+0x60,
+0x60,
+0x60,
+0x61,
+0xfe,
+0x00,
+0x00,
+0x00,
+
+0x00,
+0xc3,
+0x66,
+0x76,
+0x7e,
+0x56,
+0x56,
+0x46,
+0x46,
+0x46,
+0x46,
+0x46,
+0xef,
+0x00,
+0x00,
+0x00,
+
+0x00,
+0xe7,
+0x62,
+0x62,
+0x72,
+0x52,
+0x5a,
+0x4a,
+0x4e,
+0x46,
+0x46,
+0x42,
+0xe2,
+0x00,
+0x00,
+0x00,
+
+0x00,
+0x3c,
+0x66,
+0xc3,
+0xc3,
+0xc3,
+0xc3,
+0xc3,
+0xc3,
+0xc3,
+0xc3,
+0x66,
+0x3c,
+0x00,
+0x00,
+0x00,
+
+0x00,
+0xfc,
+0x66,
+0x66,
+0x66,
+0x66,
+0x6c,
+0x60,
+0x60,
+0x60,
+0x60,
+0x60,
+0xf0,
+0x00,
+0x00,
+0x00,
+
+0x00,
+0x3c,
+0x66,
+0xc3,
+0xc3,
+0xc3,
+0xc3,
+0xc3,
+0xc3,
+0xc3,
+0xc3,
+0x66,
+0x3c,
+0x10,
+0x39,
+0x0e,
+
+0x00,
+0xfc,
+0x66,
+0x66,
+0x66,
+0x66,
+0x7c,
+0x6c,
+0x66,
+0x66,
+0x66,
+0x66,
+0xf3,
+0x00,
+0x00,
+0x00,
+
+0x00,
+0x7a,
+0xc6,
+0xc2,
+0xc0,
+0x70,
+0x3c,
+0x0e,
+0x06,
+0x06,
+0x86,
+0xc6,
+0xbc,
+0x00,
+0x00,
+0x00,
+
+0x00,
+0xff,
+0x99,
+0x18,
+0x18,
+0x18,
+0x18,
+0x18,
+0x18,
+0x18,
+0x18,
+0x18,
+0x3c,
+0x00,
+0x00,
+0x00,
+
+0x00,
+0xf7,
+0x62,
+0x62,
+0x62,
+0x62,
+0x62,
+0x62,
+0x62,
+0x62,
+0x62,
+0x62,
+0x3c,
+0x00,
+0x00,
+0x00,
+
+0x00,
+0xf7,
+0x62,
+0x62,
+0x62,
+0x76,
+0x34,
+0x34,
+0x34,
+0x3c,
+0x18,
+0x18,
+0x18,
+0x00,
+0x00,
+0x00,
+
+0x00,
+0xf7,
+0x62,
+0x62,
+0x62,
+0x62,
+0x6a,
+0x6a,
+0x6a,
+0x6a,
+0x7e,
+0x7e,
+0x34,
+0x00,
+0x00,
+0x00,
+
+0x00,
+0xf7,
+0x62,
+0x62,
+0x34,
+0x34,
+0x18,
+0x18,
+0x2c,
+0x2c,
+0x46,
+0x46,
+0xef,
+0x00,
+0x00,
+0x00,
+
+0x00,
+0xf7,
+0x62,
+0x62,
+0x62,
+0x34,
+0x34,
+0x18,
+0x18,
+0x18,
+0x18,
+0x18,
+0x3c,
+0x00,
+0x00,
+0x00,
+
+0x00,
+0x7f,
+0x46,
+0x86,
+0x0c,
+0x0c,
+0x18,
+0x18,
+0x30,
+0x30,
+0x61,
+0x62,
+0xfe,
+0x00,
+0x00,
+0x00,
+
+0x00,
+0x3c,
+0x30,
+0x30,
+0x30,
+0x30,
+0x30,
+0x30,
+0x30,
+0x30,
+0x30,
+0x30,
+0x3c,
+0x00,
+0x00,
+0x00,
+
+0x00,
+0xc0,
+0xc0,
+0x60,
+0x60,
+0x30,
+0x30,
+0x18,
+0x18,
+0x0c,
+0x0c,
+0x06,
+0x06,
+0x00,
+0x00,
+0x00,
+
+0x00,
+0x3c,
+0x0c,
+0x0c,
+0x0c,
+0x0c,
+0x0c,
+0x0c,
+0x0c,
+0x0c,
+0x0c,
+0x0c,
+0x3c,
+0x00,
+0x00,
+0x00,
+
+0x00,
+0x10,
+0x38,
+0x4c,
+0x86,
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+0xff,
+0x00,
+0x00,
+
+0x00,
+0x18,
+0x20,
+0x30,
+0x38,
+0x10,
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+0x78,
+0x8c,
+0x0c,
+0x3c,
+0xcc,
+0xcc,
+0xcd,
+0x76,
+0x00,
+0x00,
+0x00,
+
+0x00,
+0x20,
+0xe0,
+0x60,
+0x60,
+0x6c,
+0x76,
+0x66,
+0x66,
+0x66,
+0x66,
+0x76,
+0x6c,
+0x00,
+0x00,
+0x00,
+
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+0x3c,
+0x66,
+0x60,
+0x60,
+0x60,
+0x60,
+0x62,
+0x3c,
+0x00,
+0x00,
+0x00,
+
+0x00,
+0x04,
+0x1c,
+0x0c,
+0x0c,
+0x6c,
+0xdc,
+0xcc,
+0xcc,
+0xcc,
+0xcc,
+0xdc,
+0x66,
+0x00,
+0x00,
+0x00,
+
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+0x3c,
+0x66,
+0x7e,
+0x60,
+0x60,
+0x60,
+0x62,
+0x3c,
+0x00,
+0x00,
+0x00,
+
+0x00,
+0x1e,
+0x31,
+0x33,
+0x30,
+0x30,
+0x78,
+0x30,
+0x30,
+0x30,
+0x30,
+0x30,
+0x78,
+0x00,
+0x00,
+0x00,
+
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+0x7b,
+0xce,
+0xcc,
+0xcc,
+0xcc,
+0x78,
+0x60,
+0x7c,
+0x86,
+0xc6,
+0x7c,
+
+0x00,
+0x20,
+0xe0,
+0x60,
+0x60,
+0x6c,
+0x76,
+0x66,
+0x66,
+0x66,
+0x66,
+0x66,
+0xf7,
+0x00,
+0x00,
+0x00,
+
+0x00,
+0x10,
+0x38,
+0x10,
+0x00,
+0x18,
+0x38,
+0x18,
+0x18,
+0x18,
+0x18,
+0x18,
+0x3c,
+0x00,
+0x00,
+0x00,
+
+0x00,
+0x08,
+0x1c,
+0x08,
+0x00,
+0x0c,
+0x1c,
+0x0c,
+0x0c,
+0x0c,
+0x0c,
+0x0c,
+0x6c,
+0x4c,
+0x38,
+0x00,
+
+0x00,
+0x20,
+0xe0,
+0x60,
+0x60,
+0x67,
+0x66,
+0x6c,
+0x78,
+0x6c,
+0x6c,
+0x66,
+0xe7,
+0x00,
+0x00,
+0x00,
+
+0x00,
+0x08,
+0x38,
+0x18,
+0x18,
+0x18,
+0x18,
+0x18,
+0x18,
+0x18,
+0x18,
+0x18,
+0x3c,
+0x00,
+0x00,
+0x00,
+
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+0x6a,
+0xfe,
+0x6a,
+0x6a,
+0x6a,
+0x62,
+0x62,
+0xf7,
+0x00,
+0x00,
+0x00,
+
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+0x5c,
+0xf6,
+0x66,
+0x66,
+0x66,
+0x66,
+0x66,
+0xf7,
+0x00,
+0x00,
+0x00,
+
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+0x3c,
+0x66,
+0x66,
+0x66,
+0x66,
+0x66,
+0x66,
+0x3c,
+0x00,
+0x00,
+0x00,
+
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+0x5c,
+0xe6,
+0x66,
+0x66,
+0x66,
+0x66,
+0x66,
+0x7c,
+0x60,
+0x60,
+0xf0,
+
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+0x76,
+0xcc,
+0xcc,
+0xcc,
+0xcc,
+0xcc,
+0xcc,
+0x7c,
+0x0c,
+0x0c,
+0x1e,
+
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+0x5e,
+0xf6,
+0x60,
+0x60,
+0x60,
+0x60,
+0x60,
+0xf0,
+0x00,
+0x00,
+0x00,
+
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+0x7a,
+0xc6,
+0x72,
+0x1c,
+0x06,
+0x86,
+0xc6,
+0xbc,
+0x00,
+0x00,
+0x00,
+
+0x00,
+0x00,
+0x00,
+0x10,
+0x30,
+0x7c,
+0x30,
+0x30,
+0x30,
+0x30,
+0x30,
+0x34,
+0x18,
+0x00,
+0x00,
+0x00,
+
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+0xee,
+0x66,
+0x66,
+0x66,
+0x66,
+0x66,
+0x67,
+0x3a,
+0x00,
+0x00,
+0x00,
+
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+0xf7,
+0x62,
+0x76,
+0x34,
+0x34,
+0x3c,
+0x18,
+0x18,
+0x00,
+0x00,
+0x00,
+
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+0xf7,
+0x62,
+0x6a,
+0x6a,
+0x6a,
+0x6a,
+0x7e,
+0x24,
+0x00,
+0x00,
+0x00,
+
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+0xf7,
+0x62,
+0x34,
+0x18,
+0x2c,
+0x46,
+0x46,
+0xef,
+0x00,
+0x00,
+0x00,
+
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+0xf7,
+0x62,
+0x62,
+0x34,
+0x34,
+0x18,
+0x18,
+0x18,
+0x10,
+0xb0,
+0xe0,
+
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+0xfe,
+0x8c,
+0x18,
+0x30,
+0x30,
+0x60,
+0xc2,
+0xfe,
+0x00,
+0x00,
+0x00,
+
+0x00,
+0x0e,
+0x18,
+0x10,
+0x10,
+0x08,
+0x70,
+0x70,
+0x08,
+0x10,
+0x10,
+0x18,
+0x0e,
+0x00,
+0x00,
+0x00,
+
+0x18,
+0x18,
+0x18,
+0x18,
+0x18,
+0x18,
+0x18,
+0x18,
+0x18,
+0x18,
+0x18,
+0x18,
+0x18,
+0x18,
+0x00,
+0x00,
+
+0x00,
+0x70,
+0x18,
+0x08,
+0x08,
+0x10,
+0x0e,
+0x0e,
+0x10,
+0x08,
+0x08,
+0x18,
+0x70,
+0x00,
+0x00,
+0x00,
+
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+0x76,
+0xdc,
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+
+0x00,
+0x00,
+0x00,
+0x00,
+0x10,
+0x38,
+0x6c,
+0xc6,
+0xc6,
+0xc6,
+0xfe,
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+
+0x00,
+0x00,
+0x3a,
+0x66,
+0xc2,
+0xc0,
+0xc0,
+0xc0,
+0xc0,
+0xc0,
+0x62,
+0x3c,
+0x18,
+0x0c,
+0x24,
+0x18,
+
+0x00,
+0x00,
+0x66,
+0x00,
+0x00,
+0xee,
+0x66,
+0x66,
+0x66,
+0x66,
+0x66,
+0x66,
+0x3b,
+0x00,
+0x00,
+0x00,
+
+0x00,
+0x0c,
+0x18,
+0x20,
+0x00,
+0x3c,
+0x66,
+0x7e,
+0x60,
+0x60,
+0x60,
+0x62,
+0x3c,
+0x00,
+0x00,
+0x00,
+
+0x00,
+0x30,
+0x58,
+0x8c,
+0x00,
+0x78,
+0x8c,
+0x0c,
+0x3c,
+0xcc,
+0xcc,
+0xcd,
+0x76,
+0x00,
+0x00,
+0x00,
+
+0x00,
+0x00,
+0x66,
+0x00,
+0x00,
+0x78,
+0x8c,
+0x0c,
+0x3c,
+0xcc,
+0xcc,
+0xcd,
+0x76,
+0x00,
+0x00,
+0x00,
+
+0x00,
+0x30,
+0x18,
+0x04,
+0x00,
+0x78,
+0x8c,
+0x0c,
+0x3c,
+0xcc,
+0xcc,
+0xcd,
+0x76,
+0x00,
+0x00,
+0x00,
+
+0x38,
+0x44,
+0x44,
+0x38,
+0x00,
+0x78,
+0x8c,
+0x0c,
+0x3c,
+0xcc,
+0xcc,
+0xcd,
+0x76,
+0x00,
+0x00,
+0x00,
+
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+0x3c,
+0x66,
+0x60,
+0x60,
+0x60,
+0x60,
+0x62,
+0x3c,
+0x08,
+0x24,
+0x18,
+
+0x00,
+0x18,
+0x2c,
+0x46,
+0x00,
+0x3c,
+0x66,
+0x7e,
+0x60,
+0x60,
+0x60,
+0x62,
+0x3c,
+0x00,
+0x00,
+0x00,
+
+0x00,
+0x00,
+0x66,
+0x00,
+0x00,
+0x3c,
+0x66,
+0x7e,
+0x60,
+0x60,
+0x60,
+0x62,
+0x3c,
+0x00,
+0x00,
+0x00,
+
+0x00,
+0x30,
+0x18,
+0x04,
+0x00,
+0x3c,
+0x66,
+0x7e,
+0x60,
+0x60,
+0x60,
+0x62,
+0x3c,
+0x00,
+0x00,
+0x00,
+
+0x00,
+0x00,
+0x66,
+0x00,
+0x00,
+0x38,
+0x18,
+0x18,
+0x18,
+0x18,
+0x18,
+0x18,
+0x3c,
+0x00,
+0x00,
+0x00,
+
+0x00,
+0x18,
+0x2c,
+0x46,
+0x00,
+0x38,
+0x18,
+0x18,
+0x18,
+0x18,
+0x18,
+0x18,
+0x3c,
+0x00,
+0x00,
+0x00,
+
+0x00,
+0x60,
+0x30,
+0x08,
+0x00,
+0x38,
+0x18,
+0x18,
+0x18,
+0x18,
+0x18,
+0x18,
+0x3c,
+0x00,
+0x00,
+0x00,
+
+0x66,
+0x18,
+0x18,
+0x18,
+0x3c,
+0x2c,
+0x2c,
+0x2c,
+0x7e,
+0x46,
+0x46,
+0x46,
+0xef,
+0x00,
+0x00,
+0x00,
+
+0x18,
+0x24,
+0x18,
+0x18,
+0x3c,
+0x2c,
+0x2c,
+0x2c,
+0x7e,
+0x46,
+0x46,
+0x46,
+0xef,
+0x00,
+0x00,
+0x00,
+
+0x0c,
+0x18,
+0xff,
+0x61,
+0x60,
+0x60,
+0x64,
+0x7c,
+0x64,
+0x60,
+0x60,
+0x61,
+0xfe,
+0x00,
+0x00,
+0x00,
+
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+0x76,
+0x9b,
+0x1b,
+0x3f,
+0xd8,
+0xd8,
+0xd9,
+0x6e,
+0x00,
+0x00,
+0x00,
+
+0x00,
+0x1f,
+0x1d,
+0x1d,
+0x3c,
+0x2c,
+0x2e,
+0x2c,
+0x7c,
+0x4c,
+0x4c,
+0x4d,
+0xef,
+0x00,
+0x00,
+0x00,
+
+0x00,
+0x18,
+0x2c,
+0x46,
+0x00,
+0x3c,
+0x66,
+0x66,
+0x66,
+0x66,
+0x66,
+0x66,
+0x3c,
+0x00,
+0x00,
+0x00,
+
+0x00,
+0x00,
+0x66,
+0x00,
+0x00,
+0x3c,
+0x66,
+0x66,
+0x66,
+0x66,
+0x66,
+0x66,
+0x3c,
+0x00,
+0x00,
+0x00,
+
+0x00,
+0x30,
+0x18,
+0x04,
+0x00,
+0x3c,
+0x66,
+0x66,
+0x66,
+0x66,
+0x66,
+0x66,
+0x3c,
+0x00,
+0x00,
+0x00,
+
+0x00,
+0x18,
+0x2c,
+0x46,
+0x00,
+0xee,
+0x66,
+0x66,
+0x66,
+0x66,
+0x66,
+0x67,
+0x3a,
+0x00,
+0x00,
+0x00,
+
+0x00,
+0x30,
+0x18,
+0x04,
+0x00,
+0xee,
+0x66,
+0x66,
+0x66,
+0x66,
+0x66,
+0x67,
+0x3a,
+0x00,
+0x00,
+0x00,
+
+0x00,
+0x00,
+0x66,
+0x00,
+0x00,
+0xf7,
+0x62,
+0x62,
+0x34,
+0x34,
+0x18,
+0x18,
+0x18,
+0x10,
+0xb0,
+0xe0,
+
+0x66,
+0x00,
+0x3c,
+0x66,
+0xc3,
+0xc3,
+0xc3,
+0xc3,
+0xc3,
+0xc3,
+0xc3,
+0x66,
+0x3c,
+0x00,
+0x00,
+0x00,
+
+0x66,
+0x00,
+0xf7,
+0x62,
+0x62,
+0x62,
+0x62,
+0x62,
+0x62,
+0x62,
+0x62,
+0x62,
+0x3c,
+0x00,
+0x00,
+0x00,
+
+0x00,
+0x00,
+0x10,
+0x10,
+0x10,
+0x7c,
+0xc6,
+0xc0,
+0xc0,
+0xc0,
+0xc0,
+0xc2,
+0x7c,
+0x10,
+0x10,
+0x00,
+
+0x00,
+0x38,
+0x64,
+0x6c,
+0x60,
+0x60,
+0xf0,
+0x60,
+0x60,
+0x60,
+0x60,
+0x66,
+0xfc,
+0x00,
+0x00,
+0x00,
+
+0x00,
+0x81,
+0xc3,
+0x66,
+0x3c,
+0x18,
+0xff,
+0x18,
+0x18,
+0xff,
+0x18,
+0x18,
+0x18,
+0x00,
+0x00,
+0x00,
+
+0x00,
+0xfe,
+0x63,
+0x63,
+0x63,
+0x63,
+0x6e,
+0x60,
+0x64,
+0x6e,
+0x64,
+0x64,
+0xf5,
+0x06,
+0x00,
+0x00,
+
+0x00,
+0x0e,
+0x19,
+0x1b,
+0x18,
+0x18,
+0x3c,
+0x18,
+0x18,
+0x18,
+0x18,
+0xd8,
+0x98,
+0x70,
+0x00,
+0x00,
+
+0x00,
+0x0c,
+0x18,
+0x20,
+0x00,
+0x78,
+0x8c,
+0x0c,
+0x3c,
+0xcc,
+0xcc,
+0xcd,
+0x76,
+0x00,
+0x00,
+0x00,
+
+0x00,
+0x06,
+0x0c,
+0x10,
+0x00,
+0x38,
+0x18,
+0x18,
+0x18,
+0x18,
+0x18,
+0x18,
+0x3c,
+0x00,
+0x00,
+0x00,
+
+0x00,
+0x0c,
+0x18,
+0x20,
+0x00,
+0x3c,
+0x66,
+0x66,
+0x66,
+0x66,
+0x66,
+0x66,
+0x3c,
+0x00,
+0x00,
+0x00,
+
+0x00,
+0x0c,
+0x18,
+0x20,
+0x00,
+0xee,
+0x66,
+0x66,
+0x66,
+0x66,
+0x66,
+0x67,
+0x3a,
+0x00,
+0x00,
+0x00,
+
+0x00,
+0x00,
+0x32,
+0x4c,
+0x00,
+0x5c,
+0xf6,
+0x66,
+0x66,
+0x66,
+0x66,
+0x66,
+0xf7,
+0x00,
+0x00,
+0x00,
+
+0x32,
+0x4c,
+0x00,
+0xe7,
+0x72,
+0x52,
+0x5a,
+0x4a,
+0x4e,
+0x46,
+0x46,
+0x42,
+0xe2,
+0x00,
+0x00,
+0x00,
+
+0x00,
+0x78,
+0x8c,
+0x0c,
+0x3c,
+0xcc,
+0xcc,
+0xcd,
+0x76,
+0x00,
+0xfe,
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+
+0x00,
+0x3c,
+0x66,
+0x66,
+0x66,
+0x66,
+0x66,
+0x66,
+0x3c,
+0x00,
+0x7e,
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+
+0x00,
+0x30,
+0x30,
+0x00,
+0x30,
+0x10,
+0x10,
+0x20,
+0x40,
+0xc0,
+0xc6,
+0xc2,
+0x7c,
+0x00,
+0x00,
+0x00,
+
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+0xfe,
+0xc0,
+0xc0,
+0xc0,
+0xc0,
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+0xfe,
+0x06,
+0x06,
+0x06,
+0x06,
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+
+0x00,
+0x20,
+0xe0,
+0x63,
+0x66,
+0xfc,
+0x18,
+0x30,
+0x60,
+0xce,
+0x93,
+0x06,
+0x0c,
+0x1f,
+0x00,
+0x00,
+
+0x00,
+0x20,
+0xe0,
+0x63,
+0x66,
+0xfc,
+0x18,
+0x30,
+0x64,
+0xc8,
+0x96,
+0x3f,
+0x06,
+0x06,
+0x00,
+0x00,
+
+0x00,
+0x18,
+0x18,
+0x00,
+0x08,
+0x18,
+0x18,
+0x18,
+0x3c,
+0x3c,
+0x3c,
+0x3c,
+0x18,
+0x00,
+0x00,
+0x00,
+
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+0x36,
+0x6c,
+0xd8,
+0xd8,
+0x6c,
+0x36,
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+0xd8,
+0x6c,
+0x36,
+0x36,
+0x6c,
+0xd8,
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+
+0x82,
+0x10,
+0x82,
+0x10,
+0x82,
+0x10,
+0x82,
+0x10,
+0x82,
+0x10,
+0x82,
+0x10,
+0x82,
+0x10,
+0x82,
+0x10,
+
+0x00,
+0x95,
+0x00,
+0xa9,
+0x00,
+0x95,
+0x00,
+0xa9,
+0x00,
+0x95,
+0x00,
+0xa9,
+0x00,
+0x95,
+0x00,
+0xa9,
+
+0x92,
+0x49,
+0x92,
+0x49,
+0x92,
+0x49,
+0x92,
+0x49,
+0x92,
+0x49,
+0x92,
+0x49,
+0x92,
+0x49,
+0x92,
+0x49,
+
+0x18,
+0x18,
+0x18,
+0x18,
+0x18,
+0x18,
+0x18,
+0x18,
+0x18,
+0x18,
+0x18,
+0x18,
+0x18,
+0x18,
+0x18,
+0x18,
+
+0x18,
+0x18,
+0x18,
+0x18,
+0x18,
+0x18,
+0x18,
+0xf8,
+0x18,
+0x18,
+0x18,
+0x18,
+0x18,
+0x18,
+0x18,
+0x18,
+
+0x18,
+0x18,
+0x18,
+0x18,
+0x18,
+0x18,
+0xf8,
+0x18,
+0x18,
+0xf8,
+0x18,
+0x18,
+0x18,
+0x18,
+0x18,
+0x18,
+
+0x66,
+0x66,
+0x66,
+0x66,
+0x66,
+0x66,
+0x66,
+0xe6,
+0x66,
+0x66,
+0x66,
+0x66,
+0x66,
+0x66,
+0x66,
+0x66,
+
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+0xfe,
+0x66,
+0x66,
+0x66,
+0x66,
+0x66,
+0x66,
+0x66,
+0x66,
+
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+0xf8,
+0x18,
+0x18,
+0xf8,
+0x18,
+0x18,
+0x18,
+0x18,
+0x18,
+0x18,
+
+0x66,
+0x66,
+0x66,
+0x66,
+0x66,
+0x66,
+0xe6,
+0x06,
+0x06,
+0xe6,
+0x66,
+0x66,
+0x66,
+0x66,
+0x66,
+0x66,
+
+0x66,
+0x66,
+0x66,
+0x66,
+0x66,
+0x66,
+0x66,
+0x66,
+0x66,
+0x66,
+0x66,
+0x66,
+0x66,
+0x66,
+0x66,
+0x66,
+
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+0xfe,
+0x06,
+0x06,
+0xe6,
+0x66,
+0x66,
+0x66,
+0x66,
+0x66,
+0x66,
+
+0x66,
+0x66,
+0x66,
+0x66,
+0x66,
+0x66,
+0xe6,
+0x06,
+0x06,
+0xfe,
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+
+0x66,
+0x66,
+0x66,
+0x66,
+0x66,
+0x66,
+0x66,
+0xfe,
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+
+0x18,
+0x18,
+0x18,
+0x18,
+0x18,
+0x18,
+0xf8,
+0x18,
+0x18,
+0xf8,
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+0xf8,
+0x18,
+0x18,
+0x18,
+0x18,
+0x18,
+0x18,
+0x18,
+0x18,
+
+0x18,
+0x18,
+0x18,
+0x18,
+0x18,
+0x18,
+0x18,
+0x1f,
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+
+0x18,
+0x18,
+0x18,
+0x18,
+0x18,
+0x18,
+0x18,
+0xff,
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+0xff,
+0x18,
+0x18,
+0x18,
+0x18,
+0x18,
+0x18,
+0x18,
+0x18,
+
+0x18,
+0x18,
+0x18,
+0x18,
+0x18,
+0x18,
+0x18,
+0x1f,
+0x18,
+0x18,
+0x18,
+0x18,
+0x18,
+0x18,
+0x18,
+0x18,
+
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+0xff,
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+
+0x18,
+0x18,
+0x18,
+0x18,
+0x18,
+0x18,
+0x18,
+0xff,
+0x18,
+0x18,
+0x18,
+0x18,
+0x18,
+0x18,
+0x18,
+0x18,
+
+0x18,
+0x18,
+0x18,
+0x18,
+0x18,
+0x18,
+0x1f,
+0x18,
+0x18,
+0x1f,
+0x18,
+0x18,
+0x18,
+0x18,
+0x18,
+0x18,
+
+0x66,
+0x66,
+0x66,
+0x66,
+0x66,
+0x66,
+0x66,
+0x67,
+0x66,
+0x66,
+0x66,
+0x66,
+0x66,
+0x66,
+0x66,
+0x66,
+
+0x66,
+0x66,
+0x66,
+0x66,
+0x66,
+0x66,
+0x67,
+0x60,
+0x60,
+0x7f,
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+0x7f,
+0x60,
+0x60,
+0x67,
+0x66,
+0x66,
+0x66,
+0x66,
+0x66,
+0x66,
+
+0x66,
+0x66,
+0x66,
+0x66,
+0x66,
+0x66,
+0xe7,
+0x00,
+0x00,
+0xff,
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+0xff,
+0x00,
+0x00,
+0xe7,
+0x66,
+0x66,
+0x66,
+0x66,
+0x66,
+0x66,
+
+0x66,
+0x66,
+0x66,
+0x66,
+0x66,
+0x66,
+0x67,
+0x60,
+0x60,
+0x67,
+0x66,
+0x66,
+0x66,
+0x66,
+0x66,
+0x66,
+
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+0xff,
+0x00,
+0x00,
+0xff,
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+
+0x66,
+0x66,
+0x66,
+0x66,
+0x66,
+0x66,
+0xe7,
+0x00,
+0x00,
+0xe7,
+0x66,
+0x66,
+0x66,
+0x66,
+0x66,
+0x66,
+
+0x18,
+0x18,
+0x18,
+0x18,
+0x18,
+0x18,
+0xff,
+0x00,
+0x00,
+0xff,
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+
+0x66,
+0x66,
+0x66,
+0x66,
+0x66,
+0x66,
+0x66,
+0xff,
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+0xff,
+0x00,
+0x00,
+0xff,
+0x18,
+0x18,
+0x18,
+0x18,
+0x18,
+0x18,
+
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+0xff,
+0x66,
+0x66,
+0x66,
+0x66,
+0x66,
+0x66,
+0x66,
+0x66,
+
+0x66,
+0x66,
+0x66,
+0x66,
+0x66,
+0x66,
+0x66,
+0x7f,
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+
+0x18,
+0x18,
+0x18,
+0x18,
+0x18,
+0x18,
+0x1f,
+0x18,
+0x18,
+0x1f,
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+0x1f,
+0x18,
+0x18,
+0x1f,
+0x18,
+0x18,
+0x18,
+0x18,
+0x18,
+0x18,
+
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+0x7f,
+0x66,
+0x66,
+0x66,
+0x66,
+0x66,
+0x66,
+0x66,
+0x66,
+
+0x66,
+0x66,
+0x66,
+0x66,
+0x66,
+0x66,
+0x66,
+0xff,
+0x66,
+0x66,
+0x66,
+0x66,
+0x66,
+0x66,
+0x66,
+0x66,
+
+0x18,
+0x18,
+0x18,
+0x18,
+0x18,
+0x18,
+0xff,
+0x00,
+0x00,
+0xff,
+0x18,
+0x18,
+0x18,
+0x18,
+0x18,
+0x18,
+
+0x18,
+0x18,
+0x18,
+0x18,
+0x18,
+0x18,
+0x18,
+0xf8,
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+0x1f,
+0x18,
+0x18,
+0x18,
+0x18,
+0x18,
+0x18,
+0x18,
+0x18,
+
+0xff,
+0xff,
+0xff,
+0xff,
+0xff,
+0xff,
+0xff,
+0xff,
+0xff,
+0xff,
+0xff,
+0xff,
+0xff,
+0xff,
+0xff,
+0xff,
+
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+0xff,
+0xff,
+0xff,
+0xff,
+0xff,
+0xff,
+0xff,
+0xff,
+
+0xf0,
+0xf0,
+0xf0,
+0xf0,
+0xf0,
+0xf0,
+0xf0,
+0xf0,
+0xf0,
+0xf0,
+0xf0,
+0xf0,
+0xf0,
+0xf0,
+0xf0,
+0xf0,
+
+0x0f,
+0x0f,
+0x0f,
+0x0f,
+0x0f,
+0x0f,
+0x0f,
+0x0f,
+0x0f,
+0x0f,
+0x0f,
+0x0f,
+0x0f,
+0x0f,
+0x0f,
+0x0f,
+
+0xff,
+0xff,
+0xff,
+0xff,
+0xff,
+0xff,
+0xff,
+0xff,
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+0x77,
+0xcc,
+0xcc,
+0xcc,
+0xcc,
+0xde,
+0x73,
+0x00,
+0x00,
+0x00,
+
+0x00,
+0x7c,
+0xc6,
+0xc6,
+0xc6,
+0xc4,
+0xc8,
+0xc4,
+0xc6,
+0xc6,
+0xc6,
+0xc6,
+0xdc,
+0xc0,
+0xc0,
+0x00,
+
+0x00,
+0xff,
+0x61,
+0x60,
+0x60,
+0x60,
+0x60,
+0x60,
+0x60,
+0x60,
+0x60,
+0x60,
+0xf0,
+0x00,
+0x00,
+0x00,
+
+0x00,
+0x00,
+0x00,
+0x00,
+0x01,
+0x7e,
+0xa4,
+0x24,
+0x2c,
+0x6c,
+0x6c,
+0x6c,
+0x48,
+0x00,
+0x00,
+0x00,
+
+0x00,
+0xff,
+0xc1,
+0x60,
+0x30,
+0x18,
+0x0c,
+0x18,
+0x30,
+0x60,
+0xc0,
+0xc1,
+0xfe,
+0x00,
+0x00,
+0x00,
+
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+0x7f,
+0xc8,
+0xc8,
+0xc8,
+0xc8,
+0xc8,
+0xc8,
+0x70,
+0x00,
+0x00,
+0x00,
+
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+0x22,
+0x66,
+0x66,
+0x66,
+0x66,
+0x66,
+0x7c,
+0x60,
+0x60,
+0x60,
+0xc0,
+
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+0x76,
+0xdc,
+0x18,
+0x18,
+0x18,
+0x18,
+0x18,
+0x10,
+0x00,
+0x00,
+0x00,
+
+0x00,
+0x38,
+0x10,
+0x7c,
+0xd6,
+0xd6,
+0xd6,
+0xd6,
+0xd6,
+0xd6,
+0x7c,
+0x10,
+0x38,
+0x00,
+0x00,
+0x00,
+
+0x00,
+0x38,
+0x6c,
+0xc6,
+0xc6,
+0xc6,
+0xfe,
+0xc6,
+0xc6,
+0xc6,
+0xc6,
+0x6c,
+0x38,
+0x00,
+0x00,
+0x00,
+
+0x00,
+0x3c,
+0x66,
+0xc3,
+0xc3,
+0xc3,
+0xc3,
+0xc3,
+0x66,
+0x24,
+0x24,
+0xa5,
+0xe7,
+0x00,
+0x00,
+0x00,
+
+0x00,
+0x1e,
+0x31,
+0x30,
+0x18,
+0x0c,
+0x3e,
+0x66,
+0x66,
+0x66,
+0x66,
+0x66,
+0x3c,
+0x00,
+0x00,
+0x00,
+
+0x00,
+0x00,
+0x00,
+0x00,
+0x6e,
+0xff,
+0x99,
+0x99,
+0x99,
+0x99,
+0xff,
+0x76,
+0x00,
+0x00,
+0x00,
+0x00,
+
+0x00,
+0x00,
+0x00,
+0x02,
+0x04,
+0x7c,
+0xca,
+0x92,
+0xa6,
+0x7c,
+0x40,
+0x80,
+0x00,
+0x00,
+0x00,
+0x00,
+
+0x00,
+0x1c,
+0x30,
+0x60,
+0x60,
+0x60,
+0x7c,
+0x60,
+0x60,
+0x60,
+0x60,
+0x30,
+0x1c,
+0x00,
+0x00,
+0x00,
+
+0x00,
+0x00,
+0x7c,
+0xc6,
+0xc6,
+0xc6,
+0xc6,
+0xc6,
+0xc6,
+0xc6,
+0xc6,
+0xc6,
+0xc6,
+0x00,
+0x00,
+0x00,
+
+0x00,
+0x00,
+0x00,
+0xfe,
+0x00,
+0x00,
+0x00,
+0x7c,
+0x00,
+0x00,
+0x00,
+0xfe,
+0x00,
+0x00,
+0x00,
+0x00,
+
+0x00,
+0x00,
+0x00,
+0x00,
+0x18,
+0x18,
+0x7e,
+0x18,
+0x18,
+0x00,
+0x00,
+0x7e,
+0x00,
+0x00,
+0x00,
+0x00,
+
+0x00,
+0x00,
+0x00,
+0x30,
+0x18,
+0x0c,
+0x06,
+0x0c,
+0x18,
+0x30,
+0x00,
+0x7e,
+0x00,
+0x00,
+0x00,
+0x00,
+
+0x00,
+0x00,
+0x00,
+0x0c,
+0x18,
+0x30,
+0x60,
+0x30,
+0x18,
+0x0c,
+0x00,
+0x7e,
+0x00,
+0x00,
+0x00,
+0x00,
+
+0x00,
+0x00,
+0x00,
+0x0e,
+0x19,
+0x1b,
+0x18,
+0x18,
+0x18,
+0x18,
+0x18,
+0x18,
+0x18,
+0x18,
+0x18,
+0x18,
+
+0x18,
+0x18,
+0x18,
+0x18,
+0x18,
+0x18,
+0x18,
+0x18,
+0x18,
+0xd8,
+0x98,
+0x70,
+0x00,
+0x00,
+0x00,
+0x00,
+
+0x00,
+0x00,
+0x00,
+0x00,
+0x18,
+0x18,
+0x00,
+0x7e,
+0x00,
+0x18,
+0x18,
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+0x76,
+0xdc,
+0x00,
+0x00,
+0x76,
+0xdc,
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+
+0x00,
+0x38,
+0x44,
+0x44,
+0x44,
+0x38,
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+0x18,
+0x18,
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+0x18,
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+
+0x00,
+0x00,
+0x07,
+0x06,
+0x06,
+0x0c,
+0x0c,
+0x08,
+0x98,
+0xd0,
+0xf0,
+0x60,
+0x20,
+0x00,
+0x00,
+0x00,
+
+0x00,
+0xcc,
+0x76,
+0x66,
+0x66,
+0x66,
+0x66,
+0xf7,
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+
+0x00,
+0x70,
+0x98,
+0x18,
+0x30,
+0x60,
+0x88,
+0xf8,
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+0x7c,
+0x64,
+0x64,
+0x64,
+0x64,
+0x64,
+0x7c,
+0x00,
+0x00,
+0x00,
+0x00,
+
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+
+};
+
+
+const struct font_desc font_rl = {
+        RL_IDX,
+        "RomanLarge",
+        8,
+        16,
+        patterns,
+        -1
+};
diff --git a/drivers/video/console/fonts.c b/drivers/video/console/fonts.c
index 4fd07d9eca03..9be83bed1959 100644
--- a/drivers/video/console/fonts.c
+++ b/drivers/video/console/fonts.c
@@ -64,6 +64,10 @@ static const struct font_desc *fonts[] = {
 #undef NO_FONTS
     &font_mini_4x6,
 #endif
+#ifdef CONFIG_FONT_RL
+#undef NO_FONTS
+    &font_rl,
+#endif
 };
 
 #define num_fonts (sizeof(fonts)/sizeof(*fonts))
diff --git a/drivers/video/softcursor.c b/drivers/video/console/softcursor.c
index 229c4bc35079..8529bf08db28 100644
--- a/drivers/video/softcursor.c
+++ b/drivers/video/console/softcursor.c
@@ -1,7 +1,7 @@
 /*
  * linux/drivers/video/softcursor.c -- Generic software cursor for frame buffer devices
  *
- *  Created 14 Nov 2002 by James Simmons 
+ *  Created 14 Nov 2002 by James Simmons
  *
  * 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
@@ -55,9 +55,9 @@ int soft_cursor(struct fb_info *info, struct fb_cursor *cursor)
                                 src[i] = image->data[i] & cursor->mask[i];
                         break;
                 }
-        } else 
+        } else
                 memcpy(src, image->data, dsize);
-        
+
         fb_pad_aligned_buffer(dst, d_pitch, src, s_pitch, image->height);
         image->data = dst;
         info->fbops->fb_imageblit(info, image);
@@ -66,7 +66,7 @@ int soft_cursor(struct fb_info *info, struct fb_cursor *cursor)
 }
 
 EXPORT_SYMBOL(soft_cursor);
- 
+
 MODULE_AUTHOR("James Simmons <jsimmons@users.sf.net>");
 MODULE_DESCRIPTION("Generic software cursor");
 MODULE_LICENSE("GPL");
diff --git a/drivers/video/controlfb.c b/drivers/video/controlfb.c
index 989e700159e0..403d17377f8d 100644
--- a/drivers/video/controlfb.c
+++ b/drivers/video/controlfb.c
@@ -176,7 +176,6 @@ static struct fb_ops controlfb_ops = {
         .fb_fillrect    = cfb_fillrect,
         .fb_copyarea    = cfb_copyarea,
         .fb_imageblit   = cfb_imageblit,
-        .fb_cursor      = soft_cursor,
 };
 
 
diff --git a/drivers/video/cyber2000fb.c b/drivers/video/cyber2000fb.c
index 3894b2a501d6..c589d23e7f91 100644
--- a/drivers/video/cyber2000fb.c
+++ b/drivers/video/cyber2000fb.c
@@ -1064,7 +1064,6 @@ static struct fb_ops cyber2000fb_ops = {
         .fb_fillrect    = cyber2000fb_fillrect,
         .fb_copyarea    = cyber2000fb_copyarea,
         .fb_imageblit   = cyber2000fb_imageblit,
-        .fb_cursor      = soft_cursor,
         .fb_sync        = cyber2000fb_sync,
 };
 
diff --git a/drivers/video/cyblafb.c b/drivers/video/cyblafb.c
index 6992100a508c..03fbe83d71a8 100644
--- a/drivers/video/cyblafb.c
+++ b/drivers/video/cyblafb.c
@@ -968,7 +968,6 @@ static struct fb_ops cyblafb_ops __devinitdata = {
         .fb_fillrect = cyblafb_fillrect,
         .fb_copyarea= cyblafb_copyarea,
         .fb_imageblit = cyblafb_imageblit,
-        .fb_cursor = soft_cursor,
 };
 
 //==========================================================================
diff --git a/drivers/video/dnfb.c b/drivers/video/dnfb.c
index 1785686a7f11..957a3ada2b75 100644
--- a/drivers/video/dnfb.c
+++ b/drivers/video/dnfb.c
@@ -116,7 +116,6 @@ static struct fb_ops dn_fb_ops = {
         .fb_fillrect    = cfb_fillrect,
         .fb_copyarea    = dnfb_copyarea,
         .fb_imageblit   = cfb_imageblit,
-        .fb_cursor      = soft_cursor,
 };
 
 struct fb_var_screeninfo dnfb_var __devinitdata = {
diff --git a/drivers/video/epson1355fb.c b/drivers/video/epson1355fb.c
index 7363d0b25fdf..6a81a1dd8f3d 100644
--- a/drivers/video/epson1355fb.c
+++ b/drivers/video/epson1355fb.c
@@ -484,7 +484,6 @@ static struct fb_ops epson1355fb_fbops = {
         .fb_imageblit   = cfb_imageblit,
         .fb_read        = epson1355fb_read,
         .fb_write       = epson1355fb_write,
-        .fb_cursor      = soft_cursor,
 };
 
 /* ------------------------------------------------------------------------- */
diff --git a/drivers/video/fbmon.c b/drivers/video/fbmon.c
index 713226cdf3c6..fc7965b66775 100644
--- a/drivers/video/fbmon.c
+++ b/drivers/video/fbmon.c
@@ -538,25 +538,12 @@ static struct fb_videomode *fb_create_modedb(unsigned char *edid, int *dbsize)
 
         *dbsize = 0;
 
-        DPRINTK("   Supported VESA Modes\n");
-        block = edid + ESTABLISHED_TIMING_1;
-        num += get_est_timing(block, &mode[num]);
-
-        DPRINTK("   Standard Timings\n");
-        block = edid + STD_TIMING_DESCRIPTIONS_START;
-        for (i = 0; i < STD_TIMING; i++, block += STD_TIMING_DESCRIPTION_SIZE) 
-                num += get_std_timing(block, &mode[num]);
-
         DPRINTK("   Detailed Timings\n");
         block = edid + DETAILED_TIMING_DESCRIPTIONS_START;
         for (i = 0; i < 4; i++, block+= DETAILED_TIMING_DESCRIPTION_SIZE) {
                 int first = 1;
 
-                if (block[0] == 0x00 && block[1] == 0x00) {
-                        if (block[3] == 0xfa) {
-                                num += get_dst_timing(block + 5, &mode[num]);
-                        }
-                } else  {
+                if (!(block[0] == 0x00 && block[1] == 0x00)) {
                         get_detailed_timing(block, &mode[num]);
                         if (first) {
                                 mode[num].flag |= FB_MODE_IS_FIRST;
@@ -565,6 +552,21 @@ static struct fb_videomode *fb_create_modedb(unsigned char *edid, int *dbsize)
                         num++;
                 }
         }
+
+        DPRINTK("   Supported VESA Modes\n");
+        block = edid + ESTABLISHED_TIMING_1;
+        num += get_est_timing(block, &mode[num]);
+
+        DPRINTK("   Standard Timings\n");
+        block = edid + STD_TIMING_DESCRIPTIONS_START;
+        for (i = 0; i < STD_TIMING; i++, block += STD_TIMING_DESCRIPTION_SIZE)
+                num += get_std_timing(block, &mode[num]);
+
+        block = edid + DETAILED_TIMING_DESCRIPTIONS_START;
+        for (i = 0; i < 4; i++, block+= DETAILED_TIMING_DESCRIPTION_SIZE) {
+                if (block[0] == 0x00 && block[1] == 0x00 && block[3] == 0xfa)
+                        num += get_dst_timing(block + 5, &mode[num]);
+        }
         
         /* Yikes, EDID data is totally useless */
         if (!num) {
@@ -827,7 +829,7 @@ int fb_parse_edid(unsigned char *edid, struct fb_var_screeninfo *var)
 void fb_edid_to_monspecs(unsigned char *edid, struct fb_monspecs *specs)
 {
         unsigned char *block;
-        int i;
+        int i, found = 0;
 
         if (edid == NULL)
                 return;
@@ -869,6 +871,22 @@ void fb_edid_to_monspecs(unsigned char *edid, struct fb_monspecs *specs)
         get_monspecs(edid, specs);
 
         specs->modedb = fb_create_modedb(edid, &specs->modedb_len);
+
+        /*
+         * Workaround for buggy EDIDs that sets that the first
+         * detailed timing is preferred but has not detailed
+         * timing specified
+         */
+        for (i = 0; i < specs->modedb_len; i++) {
+                if (specs->modedb[i].flag & FB_MODE_IS_DETAILED) {
+                        found = 1;
+                        break;
+                }
+        }
+
+        if (!found)
+                specs->misc &= ~FB_MISC_1ST_DETAIL;
+
         DPRINTK("========================================\n");
 }
 
diff --git a/drivers/video/ffb.c b/drivers/video/ffb.c
index 10cd05059fe9..04417dc16c2e 100644
--- a/drivers/video/ffb.c
+++ b/drivers/video/ffb.c
@@ -57,9 +57,6 @@ static struct fb_ops ffb_ops = {
         .fb_sync                = ffb_sync,
         .fb_mmap                = ffb_mmap,
         .fb_ioctl               = ffb_ioctl,
-
-        /* XXX Use FFB hw cursor once fb cursor API is better understood... */
-        .fb_cursor              = soft_cursor,
 };
 
 /* Register layout and definitions */
diff --git a/drivers/video/fm2fb.c b/drivers/video/fm2fb.c
index a0763283d776..998374cfae6d 100644
--- a/drivers/video/fm2fb.c
+++ b/drivers/video/fm2fb.c
@@ -172,7 +172,6 @@ static struct fb_ops fm2fb_ops = {
         .fb_fillrect    = cfb_fillrect,
         .fb_copyarea    = cfb_copyarea,
         .fb_imageblit   = cfb_imageblit,
-        .fb_cursor      = soft_cursor,
 };
 
     /*
diff --git a/drivers/video/gbefb.c b/drivers/video/gbefb.c
index 316bfe994811..9d5e4f342110 100644
--- a/drivers/video/gbefb.c
+++ b/drivers/video/gbefb.c
@@ -1038,7 +1038,6 @@ static struct fb_ops gbefb_ops = {
         .fb_fillrect    = cfb_fillrect,
         .fb_copyarea    = cfb_copyarea,
         .fb_imageblit   = cfb_imageblit,
-        .fb_cursor      = soft_cursor,
 };
 
 /*
@@ -1260,24 +1259,30 @@ static struct device_driver gbefb_driver = {
         .remove = __devexit_p(gbefb_remove),
 };
 
-static struct platform_device gbefb_device = {
-        .name = "gbefb",
-};
+static struct platform_device *gbefb_device;
 
 int __init gbefb_init(void)
 {
         int ret = driver_register(&gbefb_driver);
         if (!ret) {
-                ret = platform_device_register(&gbefb_device);
-                if (ret)
+                gbefb_device = platform_device_alloc("gbefb", 0);
+                if (gbefb_device) {
+                        ret = platform_device_add(gbefb_device);
+                } else {
+                        ret = -ENOMEM;
+                }
+                if (ret) {
+                        platform_device_put(gbefb_device);
                         driver_unregister(&gbefb_driver);
+                }
         }
         return ret;
 }
 
 void __exit gbefb_exit(void)
 {
-         driver_unregister(&gbefb_driver);
+        platform_device_unregister(gbefb_device);
+        driver_unregister(&gbefb_driver);
 }
 
 module_init(gbefb_init);
diff --git a/drivers/video/geode/Kconfig b/drivers/video/geode/Kconfig
index 5a9b89c3831b..42fb9a89a792 100644
--- a/drivers/video/geode/Kconfig
+++ b/drivers/video/geode/Kconfig
@@ -14,7 +14,6 @@ config FB_GEODE_GX1
         select FB_CFB_FILLRECT
         select FB_CFB_COPYAREA
         select FB_CFB_IMAGEBLIT
-        select FB_SOFT_CURSOR
         ---help---
           Framebuffer driver for the display controller integrated into the
           AMD Geode GX1 processor.
diff --git a/drivers/video/geode/gx1fb_core.c b/drivers/video/geode/gx1fb_core.c
index 74a5fca86b8a..8e8da7433994 100644
--- a/drivers/video/geode/gx1fb_core.c
+++ b/drivers/video/geode/gx1fb_core.c
@@ -275,7 +275,6 @@ static struct fb_ops gx1fb_ops = {
         .fb_fillrect    = cfb_fillrect,
         .fb_copyarea    = cfb_copyarea,
         .fb_imageblit   = cfb_imageblit,
-        .fb_cursor      = soft_cursor,
 };
 
 static struct fb_info * __init gx1fb_init_fbinfo(struct device *dev)
diff --git a/drivers/video/hitfb.c b/drivers/video/hitfb.c
index 0d376ba54814..f04ca721f94c 100644
--- a/drivers/video/hitfb.c
+++ b/drivers/video/hitfb.c
@@ -262,7 +262,6 @@ static struct fb_ops hitfb_ops = {
         .fb_fillrect    = hitfb_fillrect,
         .fb_copyarea    = hitfb_copyarea,
         .fb_imageblit   = cfb_imageblit,
-        .fb_cursor      = soft_cursor,
 };
 
 int __init hitfb_init(void)
diff --git a/drivers/video/hpfb.c b/drivers/video/hpfb.c
index e97fe8481d59..bebdac59d231 100644
--- a/drivers/video/hpfb.c
+++ b/drivers/video/hpfb.c
@@ -193,7 +193,6 @@ static struct fb_ops hpfb_ops = {
         .fb_fillrect    = hpfb_fillrect,
         .fb_copyarea    = hpfb_copyarea,
         .fb_imageblit   = cfb_imageblit,
-        .fb_cursor      = soft_cursor,
         .fb_sync        = hpfb_sync,
 };
 
diff --git a/drivers/video/i810/i810-i2c.c b/drivers/video/i810/i810-i2c.c
index 689d2586366d..c61bad0da20f 100644
--- a/drivers/video/i810/i810-i2c.c
+++ b/drivers/video/i810/i810-i2c.c
@@ -46,92 +46,45 @@ static void i810i2c_setscl(void *data, int state)
         struct i810fb_par         *par = chan->par;
         u8                        __iomem *mmio = par->mmio_start_virtual;
 
-        i810_writel(mmio, GPIOB, (state ? SCL_VAL_OUT : 0) | SCL_DIR |
+        i810_writel(mmio, chan->ddc_base, (state ? SCL_VAL_OUT : 0) | SCL_DIR |
                     SCL_DIR_MASK | SCL_VAL_MASK);
-        i810_readl(mmio, GPIOB);        /* flush posted write */
+        i810_readl(mmio, chan->ddc_base);       /* flush posted write */
 }
 
 static void i810i2c_setsda(void *data, int state)
 {
-        struct i810fb_i2c_chan    *chan = (struct i810fb_i2c_chan *)data;
+        struct i810fb_i2c_chan    *chan = data;
         struct i810fb_par         *par = chan->par;
         u8                        __iomem *mmio = par->mmio_start_virtual;
 
-        i810_writel(mmio, GPIOB, (state ? SDA_VAL_OUT : 0) | SDA_DIR |
+        i810_writel(mmio, chan->ddc_base, (state ? SDA_VAL_OUT : 0) | SDA_DIR |
                     SDA_DIR_MASK | SDA_VAL_MASK);
-        i810_readl(mmio, GPIOB);        /* flush posted write */
+        i810_readl(mmio, chan->ddc_base);       /* flush posted write */
 }
 
 static int i810i2c_getscl(void *data)
 {
-        struct i810fb_i2c_chan    *chan = (struct i810fb_i2c_chan *)data;
+        struct i810fb_i2c_chan    *chan = data;
         struct i810fb_par         *par = chan->par;
         u8                        __iomem *mmio = par->mmio_start_virtual;
 
-        i810_writel(mmio, GPIOB, SCL_DIR_MASK);
-        i810_writel(mmio, GPIOB, 0);
-        return (0 != (i810_readl(mmio, GPIOB) & SCL_VAL_IN));
+        i810_writel(mmio, chan->ddc_base, SCL_DIR_MASK);
+        i810_writel(mmio, chan->ddc_base, 0);
+        return ((i810_readl(mmio, chan->ddc_base) & SCL_VAL_IN) != 0);
 }
 
 static int i810i2c_getsda(void *data)
 {
-        struct i810fb_i2c_chan    *chan = (struct i810fb_i2c_chan *)data;
+        struct i810fb_i2c_chan    *chan = data;
         struct i810fb_par         *par = chan->par;
         u8                        __iomem *mmio = par->mmio_start_virtual;
 
-        i810_writel(mmio, GPIOB, SDA_DIR_MASK);
-        i810_writel(mmio, GPIOB, 0);
-        return (0 != (i810_readl(mmio, GPIOB) & SDA_VAL_IN));
-}
-
-static void i810ddc_setscl(void *data, int state)
-{
-        struct i810fb_i2c_chan    *chan = (struct i810fb_i2c_chan *)data;
-        struct i810fb_par       *par = chan->par;
-        u8                      __iomem *mmio = par->mmio_start_virtual;
-
-        i810_writel(mmio, GPIOA, (state ? SCL_VAL_OUT : 0) | SCL_DIR |
-                    SCL_DIR_MASK | SCL_VAL_MASK);
-        i810_readl(mmio, GPIOA);        /* flush posted write */
-}
-
-static void i810ddc_setsda(void *data, int state)
-{
-        struct i810fb_i2c_chan    *chan = (struct i810fb_i2c_chan *)data;
-        struct i810fb_par         *par = chan->par;
-        u8                      __iomem *mmio = par->mmio_start_virtual;
-
-        i810_writel(mmio, GPIOA, (state ? SDA_VAL_OUT : 0) | SDA_DIR |
-                    SDA_DIR_MASK | SDA_VAL_MASK);
-        i810_readl(mmio, GPIOA);        /* flush posted write */
-}
-
-static int i810ddc_getscl(void *data)
-{
-        struct i810fb_i2c_chan    *chan = (struct i810fb_i2c_chan *)data;
-        struct i810fb_par         *par = chan->par;
-        u8                      __iomem *mmio = par->mmio_start_virtual;
-
-        i810_writel(mmio, GPIOA, SCL_DIR_MASK);
-        i810_writel(mmio, GPIOA, 0);
-        return (0 != (i810_readl(mmio, GPIOA) & SCL_VAL_IN));
-}
-
-static int i810ddc_getsda(void *data)
-{
-        struct i810fb_i2c_chan    *chan = (struct i810fb_i2c_chan *)data;
-        struct i810fb_par         *par = chan->par;
-        u8                      __iomem *mmio = par->mmio_start_virtual;
-
-        i810_writel(mmio, GPIOA, SDA_DIR_MASK);
-        i810_writel(mmio, GPIOA, 0);
-        return (0 != (i810_readl(mmio, GPIOA) & SDA_VAL_IN));
+        i810_writel(mmio, chan->ddc_base, SDA_DIR_MASK);
+        i810_writel(mmio, chan->ddc_base, 0);
+        return ((i810_readl(mmio, chan->ddc_base) & SDA_VAL_IN) != 0);
 }
 
-#define I2C_ALGO_DDC_I810   0x0e0000
-#define I2C_ALGO_I2C_I810   0x0f0000
-static int i810_setup_i2c_bus(struct i810fb_i2c_chan *chan, const char *name,
-                              int conn)
+static int i810_setup_i2c_bus(struct i810fb_i2c_chan *chan, const char *name)
 {
         int rc;
 
@@ -139,22 +92,11 @@ static int i810_setup_i2c_bus(struct i810fb_i2c_chan *chan, const char *name,
         chan->adapter.owner             = THIS_MODULE;
         chan->adapter.algo_data         = &chan->algo;
         chan->adapter.dev.parent        = &chan->par->dev->dev;
-        switch (conn) {
-        case 1:
-                chan->adapter.id                = I2C_ALGO_DDC_I810;
-                chan->algo.setsda               = i810ddc_setsda;
-                chan->algo.setscl               = i810ddc_setscl;
-                chan->algo.getsda               = i810ddc_getsda;
-                chan->algo.getscl               = i810ddc_getscl;
-                break;
-        case 2:
-                chan->adapter.id                = I2C_ALGO_I2C_I810;
-                chan->algo.setsda               = i810i2c_setsda;
-                chan->algo.setscl               = i810i2c_setscl;
-                chan->algo.getsda               = i810i2c_getsda;
-                chan->algo.getscl               = i810i2c_getscl;
-                break;
-        }
+        chan->adapter.id                = I2C_HW_B_I810;
+        chan->algo.setsda               = i810i2c_setsda;
+        chan->algo.setscl               = i810i2c_setscl;
+        chan->algo.getsda               = i810i2c_getsda;
+        chan->algo.getscl               = i810i2c_getscl;
         chan->algo.udelay               = 10;
         chan->algo.mdelay               = 10;
         chan->algo.timeout              = (HZ/2);
@@ -168,11 +110,15 @@ static int i810_setup_i2c_bus(struct i810fb_i2c_chan *chan, const char *name,
         udelay(20);
 
         rc = i2c_bit_add_bus(&chan->adapter);
+
         if (rc == 0)
                 dev_dbg(&chan->par->dev->dev, "I2C bus %s registered.\n",name);
-        else
+        else {
                 dev_warn(&chan->par->dev->dev, "Failed to register I2C bus "
                          "%s.\n", name);
+                chan->par = NULL;
+        }
+
         return rc;
 }
 
@@ -180,8 +126,14 @@ void i810_create_i2c_busses(struct i810fb_par *par)
 {
         par->chan[0].par        = par;
         par->chan[1].par        = par;
-        i810_setup_i2c_bus(&par->chan[0], "I810-DDC", 1);
-        i810_setup_i2c_bus(&par->chan[1], "I810-I2C", 2);
+        par->chan[2].par        = par;
+
+        par->chan[0].ddc_base = GPIOA;
+        i810_setup_i2c_bus(&par->chan[0], "I810-DDC");
+        par->chan[1].ddc_base = GPIOB;
+        i810_setup_i2c_bus(&par->chan[1], "I810-I2C");
+        par->chan[2].ddc_base = GPIOC;
+        i810_setup_i2c_bus(&par->chan[2], "I810-GPIOC");
 }
 
 void i810_delete_i2c_busses(struct i810fb_par *par)
@@ -189,9 +141,14 @@ void i810_delete_i2c_busses(struct i810fb_par *par)
         if (par->chan[0].par)
                 i2c_bit_del_bus(&par->chan[0].adapter);
         par->chan[0].par = NULL;
+
         if (par->chan[1].par)
                 i2c_bit_del_bus(&par->chan[1].adapter);
         par->chan[1].par = NULL;
+
+        if (par->chan[2].par)
+                i2c_bit_del_bus(&par->chan[2].adapter);
+        par->chan[2].par = NULL;
 }
 
 static u8 *i810_do_probe_i2c_edid(struct i810fb_i2c_chan *chan)
@@ -221,6 +178,7 @@ static u8 *i810_do_probe_i2c_edid(struct i810fb_i2c_chan *chan)
                 DPRINTK("i810-i2c: I2C Transfer successful\n");
                 return buf;
         }
+
         DPRINTK("i810-i2c: Unable to read EDID block.\n");
         kfree(buf);
         return NULL;
@@ -233,7 +191,7 @@ int i810_probe_i2c_connector(struct fb_info *info, u8 **out_edid, int conn)
         int i;
 
         DPRINTK("i810-i2c: Probe DDC%i Bus\n", conn);
-        if (conn < 3) {
+        if (conn < 4) {
                 for (i = 0; i < 3; i++) {
                         /* Do the real work */
                         edid = i810_do_probe_i2c_edid(&par->chan[conn-1]);
@@ -241,11 +199,14 @@ int i810_probe_i2c_connector(struct fb_info *info, u8 **out_edid, int conn)
                                 break;
                 }
         } else {
-                DPRINTK("i810-i2c: Getting EDID from BIOS\n");
-                edid = kmalloc(EDID_LENGTH, GFP_KERNEL);
-                if (edid)
-                        memcpy(edid, fb_firmware_edid(info->device),
-                               EDID_LENGTH);
+                const u8 *e = fb_firmware_edid(info->device);
+
+                if (e != NULL) {
+                        DPRINTK("i810-i2c: Getting EDID from BIOS\n");
+                        edid = kmalloc(EDID_LENGTH, GFP_KERNEL);
+                        if (edid)
+                                memcpy(edid, e, EDID_LENGTH);
+                }
         }
 
         if (out_edid)
@@ -253,5 +214,3 @@ int i810_probe_i2c_connector(struct fb_info *info, u8 **out_edid, int conn)
 
         return (edid) ? 0 : 1;
 }
-
-
diff --git a/drivers/video/i810/i810.h b/drivers/video/i810/i810.h
index d48949ceaacc..6c187d5fe951 100644
--- a/drivers/video/i810/i810.h
+++ b/drivers/video/i810/i810.h
@@ -249,6 +249,7 @@ struct i810fb_i2c_chan {
         struct i810fb_par *par;
         struct i2c_adapter adapter;
         struct i2c_algo_bit_data algo;
+        unsigned long ddc_base;
 };
 
 struct i810fb_par {
@@ -262,7 +263,7 @@ struct i810fb_par {
         struct heap_data         iring;
         struct heap_data         cursor_heap;
         struct vgastate          state;
-        struct i810fb_i2c_chan   chan[2];
+        struct i810fb_i2c_chan   chan[3];
         atomic_t                 use_count;
         u32 pseudo_palette[17];
         unsigned long mmio_start_phys;
diff --git a/drivers/video/i810/i810_main.c b/drivers/video/i810/i810_main.c
index 0dbc9ddb6766..c0c974b1afaa 100644
--- a/drivers/video/i810/i810_main.c
+++ b/drivers/video/i810/i810_main.c
@@ -1854,7 +1854,7 @@ static void __devinit i810fb_find_init_mode(struct fb_info *info)
 #ifdef CONFIG_FB_I810_I2C
         i810_create_i2c_busses(par);
 
-        for (i = 0; i < 3; i++) {
+        for (i = 0; i < 4; i++) {
                 err = i810_probe_i2c_connector(info, &par->edid, i+1);
                 if (!err)
                         break;
@@ -1871,27 +1871,18 @@ static void __devinit i810fb_find_init_mode(struct fb_info *info)
         fb_videomode_to_modelist(specs->modedb, specs->modedb_len,
                                  &info->modelist);
         if (specs->modedb != NULL) {
-                if (xres && yres) {
-                        struct fb_videomode *m;
+                struct fb_videomode *m;
 
+                if (xres && yres) {
                         if ((m = fb_find_best_mode(&var, &info->modelist))) {
                                 mode = *m;
                                 found  = 1;
                         }
                 }
 
-                if (!found && specs->misc & FB_MISC_1ST_DETAIL) {
-                        for (i = 0; i < specs->modedb_len; i++) {
-                                if (specs->modedb[i].flag & FB_MODE_IS_FIRST) {
-                                        mode = specs->modedb[i];
-                                        found = 1;
-                                        break;
-                                }
-                        }
-                }
-
                 if (!found) {
-                        mode = specs->modedb[0];
+                        m = fb_find_best_display(&info->monspecs, &info->modelist);
+                        mode = *m;
                         found = 1;
                 }
 
@@ -2066,8 +2057,7 @@ static void i810fb_release_resource(struct fb_info *info,
                 iounmap(par->mmio_start_virtual);
         if (par->aperture.virtual)
                 iounmap(par->aperture.virtual);
-        if (par->edid)
-                kfree(par->edid);
+        kfree(par->edid);
         if (par->res_flags & FRAMEBUFFER_REQ)
                 release_mem_region(par->aperture.physical,
                                    par->aperture.size);
diff --git a/drivers/video/i810/i810_regs.h b/drivers/video/i810/i810_regs.h
index 6e4b9afa4d98..91c6bd9d0d0d 100644
--- a/drivers/video/i810/i810_regs.h
+++ b/drivers/video/i810/i810_regs.h
@@ -70,6 +70,7 @@
 #define HVSYNC                0x05000 
 #define GPIOA                 0x05010
 #define GPIOB                 0x05014 
+#define GPIOC                 0x0501C
 
 /* Clock Control and Power Management Registers (06000h 06FFFh) */
 #define DCLK_0D               0x06000
diff --git a/drivers/video/imsttfb.c b/drivers/video/imsttfb.c
index 7b9bf45ab6fe..7fbe24206b19 100644
--- a/drivers/video/imsttfb.c
+++ b/drivers/video/imsttfb.c
@@ -1344,7 +1344,6 @@ static struct fb_ops imsttfb_ops = {
         .fb_fillrect    = imsttfb_fillrect,
         .fb_copyarea    = imsttfb_copyarea,
         .fb_imageblit   = cfb_imageblit,
-        .fb_cursor      = soft_cursor,
         .fb_ioctl       = imsttfb_ioctl,
 };
 
diff --git a/drivers/video/imxfb.c b/drivers/video/imxfb.c
index 64d9bcc38da3..e20b9f3a255f 100644
--- a/drivers/video/imxfb.c
+++ b/drivers/video/imxfb.c
@@ -298,7 +298,6 @@ static struct fb_ops imxfb_ops = {
         .fb_copyarea    = cfb_copyarea,
         .fb_imageblit   = cfb_imageblit,
         .fb_blank       = imxfb_blank,
-        .fb_cursor      = soft_cursor, /* FIXME: i.MX can do hardware cursor */
 };
 
 /*
diff --git a/drivers/video/intelfb/intelfb.h b/drivers/video/intelfb/intelfb.h
index 011e11626558..f077ca34faba 100644
--- a/drivers/video/intelfb/intelfb.h
+++ b/drivers/video/intelfb/intelfb.h
@@ -10,7 +10,7 @@
 /*** Version/name ***/
 #define INTELFB_VERSION                 "0.9.2"
 #define INTELFB_MODULE_NAME             "intelfb"
-#define SUPPORTED_CHIPSETS              "830M/845G/852GM/855GM/865G/915G"
+#define SUPPORTED_CHIPSETS              "830M/845G/852GM/855GM/865G/915G/915GM"
 
 
 /*** Debug/feature defines ***/
@@ -47,6 +47,7 @@
 #define PCI_DEVICE_ID_INTEL_85XGM       0x3582
 #define PCI_DEVICE_ID_INTEL_865G        0x2572
 #define PCI_DEVICE_ID_INTEL_915G        0x2582
+#define PCI_DEVICE_ID_INTEL_915GM       0x2592
 
 /* Size of MMIO region */
 #define INTEL_REG_SIZE                  0x80000
@@ -119,7 +120,8 @@ enum intel_chips {
         INTEL_855GM,
         INTEL_855GME,
         INTEL_865G,
-        INTEL_915G
+        INTEL_915G,
+        INTEL_915GM
 };
 
 struct intelfb_hwstate {
diff --git a/drivers/video/intelfb/intelfbdrv.c b/drivers/video/intelfb/intelfbdrv.c
index 80a09344f1aa..0799b999b314 100644
--- a/drivers/video/intelfb/intelfbdrv.c
+++ b/drivers/video/intelfb/intelfbdrv.c
@@ -1,7 +1,7 @@
 /*
  * intelfb
  *
- * Linux framebuffer driver for Intel(R) 830M/845G/852GM/855GM/865G/915G
+ * Linux framebuffer driver for Intel(R) 830M/845G/852GM/855GM/865G/915G/915GM
  * integrated graphics chips.
  *
  * Copyright © 2002, 2003 David Dawes <dawes@xfree86.org>
@@ -186,6 +186,7 @@ static struct pci_device_id intelfb_pci_table[] __devinitdata = {
         { PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_85XGM, PCI_ANY_ID, PCI_ANY_ID, PCI_CLASS_DISPLAY_VGA << 8, INTELFB_CLASS_MASK, INTEL_85XGM },
         { PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_865G, PCI_ANY_ID, PCI_ANY_ID, PCI_CLASS_DISPLAY_VGA << 8, INTELFB_CLASS_MASK, INTEL_865G },
         { PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_915G, PCI_ANY_ID, PCI_ANY_ID, PCI_CLASS_DISPLAY_VGA << 8, INTELFB_CLASS_MASK, INTEL_915G },
+        { PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_915GM, PCI_ANY_ID, PCI_ANY_ID, PCI_CLASS_DISPLAY_VGA << 8, INTELFB_CLASS_MASK, INTEL_915GM },
         { 0, }
 };
 
@@ -549,10 +550,11 @@ intelfb_pci_register(struct pci_dev *pdev, const struct pci_device_id *ent)
         }
 
         /* Set base addresses. */
-        if (ent->device == PCI_DEVICE_ID_INTEL_915G) {
+        if ((ent->device == PCI_DEVICE_ID_INTEL_915G) ||
+                        (ent->device == PCI_DEVICE_ID_INTEL_915GM)) {
                 aperture_bar = 2;
                 mmio_bar = 0;
-                /* Disable HW cursor on 915G (not implemented yet) */
+                /* Disable HW cursor on 915G/M (not implemented yet) */
                 hwcursor = 0;
         }
         dinfo->aperture.physical = pci_resource_start(pdev, aperture_bar);
@@ -1483,7 +1485,7 @@ intelfb_cursor(struct fb_info *info, struct fb_cursor *cursor)
 #endif
 
         if (!dinfo->hwcursor)
-                return soft_cursor(info, cursor);
+                return -ENODEV;
 
         intelfbhw_cursor_hide(dinfo);
 
diff --git a/drivers/video/intelfb/intelfbhw.c b/drivers/video/intelfb/intelfbhw.c
index 5bafc3c54db7..ac94c2e5ff85 100644
--- a/drivers/video/intelfb/intelfbhw.c
+++ b/drivers/video/intelfb/intelfbhw.c
@@ -99,6 +99,11 @@ intelfbhw_get_chipset(struct pci_dev *pdev, const char **name, int *chipset,
                 *chipset = INTEL_915G;
                 *mobile = 0;
                 return 0;
+        case PCI_DEVICE_ID_INTEL_915GM:
+                *name = "Intel(R) 915GM";
+                *chipset = INTEL_915GM;
+                *mobile = 1;
+                return 0;
         default:
                 return 1;
         }
diff --git a/drivers/video/kyro/fbdev.c b/drivers/video/kyro/fbdev.c
index d8bac9e97842..5eb4d5c177bd 100644
--- a/drivers/video/kyro/fbdev.c
+++ b/drivers/video/kyro/fbdev.c
@@ -669,7 +669,6 @@ static struct fb_ops kyrofb_ops = {
         .fb_fillrect    = cfb_fillrect,
         .fb_copyarea    = cfb_copyarea,
         .fb_imageblit   = cfb_imageblit,
-        .fb_cursor      = soft_cursor,
 };
 
 static int __devinit kyrofb_probe(struct pci_dev *pdev,
diff --git a/drivers/video/leo.c b/drivers/video/leo.c
index 7e1e7fb168bd..84a7fe435bb8 100644
--- a/drivers/video/leo.c
+++ b/drivers/video/leo.c
@@ -51,7 +51,6 @@ static struct fb_ops leo_ops = {
         .fb_imageblit           = cfb_imageblit,
         .fb_mmap                = leo_mmap,
         .fb_ioctl               = leo_ioctl,
-        .fb_cursor              = soft_cursor,
 };
 
 #define LEO_OFF_LC_SS0_KRN      0x00200000UL
diff --git a/drivers/video/logo/Kconfig b/drivers/video/logo/Kconfig
index 3e9ccf370ab2..8cb7fb4db441 100644
--- a/drivers/video/logo/Kconfig
+++ b/drivers/video/logo/Kconfig
@@ -7,6 +7,8 @@ menu "Logo configuration"
 config LOGO
         bool "Bootup logo"
         depends on FB || SGI_NEWPORT_CONSOLE
+        help
+          Enable and select frame buffer bootup logos.
 
 config LOGO_LINUX_MONO
         bool "Standard black and white Linux logo"
diff --git a/drivers/video/macfb.c b/drivers/video/macfb.c
index 4945a4c02209..cfc748e94272 100644
--- a/drivers/video/macfb.c
+++ b/drivers/video/macfb.c
@@ -589,7 +589,6 @@ static struct fb_ops macfb_ops = {
         .fb_fillrect    = cfb_fillrect,
         .fb_copyarea    = cfb_copyarea,
         .fb_imageblit   = cfb_imageblit,
-        .fb_cursor      = soft_cursor,
 };
 
 void __init macfb_setup(char *options)
diff --git a/drivers/video/matrox/matroxfb_DAC1064.c b/drivers/video/matrox/matroxfb_DAC1064.c
index 149680f8bcf0..0fbd9b5149f1 100644
--- a/drivers/video/matrox/matroxfb_DAC1064.c
+++ b/drivers/video/matrox/matroxfb_DAC1064.c
@@ -657,7 +657,6 @@ static int MGA1064_preinit(WPMINFO2) {
         /* ACCESS_FBINFO(capable.cfb4) = 0; ... preinitialized by 0 */
         ACCESS_FBINFO(capable.text) = 1;
         ACCESS_FBINFO(capable.vxres) = vxres_mystique;
-        ACCESS_FBINFO(features.accel.has_cacheflush) = 1;
 
         ACCESS_FBINFO(outputs[0]).output = &m1064;
         ACCESS_FBINFO(outputs[0]).src = ACCESS_FBINFO(outputs[0]).default_src;
@@ -842,7 +841,6 @@ static int MGAG100_preinit(WPMINFO2) {
         /* ACCESS_FBINFO(capable.cfb4) = 0; ... preinitialized by 0 */
         ACCESS_FBINFO(capable.text) = 1;
         ACCESS_FBINFO(capable.vxres) = vxres_g100;
-        ACCESS_FBINFO(features.accel.has_cacheflush) = 1;
         ACCESS_FBINFO(capable.plnwt) = ACCESS_FBINFO(devflags.accelerator) == FB_ACCEL_MATROX_MGAG100
                         ? ACCESS_FBINFO(devflags.sgram) : 1;
 
@@ -980,7 +978,7 @@ static void MGAG100_reset(WPMINFO2) {
                                 hw->MXoptionReg |= 0x40;        /* FIXME... */
                                 pci_write_config_dword(ACCESS_FBINFO(pcidev), PCI_OPTION_REG, hw->MXoptionReg);
                         }
-                        mga_setr(M_EXTVGA_INDEX, 0x06, 0x50);
+                        mga_setr(M_EXTVGA_INDEX, 0x06, 0x00);
                 }
         }
         if (ACCESS_FBINFO(devflags.g450dac)) {
diff --git a/drivers/video/matrox/matroxfb_accel.c b/drivers/video/matrox/matroxfb_accel.c
index c7f3e1321224..a5c825d99466 100644
--- a/drivers/video/matrox/matroxfb_accel.c
+++ b/drivers/video/matrox/matroxfb_accel.c
@@ -122,7 +122,7 @@ void matrox_cfbX_init(WPMINFO2) {
         ACCESS_FBINFO(fbops).fb_copyarea = cfb_copyarea;
         ACCESS_FBINFO(fbops).fb_fillrect = cfb_fillrect;
         ACCESS_FBINFO(fbops).fb_imageblit = cfb_imageblit;
-        ACCESS_FBINFO(fbops).fb_cursor = soft_cursor;
+        ACCESS_FBINFO(fbops).fb_cursor = NULL;
 
         accel = (ACCESS_FBINFO(fbcon).var.accel_flags & FB_ACCELF_TEXT) == FB_ACCELF_TEXT;
 
diff --git a/drivers/video/matrox/matroxfb_base.c b/drivers/video/matrox/matroxfb_base.c
index e02da41f1b26..1e74f4cca53b 100644
--- a/drivers/video/matrox/matroxfb_base.c
+++ b/drivers/video/matrox/matroxfb_base.c
@@ -264,7 +264,6 @@ static void matroxfb_disable_irq(WPMINFO2) {
 }
 
 int matroxfb_wait_for_sync(WPMINFO u_int32_t crtc) {
-        wait_queue_t __wait;
         struct matrox_vsync *vs;
         unsigned int cnt;
         int ret;
@@ -286,7 +285,6 @@ int matroxfb_wait_for_sync(WPMINFO u_int32_t crtc) {
         if (ret) {
                 return ret;
         }
-        init_waitqueue_entry(&__wait, current);
 
         cnt = vs->cnt;
         ret = wait_event_interruptible_timeout(vs->wait, cnt != vs->cnt, HZ/10);
@@ -500,10 +498,6 @@ static int matroxfb_pitch_adjust(CPMINFO int xres, int bpp) {
         } else {
                 xres_new = matroxfb_test_and_set_rounding(PMINFO xres, bpp);
         }
-        if (!xres_new) return 0;
-        if (xres != xres_new) {
-                printk(KERN_INFO "matroxfb: cannot set xres to %d, rounded up to %d\n", xres, xres_new);
-        }
         return xres_new;
 }
 
@@ -1285,7 +1279,7 @@ static int matroxfb_getmemory(WPMINFO unsigned int maxSize, unsigned int *realSi
         vaddr_t vm;
         unsigned int offs;
         unsigned int offs2;
-        unsigned char store, orig;
+        unsigned char orig;
         unsigned char bytes[32];
         unsigned char* tmp;
 
@@ -1301,16 +1295,12 @@ static int matroxfb_getmemory(WPMINFO unsigned int maxSize, unsigned int *realSi
         orig = mga_inb(M_EXTVGA_DATA);
         mga_outb(M_EXTVGA_DATA, orig | 0x80);
 
-        store = mga_readb(vm, 0x1234);
         tmp = bytes;
         for (offs = 0x100000; offs < maxSize; offs += 0x200000)
                 *tmp++ = mga_readb(vm, offs);
         for (offs = 0x100000; offs < maxSize; offs += 0x200000)
                 mga_writeb(vm, offs, 0x02);
-        if (ACCESS_FBINFO(features.accel.has_cacheflush))
-                mga_outb(M_CACHEFLUSH, 0x00);
-        else
-                mga_writeb(vm, 0x1234, 0x99);
+        mga_outb(M_CACHEFLUSH, 0x00);
         for (offs = 0x100000; offs < maxSize; offs += 0x200000) {
                 if (mga_readb(vm, offs) != 0x02)
                         break;
@@ -1321,7 +1311,6 @@ static int matroxfb_getmemory(WPMINFO unsigned int maxSize, unsigned int *realSi
         tmp = bytes;
         for (offs2 = 0x100000; offs2 < maxSize; offs2 += 0x200000)
                 mga_writeb(vm, offs2, *tmp++);
-        mga_writeb(vm, 0x1234, store);
 
         mga_outb(M_EXTVGA_INDEX, 0x03);
         mga_outb(M_EXTVGA_DATA, orig);
@@ -1430,6 +1419,20 @@ static struct board {
                 MGA_1164,
                 &vbMystique,
                 "Mystique 220 (PCI)"},
+        {PCI_VENDOR_ID_MATROX,  PCI_DEVICE_ID_MATROX_MYS_AGP,   0x02,
+                0,                      0,
+                DEVF_VIDEO64BIT | DEVF_CROSS4MB,
+                180000,
+                MGA_1064,
+                &vbMystique,
+                "Mystique (AGP)"},
+        {PCI_VENDOR_ID_MATROX,  PCI_DEVICE_ID_MATROX_MYS_AGP,   0xFF,
+                0,                      0,
+                DEVF_VIDEO64BIT | DEVF_SWAPS | DEVF_CROSS4MB,
+                220000,
+                MGA_1164,
+                &vbMystique,
+                "Mystique 220 (AGP)"},
 #endif
 #ifdef CONFIG_FB_MATROX_G
         {PCI_VENDOR_ID_MATROX,  PCI_DEVICE_ID_MATROX_G100_MM,   0xFF,
diff --git a/drivers/video/matrox/matroxfb_base.h b/drivers/video/matrox/matroxfb_base.h
index 85a0b2558452..a8c47ad2cdb6 100644
--- a/drivers/video/matrox/matroxfb_base.h
+++ b/drivers/video/matrox/matroxfb_base.h
@@ -272,10 +272,6 @@ struct matrox_DAC1064_features {
         u_int8_t        xmiscctrl;
 };
 
-struct matrox_accel_features {
-        int             has_cacheflush;
-};
-
 /* current hardware status */
 struct mavenregs {
         u_int8_t regs[256];
@@ -440,7 +436,6 @@ struct matrox_fb_info {
         struct {
                 struct matrox_pll_features pll;
                 struct matrox_DAC1064_features DAC1064;
-                struct matrox_accel_features accel;
                               } features;
         struct {
                 spinlock_t      DAC;
diff --git a/drivers/video/matrox/matroxfb_crtc2.c b/drivers/video/matrox/matroxfb_crtc2.c
index 429047ac615a..d52d7d825c41 100644
--- a/drivers/video/matrox/matroxfb_crtc2.c
+++ b/drivers/video/matrox/matroxfb_crtc2.c
@@ -576,7 +576,6 @@ static struct fb_ops matroxfb_dh_ops = {
         .fb_fillrect =  cfb_fillrect,
         .fb_copyarea =  cfb_copyarea,
         .fb_imageblit = cfb_imageblit,
-        .fb_cursor =    soft_cursor,
 };
 
 static struct fb_var_screeninfo matroxfb_dh_defined = {
diff --git a/drivers/video/maxinefb.c b/drivers/video/maxinefb.c
index f192d995d030..743e7ad26acc 100644
--- a/drivers/video/maxinefb.c
+++ b/drivers/video/maxinefb.c
@@ -113,7 +113,6 @@ static struct fb_ops maxinefb_ops = {
         .fb_fillrect    = cfb_fillrect,
         .fb_copyarea    = cfb_copyarea,
         .fb_imageblit   = cfb_imageblit,
-        .fb_cursor      = soft_cursor,
 };
 
 int __init maxinefb_init(void)
diff --git a/drivers/video/modedb.c b/drivers/video/modedb.c
index 47516c44a390..1789a52d776a 100644
--- a/drivers/video/modedb.c
+++ b/drivers/video/modedb.c
@@ -676,6 +676,8 @@ void fb_var_to_videomode(struct fb_videomode *mode,
         mode->sync = var->sync;
         mode->vmode = var->vmode & FB_VMODE_MASK;
         mode->flag = FB_MODE_IS_FROM_VAR;
+        mode->refresh = 0;
+
         if (!var->pixclock)
                 return;
 
@@ -785,39 +787,39 @@ struct fb_videomode *fb_find_best_mode(struct fb_var_screeninfo *var,
 }
 
 /**
- * fb_find_nearest_mode - find mode closest video mode
+ * fb_find_nearest_mode - find closest videomode
  *
- * @var: pointer to struct fb_var_screeninfo
+ * @mode: pointer to struct fb_videomode
  * @head: pointer to modelist
  *
  * Finds best matching videomode, smaller or greater in dimension.
  * If more than 1 videomode is found, will return the videomode with
- * the closest refresh rate
+ * the closest refresh rate.
  */
-struct fb_videomode *fb_find_nearest_mode(struct fb_var_screeninfo *var,
+struct fb_videomode *fb_find_nearest_mode(struct fb_videomode *mode,
                                           struct list_head *head)
 {
         struct list_head *pos;
         struct fb_modelist *modelist;
-        struct fb_videomode *mode, *best = NULL;
+        struct fb_videomode *cmode, *best = NULL;
         u32 diff = -1, diff_refresh = -1;
 
         list_for_each(pos, head) {
                 u32 d;
 
                 modelist = list_entry(pos, struct fb_modelist, list);
-                mode = &modelist->mode;
+                cmode = &modelist->mode;
 
-                d = abs(mode->xres - var->xres) +
-                        abs(mode->yres - var->yres);
+                d = abs(cmode->xres - mode->xres) +
+                        abs(cmode->yres - mode->yres);
                 if (diff > d) {
                         diff = d;
-                        best = mode;
+                        best = cmode;
                 } else if (diff == d) {
-                        d = abs(mode->refresh - best->refresh);
+                        d = abs(cmode->refresh - mode->refresh);
                         if (diff_refresh > d) {
                                 diff_refresh = d;
-                                best = mode;
+                                best = cmode;
                         }
                 }
         }
@@ -942,6 +944,66 @@ void fb_videomode_to_modelist(struct fb_videomode *modedb, int num,
         }
 }
 
+struct fb_videomode *fb_find_best_display(struct fb_monspecs *specs,
+                                          struct list_head *head)
+{
+        struct list_head *pos;
+        struct fb_modelist *modelist;
+        struct fb_videomode *m, *m1 = NULL, *md = NULL, *best = NULL;
+        int first = 0;
+
+        if (!head->prev || !head->next || list_empty(head))
+                goto finished;
+
+        /* get the first detailed mode and the very first mode */
+        list_for_each(pos, head) {
+                modelist = list_entry(pos, struct fb_modelist, list);
+                m = &modelist->mode;
+
+                if (!first) {
+                        m1 = m;
+                        first = 1;
+                }
+
+                if (m->flag & FB_MODE_IS_FIRST) {
+                        md = m;
+                        break;
+                }
+        }
+
+        /* first detailed timing is preferred */
+        if (specs->misc & FB_MISC_1ST_DETAIL) {
+                best = md;
+                goto finished;
+        }
+
+        /* find best mode based on display width and height */
+        if (specs->max_x && specs->max_y) {
+                struct fb_var_screeninfo var;
+
+                memset(&var, 0, sizeof(struct fb_var_screeninfo));
+                var.xres = (specs->max_x * 7200)/254;
+                var.yres = (specs->max_y * 7200)/254;
+                m = fb_find_best_mode(&var, head);
+                if (m) {
+                        best = m;
+                        goto finished;
+                }
+        }
+
+        /* use first detailed mode */
+        if (md) {
+                best = md;
+                goto finished;
+        }
+
+        /* last resort, use the very first mode */
+        best = m1;
+finished:
+        return best;
+}
+EXPORT_SYMBOL(fb_find_best_display);
+
 EXPORT_SYMBOL(fb_videomode_to_var);
 EXPORT_SYMBOL(fb_var_to_videomode);
 EXPORT_SYMBOL(fb_mode_is_equal);
diff --git a/drivers/video/neofb.c b/drivers/video/neofb.c
index 5d424a30270a..8486e77872dc 100644
--- a/drivers/video/neofb.c
+++ b/drivers/video/neofb.c
@@ -1665,7 +1665,6 @@ static struct fb_ops neofb_ops = {
         .fb_fillrect    = neofb_fillrect,
         .fb_copyarea    = neofb_copyarea,
         .fb_imageblit   = neofb_imageblit,
-        .fb_cursor      = soft_cursor,
 };
 
 /* --------------------------------------------------------------------- */
diff --git a/drivers/video/nvidia/nv_local.h b/drivers/video/nvidia/nv_local.h
index afee284fc73c..4243d7fae972 100644
--- a/drivers/video/nvidia/nv_local.h
+++ b/drivers/video/nvidia/nv_local.h
@@ -105,7 +105,7 @@ do {                            \
         *a = byte_rev[*a];      \
 } while(0)
 #else
-#define reverse_order(l)
+#define reverse_order(l) do { } while(0)
 #endif                          /* __LITTLE_ENDIAN */
 
 #endif                          /* __NV_LOCAL_H__ */
diff --git a/drivers/video/nvidia/nv_of.c b/drivers/video/nvidia/nv_of.c
index 4fa2cf9a8af2..7a03d040b1a3 100644
--- a/drivers/video/nvidia/nv_of.c
+++ b/drivers/video/nvidia/nv_of.c
@@ -27,34 +27,60 @@
 #include "nv_local.h"
 #include "nv_proto.h"
 
-void nvidia_create_i2c_busses(struct nvidia_par *par) {}
-void nvidia_delete_i2c_busses(struct nvidia_par *par) {}
+#include "../edid.h"
 
-int nvidia_probe_i2c_connector(struct fb_info *info, int conn, u8 **out_edid)
+int nvidia_probe_of_connector(struct fb_info *info, int conn, u8 **out_edid)
 {
         struct nvidia_par *par = info->par;
-        struct device_node *dp;
+        struct device_node *parent, *dp;
         unsigned char *pedid = NULL;
-        unsigned char *disptype = NULL;
         static char *propnames[] = {
-                "DFP,EDID", "LCD,EDID", "EDID", "EDID1", "EDID,B", "EDID,A", NULL };
+                "DFP,EDID", "LCD,EDID", "EDID", "EDID1",
+                "EDID,B", "EDID,A", NULL };
         int i;
 
-        dp = pci_device_to_OF_node(par->pci_dev);
-        for (; dp != NULL; dp = dp->child) {
-                disptype = (unsigned char *)get_property(dp, "display-type", NULL);
-                if (disptype == NULL)
-                        continue;
-                if (strncmp(disptype, "LCD", 3) != 0)
-                        continue;
+        parent = pci_device_to_OF_node(par->pci_dev);
+        if (parent == NULL)
+                return -1;
+        if (par->twoHeads) {
+                char *pname;
+                int len;
+
+                for (dp = NULL;
+                     (dp = of_get_next_child(parent, dp)) != NULL;) {
+                        pname = (char *)get_property(dp, "name", NULL);
+                        if (!pname)
+                                continue;
+                        len = strlen(pname);
+                        if ((pname[len-1] == 'A' && conn == 1) ||
+                            (pname[len-1] == 'B' && conn == 2)) {
+                                for (i = 0; propnames[i] != NULL; ++i) {
+                                        pedid = (unsigned char *)
+                                                get_property(dp, propnames[i],
+                                                             NULL);
+                                        if (pedid != NULL)
+                                                break;
+                                }
+                                of_node_put(dp);
+                                break;
+                        }
+                }
+        }
+        if (pedid == NULL) {
                 for (i = 0; propnames[i] != NULL; ++i) {
                         pedid = (unsigned char *)
-                                get_property(dp, propnames[i], NULL);
-                        if (pedid != NULL) {
-                                *out_edid = pedid;
-                                return 0;
-                        }
+                                get_property(parent, propnames[i], NULL);
+                        if (pedid != NULL)
+                                break;
                 }
         }
-        return 1;
+        if (pedid) {
+                *out_edid = kmalloc(EDID_LENGTH, GFP_KERNEL);
+                if (*out_edid == NULL)
+                        return -1;
+                memcpy(*out_edid, pedid, EDID_LENGTH);
+                printk(KERN_DEBUG "nvidiafb: Found OF EDID for head %d\n", conn);
+                return 0;
+        }
+        return -1;
 }
diff --git a/drivers/video/nvidia/nv_proto.h b/drivers/video/nvidia/nv_proto.h
index cac44fc7f587..f60b1f432270 100644
--- a/drivers/video/nvidia/nv_proto.h
+++ b/drivers/video/nvidia/nv_proto.h
@@ -31,7 +31,7 @@ int NVShowHideCursor(struct nvidia_par *par, int);
 void NVLockUnlock(struct nvidia_par *par, int);
 
 /* in nvidia-i2c.c */
-#if defined(CONFIG_FB_NVIDIA_I2C) || defined (CONFIG_PPC_OF)
+#ifdef CONFIG_FB_NVIDIA_I2C
 void nvidia_create_i2c_busses(struct nvidia_par *par);
 void nvidia_delete_i2c_busses(struct nvidia_par *par);
 int nvidia_probe_i2c_connector(struct fb_info *info, int conn,
@@ -39,10 +39,18 @@ int nvidia_probe_i2c_connector(struct fb_info *info, int conn,
 #else
 #define nvidia_create_i2c_busses(...)
 #define nvidia_delete_i2c_busses(...)
-#define nvidia_probe_i2c_connector(p, c, edid) \
-do {                                           \
-        *(edid) = NULL;                        \
-} while(0)
+#define nvidia_probe_i2c_connector(p, c, edid) (-1)
+#endif
+
+#ifdef CONFIG_FB_OF
+int nvidia_probe_of_connector(struct fb_info *info, int conn,
+                              u8 ** out_edid);
+#else
+static inline int nvidia_probe_of_connector(struct fb_info *info, int conn,
+                                      u8 ** out_edid)
+{
+        return -1;
+}
 #endif
 
 /* in nv_accel.c */
diff --git a/drivers/video/nvidia/nv_setup.c b/drivers/video/nvidia/nv_setup.c
index 11c84178f420..1f06a9f1bd0f 100644
--- a/drivers/video/nvidia/nv_setup.c
+++ b/drivers/video/nvidia/nv_setup.c
@@ -190,9 +190,9 @@ static int NVIsConnected(struct nvidia_par *par, int output)
         present = (NV_RD32(PRAMDAC, 0x0608) & (1 << 28)) ? 1 : 0;
 
         if (present)
-                printk("nvidiafb: CRTC%i found\n", output);
+                printk("nvidiafb: CRTC%i analog found\n", output);
         else
-                printk("nvidiafb: CRTC%i not found\n", output);
+                printk("nvidiafb: CRTC%i analog not found\n", output);
 
         NV_WR32(par->PRAMDAC0, 0x0608, NV_RD32(par->PRAMDAC0, 0x0608) &
                 0x0000EFFF);
@@ -305,6 +305,9 @@ void NVCommonSetup(struct fb_info *info)
         int FlatPanel = -1;     /* really means the CRTC is slaved */
         int Television = 0;
 
+        memset(&monitorA, 0, sizeof(struct fb_monspecs));
+        memset(&monitorB, 0, sizeof(struct fb_monspecs));
+
         par->PRAMIN = par->REGS + (0x00710000 / 4);
         par->PCRTC0 = par->REGS + (0x00600000 / 4);
         par->PRAMDAC0 = par->REGS + (0x00680000 / 4);
@@ -401,7 +404,8 @@ void NVCommonSetup(struct fb_info *info)
         nvidia_create_i2c_busses(par);
         if (!par->twoHeads) {
                 par->CRTCnumber = 0;
-                nvidia_probe_i2c_connector(info, 1, &edidA);
+                if (nvidia_probe_i2c_connector(info, 1, &edidA))
+                        nvidia_probe_of_connector(info, 1, &edidA);
                 if (edidA && !fb_parse_edid(edidA, &var)) {
                         printk("nvidiafb: EDID found from BUS1\n");
                         monA = &monitorA;
@@ -488,14 +492,16 @@ void NVCommonSetup(struct fb_info *info)
                 oldhead = NV_RD32(par->PCRTC0, 0x00000860);
                 NV_WR32(par->PCRTC0, 0x00000860, oldhead | 0x00000010);
 
-                nvidia_probe_i2c_connector(info, 1, &edidA);
+                if (nvidia_probe_i2c_connector(info, 1, &edidA))
+                        nvidia_probe_of_connector(info, 1, &edidA);
                 if (edidA && !fb_parse_edid(edidA, &var)) {
                         printk("nvidiafb: EDID found from BUS1\n");
                         monA = &monitorA;
                         fb_edid_to_monspecs(edidA, monA);
                 }
 
-                nvidia_probe_i2c_connector(info, 2, &edidB);
+                if (nvidia_probe_i2c_connector(info, 2, &edidB))
+                        nvidia_probe_of_connector(info, 2, &edidB);
                 if (edidB && !fb_parse_edid(edidB, &var)) {
                         printk("nvidiafb: EDID found from BUS2\n");
                         monB = &monitorB;
diff --git a/drivers/video/nvidia/nvidia.c b/drivers/video/nvidia/nvidia.c
index 308defc389a2..0b40a2a721c1 100644
--- a/drivers/video/nvidia/nvidia.c
+++ b/drivers/video/nvidia/nvidia.c
@@ -411,6 +411,7 @@ MODULE_DEVICE_TABLE(pci, nvidiafb_pci_tbl);
 
 /* command line data, set in nvidiafb_setup() */
 static int flatpanel __devinitdata = -1;        /* Autodetect later */
+static int fpdither __devinitdata = -1;
 static int forceCRTC __devinitdata = -1;
 static int hwcur __devinitdata = 0;
 static int noaccel __devinitdata = 0;
@@ -627,41 +628,85 @@ static void nvidia_save_vga(struct nvidia_par *par,
         NVTRACE_LEAVE();
 }
 
+#undef DUMP_REG
+
 static void nvidia_write_regs(struct nvidia_par *par)
 {
         struct _riva_hw_state *state = &par->ModeReg;
         int i;
 
         NVTRACE_ENTER();
-        NVWriteCrtc(par, 0x11, 0x00);
-
-        NVLockUnlock(par, 0);
 
         NVLoadStateExt(par, state);
 
         NVWriteMiscOut(par, state->misc_output);
 
+        for (i = 1; i < NUM_SEQ_REGS; i++) {
+#ifdef DUMP_REG
+                printk(" SEQ[%02x] = %08x\n", i, state->seq[i]);
+#endif
+                NVWriteSeq(par, i, state->seq[i]);
+        }
+
+        /* Ensure CRTC registers 0-7 are unlocked by clearing bit 7 of CRTC[17] */
+        NVWriteCrtc(par, 0x11, state->crtc[0x11] & ~0x80);
+
         for (i = 0; i < NUM_CRT_REGS; i++) {
                 switch (i) {
                 case 0x19:
                 case 0x20 ... 0x40:
                         break;
                 default:
+#ifdef DUMP_REG
+                        printk("CRTC[%02x] = %08x\n", i, state->crtc[i]);
+#endif
                         NVWriteCrtc(par, i, state->crtc[i]);
                 }
         }
 
-        for (i = 0; i < NUM_ATC_REGS; i++)
-                NVWriteAttr(par, i, state->attr[i]);
-
-        for (i = 0; i < NUM_GRC_REGS; i++)
+        for (i = 0; i < NUM_GRC_REGS; i++) {
+#ifdef DUMP_REG
+                printk(" GRA[%02x] = %08x\n", i, state->gra[i]);
+#endif
                 NVWriteGr(par, i, state->gra[i]);
+        }
+
+        for (i = 0; i < NUM_ATC_REGS; i++) {
+#ifdef DUMP_REG
+                printk("ATTR[%02x] = %08x\n", i, state->attr[i]);
+#endif
+                NVWriteAttr(par, i, state->attr[i]);
+        }
 
-        for (i = 0; i < NUM_SEQ_REGS; i++)
-                NVWriteSeq(par, i, state->seq[i]);
         NVTRACE_LEAVE();
 }
 
+static void nvidia_vga_protect(struct nvidia_par *par, int on)
+{
+        unsigned char tmp;
+
+        if (on) {
+                /*
+                 * Turn off screen and disable sequencer.
+                 */
+                tmp = NVReadSeq(par, 0x01);
+
+                NVWriteSeq(par, 0x00, 0x01);            /* Synchronous Reset */
+                NVWriteSeq(par, 0x01, tmp | 0x20);      /* disable the display */
+        } else {
+                /*
+                 * Reenable sequencer, then turn on screen.
+                 */
+
+                tmp = NVReadSeq(par, 0x01);
+
+                NVWriteSeq(par, 0x01, tmp & ~0x20);     /* reenable display */
+                NVWriteSeq(par, 0x00, 0x03);            /* End Reset */
+        }
+}
+
+
+
 static int nvidia_calc_regs(struct fb_info *info)
 {
         struct nvidia_par *par = info->par;
@@ -868,7 +913,7 @@ static void nvidia_init_vga(struct fb_info *info)
         for (i = 0; i < 0x10; i++)
                 state->attr[i] = i;
         state->attr[0x10] = 0x41;
-        state->attr[0x11] = 0x01;
+        state->attr[0x11] = 0xff;
         state->attr[0x12] = 0x0f;
         state->attr[0x13] = 0x00;
         state->attr[0x14] = 0x00;
@@ -982,16 +1027,24 @@ static int nvidiafb_set_par(struct fb_info *info)
         NVTRACE_ENTER();
 
         NVLockUnlock(par, 1);
-        if (!par->FlatPanel || (info->var.bits_per_pixel != 24) ||
-            !par->twoHeads)
+        if (!par->FlatPanel || !par->twoHeads)
                 par->FPDither = 0;
 
+        if (par->FPDither < 0) {
+                if ((par->Chipset & 0x0ff0) == 0x0110)
+                        par->FPDither = !!(NV_RD32(par->PRAMDAC, 0x0528)
+                                           & 0x00010000);
+                else
+                        par->FPDither = !!(NV_RD32(par->PRAMDAC, 0x083C) & 1);
+                printk(KERN_INFO PFX "Flat panel dithering %s\n",
+                       par->FPDither ? "enabled" : "disabled");
+        }
+
         info->fix.visual = (info->var.bits_per_pixel == 8) ?
             FB_VISUAL_PSEUDOCOLOR : FB_VISUAL_DIRECTCOLOR;
 
         nvidia_init_vga(info);
         nvidia_calc_regs(info);
-        nvidia_write_regs(par);
 
         NVLockUnlock(par, 0);
         if (par->twoHeads) {
@@ -1000,7 +1053,22 @@ static int nvidiafb_set_par(struct fb_info *info)
                 NVLockUnlock(par, 0);
         }
 
-        NVWriteCrtc(par, 0x11, 0x00);
+        nvidia_vga_protect(par, 1);
+
+        nvidia_write_regs(par);
+
+#if defined (__BIG_ENDIAN)
+        /* turn on LFB swapping */
+        {
+                unsigned char tmp;
+
+                VGA_WR08(par->PCIO, 0x3d4, 0x46);
+                tmp = VGA_RD08(par->PCIO, 0x3d5);
+                tmp |= (1 << 7);
+                VGA_WR08(par->PCIO, 0x3d5, tmp);
+    }
+#endif
+
         info->fix.line_length = (info->var.xres_virtual *
                                  info->var.bits_per_pixel) >> 3;
         if (info->var.accel_flags) {
@@ -1022,7 +1090,7 @@ static int nvidiafb_set_par(struct fb_info *info)
 
         par->cursor_reset = 1;
 
-        NVWriteCrtc(par, 0x11, 0xff);
+        nvidia_vga_protect(par, 0);
 
         NVTRACE_LEAVE();
         return 0;
@@ -1315,22 +1383,10 @@ static int __devinit nvidia_set_fbinfo(struct fb_info *info)
         fb_var_to_videomode(&modedb, &nvidiafb_default_var);
 
         if (specs->modedb != NULL) {
-                /* get preferred timing */
-                if (specs->misc & FB_MISC_1ST_DETAIL) {
-                        int i;
-
-                        for (i = 0; i < specs->modedb_len; i++) {
-                                if (specs->modedb[i].flag & FB_MODE_IS_FIRST) {
-                                        modedb = specs->modedb[i];
-                                        break;
-                                }
-                        }
-                } else {
-                        /* otherwise, get first mode in database */
-                        modedb = specs->modedb[0];
-                }
+                struct fb_videomode *modedb;
 
-                fb_videomode_to_var(&nvidiafb_default_var, &modedb);
+                modedb = fb_find_best_display(specs, &info->modelist);
+                fb_videomode_to_var(&nvidiafb_default_var, modedb);
                 nvidiafb_default_var.bits_per_pixel = 8;
         } else if (par->fpWidth && par->fpHeight) {
                 char buf[16];
@@ -1365,7 +1421,7 @@ static int __devinit nvidia_set_fbinfo(struct fb_info *info)
         info->pixmap.flags = FB_PIXMAP_SYSTEM;
 
         if (!hwcur)
-            info->fbops->fb_cursor = soft_cursor;
+            info->fbops->fb_cursor = NULL;
 
         info->var.accel_flags = (!noaccel);
 
@@ -1490,9 +1546,9 @@ static int __devinit nvidiafb_probe(struct pci_dev *pd,
         sprintf(nvidiafb_fix.id, "NV%x", (pd->device & 0x0ff0) >> 4);
 
         par->FlatPanel = flatpanel;
-
         if (flatpanel == 1)
                 printk(KERN_INFO PFX "flatpanel support enabled\n");
+        par->FPDither = fpdither;
 
         par->CRTCnumber = forceCRTC;
         par->FpScale = (!noscale);
@@ -1671,6 +1727,8 @@ static int __devinit nvidiafb_setup(char *options)
                 } else if (!strncmp(this_opt, "nomtrr", 6)) {
                         nomtrr = 1;
 #endif
+                } else if (!strncmp(this_opt, "fpdither:", 9)) {
+                        fpdither = simple_strtol(this_opt+9, NULL, 0);
                 } else
                         mode_option = this_opt;
         }
@@ -1717,7 +1775,11 @@ module_exit(nvidiafb_exit);
 module_param(flatpanel, int, 0);
 MODULE_PARM_DESC(flatpanel,
                  "Enables experimental flat panel support for some chipsets. "
-                 "(0 or 1=enabled) (default=0)");
+                 "(0=disabled, 1=enabled, -1=autodetect) (default=-1)");
+module_param(fpdither, int, 0);
+MODULE_PARM_DESC(fpdither,
+                 "Enables dithering of flat panel for 6 bits panels. "
+                 "(0=disabled, 1=enabled, -1=autodetect) (default=-1)");
 module_param(hwcur, int, 0);
 MODULE_PARM_DESC(hwcur,
                  "Enables hardware cursor implementation. (0 or 1=enabled) "
diff --git a/drivers/video/offb.c b/drivers/video/offb.c
index 611922c0b22f..2c856838694e 100644
--- a/drivers/video/offb.c
+++ b/drivers/video/offb.c
@@ -85,7 +85,6 @@ static struct fb_ops offb_ops = {
         .fb_fillrect    = cfb_fillrect,
         .fb_copyarea    = cfb_copyarea,
         .fb_imageblit   = cfb_imageblit,
-        .fb_cursor      = soft_cursor,
 };
 
     /*
diff --git a/drivers/video/p9100.c b/drivers/video/p9100.c
index b76a5a9a125b..9aaf65fb623a 100644
--- a/drivers/video/p9100.c
+++ b/drivers/video/p9100.c
@@ -48,7 +48,6 @@ static struct fb_ops p9100_ops = {
         .fb_imageblit           = cfb_imageblit,
         .fb_mmap                = p9100_mmap,
         .fb_ioctl               = p9100_ioctl,
-        .fb_cursor              = soft_cursor,
 };
 
 /* P9100 control registers */
diff --git a/drivers/video/platinumfb.c b/drivers/video/platinumfb.c
index b00887e9851c..ca4082ae5a18 100644
--- a/drivers/video/platinumfb.c
+++ b/drivers/video/platinumfb.c
@@ -109,7 +109,6 @@ static struct fb_ops platinumfb_ops = {
         .fb_fillrect    = cfb_fillrect,
         .fb_copyarea    = cfb_copyarea,
         .fb_imageblit   = cfb_imageblit,
-        .fb_cursor      = soft_cursor,
 };
 
 /*
diff --git a/drivers/video/pm2fb.c b/drivers/video/pm2fb.c
index 42c17efa9fb0..0277ce031e5e 100644
--- a/drivers/video/pm2fb.c
+++ b/drivers/video/pm2fb.c
@@ -1034,7 +1034,6 @@ static struct fb_ops pm2fb_ops = {
         .fb_fillrect    = cfb_fillrect,
         .fb_copyarea    = cfb_copyarea,
         .fb_imageblit   = cfb_imageblit,
-        .fb_cursor      = soft_cursor,
 };
 
 /*
@@ -1121,6 +1120,22 @@ static int __devinit pm2fb_probe(struct pci_dev *pdev,
                 default_par->mem_control, default_par->boot_address,
                 default_par->mem_config);
 
+        if(default_par->mem_control == 0 &&
+                default_par->boot_address == 0x31 &&
+                default_par->mem_config == 0x259fffff &&
+                pdev->subsystem_vendor == 0x1048 &&
+                pdev->subsystem_device == 0x0a31) {
+                DPRINTK("subsystem_vendor: %04x, subsystem_device: %04x\n",
+                        pdev->subsystem_vendor, pdev->subsystem_device);
+                DPRINTK("We have not been initialized by VGA BIOS "
+                        "and are running on an Elsa Winner 2000 Office\n");
+                DPRINTK("Initializing card timings manually...\n");
+                default_par->mem_control=0;
+                default_par->boot_address=0x20;
+                default_par->mem_config=0xe6002021;
+                default_par->memclock=100000;
+        }
+
         /* Now work out how big lfb is going to be. */
         switch(default_par->mem_config & PM2F_MEM_CONFIG_RAM_MASK) {
         case PM2F_MEM_BANKS_1:
diff --git a/drivers/video/pmag-ba-fb.c b/drivers/video/pmag-ba-fb.c
index c98f1c8d7dc2..f3927b6cda9d 100644
--- a/drivers/video/pmag-ba-fb.c
+++ b/drivers/video/pmag-ba-fb.c
@@ -128,7 +128,6 @@ static struct fb_ops pmagbafb_ops = {
         .fb_fillrect    = cfb_fillrect,
         .fb_copyarea    = cfb_copyarea,
         .fb_imageblit   = cfb_imageblit,
-        .fb_cursor      = soft_cursor,
 };
 
 
diff --git a/drivers/video/pmagb-b-fb.c b/drivers/video/pmagb-b-fb.c
index a483b13e117b..25148de5fe67 100644
--- a/drivers/video/pmagb-b-fb.c
+++ b/drivers/video/pmagb-b-fb.c
@@ -132,7 +132,6 @@ static struct fb_ops pmagbbfb_ops = {
         .fb_fillrect    = cfb_fillrect,
         .fb_copyarea    = cfb_copyarea,
         .fb_imageblit   = cfb_imageblit,
-        .fb_cursor      = soft_cursor,
 };
 
 
diff --git a/drivers/video/pvr2fb.c b/drivers/video/pvr2fb.c
index 31c547fd383b..ec4bacf9dd2e 100644
--- a/drivers/video/pvr2fb.c
+++ b/drivers/video/pvr2fb.c
@@ -230,7 +230,6 @@ static struct fb_ops pvr2fb_ops = {
         .fb_fillrect    = cfb_fillrect,
         .fb_copyarea    = cfb_copyarea,
         .fb_imageblit   = cfb_imageblit,
-        .fb_cursor      = soft_cursor,
 };
 
 static struct fb_videomode pvr2_modedb[] __initdata = {
diff --git a/drivers/video/pxafb.c b/drivers/video/pxafb.c
index efd9333b05c2..f305a5b77b23 100644
--- a/drivers/video/pxafb.c
+++ b/drivers/video/pxafb.c
@@ -418,7 +418,6 @@ static struct fb_ops pxafb_ops = {
         .fb_copyarea    = cfb_copyarea,
         .fb_imageblit   = cfb_imageblit,
         .fb_blank       = pxafb_blank,
-        .fb_cursor      = soft_cursor,
         .fb_mmap        = pxafb_mmap,
 };
 
diff --git a/drivers/video/q40fb.c b/drivers/video/q40fb.c
index 8416b2e2b501..bfc41f2c902a 100644
--- a/drivers/video/q40fb.c
+++ b/drivers/video/q40fb.c
@@ -84,7 +84,6 @@ static struct fb_ops q40fb_ops = {
         .fb_fillrect    = cfb_fillrect,
         .fb_copyarea    = cfb_copyarea,
         .fb_imageblit   = cfb_imageblit,
-        .fb_cursor      = soft_cursor,
 };
 
 static int __init q40fb_probe(struct device *device)
diff --git a/drivers/video/radeonfb.c b/drivers/video/radeonfb.c
index a78b9bd8f897..600318f708f2 100644
--- a/drivers/video/radeonfb.c
+++ b/drivers/video/radeonfb.c
@@ -2218,7 +2218,6 @@ static struct fb_ops radeonfb_ops = {
         .fb_copyarea    = cfb_copyarea,
         .fb_imageblit   = cfb_imageblit,
 #endif
-        .fb_cursor      = soft_cursor,
 };
 
 
diff --git a/drivers/video/s1d13xxxfb.c b/drivers/video/s1d13xxxfb.c
index f4437430dc5f..3edbd14c5c46 100644
--- a/drivers/video/s1d13xxxfb.c
+++ b/drivers/video/s1d13xxxfb.c
@@ -388,7 +388,6 @@ static struct fb_ops s1d13xxxfb_fbops = {
         .fb_fillrect    = cfb_fillrect,
         .fb_copyarea    = cfb_copyarea,
         .fb_imageblit   = cfb_imageblit,
-        .fb_cursor      = soft_cursor
 };
 
 static int s1d13xxxfb_width_tab[2][4] __devinitdata = {
diff --git a/drivers/video/s3c2410fb.c b/drivers/video/s3c2410fb.c
index 3cef90456a4b..855a6778b9eb 100644
--- a/drivers/video/s3c2410fb.c
+++ b/drivers/video/s3c2410fb.c
@@ -495,7 +495,6 @@ static struct fb_ops s3c2410fb_ops = {
         .fb_fillrect    = cfb_fillrect,
         .fb_copyarea    = cfb_copyarea,
         .fb_imageblit   = cfb_imageblit,
-        .fb_cursor      = soft_cursor,
 };
 
 
@@ -885,6 +884,7 @@ static int s3c2410fb_resume(struct device *dev)
 
 static struct device_driver s3c2410fb_driver = {
         .name           = "s3c2410-lcd",
+        .owner          = THIS_MODULE,
         .bus            = &platform_bus_type,
         .probe          = s3c2410fb_probe,
         .suspend        = s3c2410fb_suspend,
diff --git a/drivers/video/sa1100fb.c b/drivers/video/sa1100fb.c
index 3d35b28aaac7..a5184575cfae 100644
--- a/drivers/video/sa1100fb.c
+++ b/drivers/video/sa1100fb.c
@@ -853,7 +853,6 @@ static struct fb_ops sa1100fb_ops = {
         .fb_copyarea    = cfb_copyarea,
         .fb_imageblit   = cfb_imageblit,
         .fb_blank       = sa1100fb_blank,
-        .fb_cursor      = soft_cursor,
         .fb_mmap        = sa1100fb_mmap,
 };
 
diff --git a/drivers/video/savage/savagefb.h b/drivers/video/savage/savagefb.h
index ea17f7e0482c..58cfdfb41833 100644
--- a/drivers/video/savage/savagefb.h
+++ b/drivers/video/savage/savagefb.h
@@ -169,6 +169,7 @@ struct savagefb_par {
         struct savagefb_i2c_chan chan;
         unsigned char   *edid;
         u32 pseudo_palette[16];
+        int paletteEnabled;
         int pm_state;
         int display_type;
         int dvi;
@@ -244,105 +245,150 @@ struct savagefb_par {
 
 
 /* IO functions */
+static inline u8 savage_in8(u32 addr, struct savagefb_par *par)
+{
+        return readb(par->mmio.vbase + addr);
+}
+
+static inline u16 savage_in16(u32 addr, struct savagefb_par *par)
+{
+        return readw(par->mmio.vbase + addr);
+}
+
+static inline u32 savage_in32(u32 addr, struct savagefb_par *par)
+{
+        return readl(par->mmio.vbase + addr);
+}
+
+static inline void savage_out8(u32 addr, u8 val, struct savagefb_par *par)
+{
+        writeb(val, par->mmio.vbase + addr);
+}
+
+static inline void savage_out16(u32 addr, u16 val, struct savagefb_par *par)
+{
+        writew(val, par->mmio.vbase + addr);
+}
+
+static inline void savage_out32(u32 addr, u32 val, struct savagefb_par *par)
+{
+        writel(val, par->mmio.vbase + addr);
+}
+
+static inline u8 vga_in8(int addr, struct savagefb_par *par)
+{
+        return savage_in8(0x8000 + addr, par);
+}
+
+static inline u16 vga_in16(int addr, struct savagefb_par *par)
+{
+        return savage_in16(0x8000 + addr, par);
+}
+
+static inline u8 vga_in32(int addr, struct savagefb_par *par)
+{
+        return savage_in32(0x8000 + addr, par);
+}
+
+static inline void vga_out8(int addr, u8 val, struct savagefb_par *par)
+{
+        savage_out8(0x8000 + addr, val, par);
+}
+
+static inline void vga_out16(int addr, u16 val, struct savagefb_par *par)
+{
+        savage_out16(0x8000 + addr, val, par);
+}
+
+static inline void vga_out32(int addr, u32 val, struct savagefb_par *par)
+{
+        savage_out32(0x8000 + addr, val, par);
+}
 
-#define  vga_in8(addr)         (inb (addr))
-#define vga_in16(addr)         (inw (addr))
-#define vga_in32(addr)         (inl (addr))
+static inline u8 VGArCR (u8 index, struct savagefb_par *par)
+{
+        vga_out8(0x3d4, index,  par);
+        return vga_in8(0x3d5, par);
+}
+
+static inline u8 VGArGR (u8 index, struct savagefb_par *par)
+{
+        vga_out8(0x3ce, index, par);
+        return vga_in8(0x3cf, par);
+}
+
+static inline u8 VGArSEQ (u8 index, struct savagefb_par *par)
+{
+        vga_out8(0x3c4, index, par);
+        return vga_in8(0x3c5, par);
+}
 
-#define  vga_out8(addr,val)    (outb ((val), (addr)))
-#define vga_out16(addr,val)    (outw ((val), (addr)))
-#define vga_out32(addr,val)    (outl ((val), (addr)))
+static inline void VGAwCR(u8 index, u8 val, struct savagefb_par *par)
+{
+        vga_out8(0x3d4, index, par);
+        vga_out8(0x3d5, val, par);
+}
 
-#define savage_in16(addr)      readw(par->mmio.vbase + (addr))
-#define savage_in32(addr)      readl(par->mmio.vbase + (addr))
+static inline void VGAwGR(u8 index, u8 val, struct savagefb_par *par)
+{
+        vga_out8(0x3ce, index, par);
+        vga_out8(0x3cf, val, par);
+}
 
-#define savage_out16(addr,val) writew((val), par->mmio.vbase + (addr))
-#define savage_out32(addr,val) writel((val), par->mmio.vbase + (addr))
+static inline void VGAwSEQ(u8 index, u8 val, struct savagefb_par *par)
+{
+        vga_out8(0x3c4, index, par);
+        vga_out8 (0x3c5, val, par);
+}
 
-static inline u8 VGArCR (u8 index)
+static inline void VGAenablePalette(struct savagefb_par *par)
 {
-  outb (index, 0x3d4);
-  return inb (0x3d5);
+        u8 tmp;
+
+        tmp = vga_in8(0x3da, par);
+        vga_out8(0x3c0, 0x00, par);
+        par->paletteEnabled = 1;
 }
 
-static inline u8 VGArGR (u8 index)
+static inline void VGAdisablePalette(struct savagefb_par *par)
 {
-  outb (index, 0x3ce);
-  return inb (0x3cf);
+        u8 tmp;
+
+        tmp = vga_in8(0x3da, par);
+        vga_out8(0x3c0, 0x20, par);
+        par->paletteEnabled = 0;
 }
 
-static inline u8 VGArSEQ (u8 index)
+static inline void VGAwATTR(u8 index, u8 value, struct savagefb_par *par)
 {
-  outb (index, 0x3c4);
-  return inb (0x3c5);
+        u8 tmp;
+
+        if (par->paletteEnabled)
+                index &= ~0x20;
+        else
+                index |= 0x20;
+
+        tmp = vga_in8(0x3da, par);
+        vga_out8(0x3c0, index, par);
+        vga_out8 (0x3c0, value, par);
 }
 
-#define VGAwCR(index, val) \
-do {                       \
-  vga_out8 (0x3d4, index); \
-  vga_out8 (0x3d5, val);   \
-} while (0)
-
-#define VGAwGR(index, val) \
-do {                       \
-  vga_out8 (0x3ce, index); \
-  vga_out8 (0x3cf, val);   \
-} while (0)
-
-#define VGAwSEQ(index, val) \
-do {                        \
-  vga_out8 (0x3c4, index);  \
-  vga_out8 (0x3c5, val);    \
-} while (0)
-
-#define VGAenablePalette() \
-do {                       \
-  u8 tmp;                  \
-                           \
-  tmp = vga_in8 (0x3da);   \
-  vga_out8 (0x3c0, 0x00);  \
-  paletteEnabled = 1;      \
-} while (0)
-
-#define VGAdisablePalette() \
-do {                        \
-  u8 tmp;                   \
-                            \
-  tmp = vga_in8 (0x3da);    \
-  vga_out8 (0x3c0, 0x20);   \
-  paletteEnabled = 0;       \
-} while (0)
-
-#define VGAwATTR(index, value) \
-do {                           \
-  u8 tmp;                      \
-                               \
-  if (paletteEnabled)          \
-    index &= ~0x20;            \
-  else                         \
-    index |= 0x20;             \
-                               \
-  tmp = vga_in8 (0x3da);       \
-  vga_out8 (0x3c0, index);     \
-  vga_out8 (0x3c0, value);     \
-} while (0)
-
-#define VGAwMISC(value)    \
-do {                       \
-  vga_out8 (0x3c2, value); \
-} while (0)
+static inline void VGAwMISC(u8 value, struct savagefb_par *par)
+{
+        vga_out8(0x3c2, value, par);
+}
 
 #ifndef CONFIG_FB_SAVAGE_ACCEL
 #define savagefb_set_clip(x)
 #endif
 
-#define VerticalRetraceWait() \
-{ \
-        vga_out8 (0x3d4, 0x17); \
-        if (vga_in8 (0x3d5) & 0x80) { \
-                while ((vga_in8(0x3da) & 0x08) == 0x08) ; \
-                while ((vga_in8(0x3da) & 0x08) == 0x00) ; \
-        } \
+static inline void VerticalRetraceWait(struct savagefb_par *par)
+{
+        vga_out8(0x3d4, 0x17, par);
+        if (vga_in8(0x3d5, par) & 0x80) {
+                while ((vga_in8(0x3da, par) & 0x08) == 0x08);
+                while ((vga_in8(0x3da, par) & 0x08) == 0x00);
+        }
 }
 
 extern int savagefb_probe_i2c_connector(struct fb_info *info,
diff --git a/drivers/video/savage/savagefb_driver.c b/drivers/video/savage/savagefb_driver.c
index 7c285455c924..f0dfb35e3191 100644
--- a/drivers/video/savage/savagefb_driver.c
+++ b/drivers/video/savage/savagefb_driver.c
@@ -74,7 +74,6 @@
 
 
 static char *mode_option __initdata = NULL;
-static int   paletteEnabled = 0;
 
 #ifdef MODULE
 
@@ -90,9 +89,9 @@ MODULE_DESCRIPTION("FBDev driver for S3 Savage PCI/AGP Chips");
 static void vgaHWSeqReset (struct savagefb_par *par, int start)
 {
         if (start)
-                VGAwSEQ (0x00, 0x01);           /* Synchronous Reset */
+                VGAwSEQ (0x00, 0x01, par);      /* Synchronous Reset */
         else
-                VGAwSEQ (0x00, 0x03);           /* End Reset */
+                VGAwSEQ (0x00, 0x03, par);      /* End Reset */
 }
 
 static void vgaHWProtect (struct savagefb_par *par, int on)
@@ -103,23 +102,23 @@ static void vgaHWProtect (struct savagefb_par *par, int on)
                 /*
                  * Turn off screen and disable sequencer.
                  */
-                tmp = VGArSEQ (0x01);
+                tmp = VGArSEQ (0x01, par);
 
                 vgaHWSeqReset (par, 1);         /* start synchronous reset */
-                VGAwSEQ (0x01, tmp | 0x20);     /* disable the display */
+                VGAwSEQ (0x01, tmp | 0x20, par);/* disable the display */
 
-                VGAenablePalette();
+                VGAenablePalette(par);
         } else {
                 /*
                  * Reenable sequencer, then turn on screen.
                  */
 
-                tmp = VGArSEQ (0x01);
+                tmp = VGArSEQ (0x01, par);
 
-                VGAwSEQ (0x01, tmp & ~0x20);    /* reenable display */
+                VGAwSEQ (0x01, tmp & ~0x20, par);/* reenable display */
                 vgaHWSeqReset (par, 0);         /* clear synchronous reset */
 
-                VGAdisablePalette();
+                VGAdisablePalette(par);
         }
 }
 
@@ -127,27 +126,27 @@ static void vgaHWRestore (struct savagefb_par  *par)
 {
         int i;
 
-        VGAwMISC (par->MiscOutReg);
+        VGAwMISC (par->MiscOutReg, par);
 
         for (i = 1; i < 5; i++)
-                VGAwSEQ (i, par->Sequencer[i]);
+                VGAwSEQ (i, par->Sequencer[i], par);
 
         /* Ensure CRTC registers 0-7 are unlocked by clearing bit 7 or
            CRTC[17] */
-        VGAwCR (17, par->CRTC[17] & ~0x80);
+        VGAwCR (17, par->CRTC[17] & ~0x80, par);
 
         for (i = 0; i < 25; i++)
-                VGAwCR (i, par->CRTC[i]);
+                VGAwCR (i, par->CRTC[i], par);
 
         for (i = 0; i < 9; i++)
-                VGAwGR (i, par->Graphics[i]);
+                VGAwGR (i, par->Graphics[i], par);
 
-        VGAenablePalette();
+        VGAenablePalette(par);
 
         for (i = 0; i < 21; i++)
-                VGAwATTR (i, par->Attribute[i]);
+                VGAwATTR (i, par->Attribute[i], par);
 
-        VGAdisablePalette();
+        VGAdisablePalette(par);
 }
 
 static void vgaHWInit (struct fb_var_screeninfo *var,
@@ -267,7 +266,7 @@ savage3D_waitfifo(struct savagefb_par *par, int space)
 {
         int slots = MAXFIFO - space;
 
-        while ((savage_in32(0x48C00) & 0x0000ffff) > slots);
+        while ((savage_in32(0x48C00, par) & 0x0000ffff) > slots);
 }
 
 static void
@@ -275,7 +274,7 @@ savage4_waitfifo(struct savagefb_par *par, int space)
 {
         int slots = MAXFIFO - space;
 
-        while ((savage_in32(0x48C60) & 0x001fffff) > slots);
+        while ((savage_in32(0x48C60, par) & 0x001fffff) > slots);
 }
 
 static void
@@ -283,26 +282,26 @@ savage2000_waitfifo(struct savagefb_par *par, int space)
 {
         int slots = MAXFIFO - space;
 
-        while ((savage_in32(0x48C60) & 0x0000ffff) > slots);
+        while ((savage_in32(0x48C60, par) & 0x0000ffff) > slots);
 }
 
 /* Wait for idle accelerator */
 static void
 savage3D_waitidle(struct savagefb_par *par)
 {
-        while ((savage_in32(0x48C00) & 0x0008ffff) != 0x80000);
+        while ((savage_in32(0x48C00, par) & 0x0008ffff) != 0x80000);
 }
 
 static void
 savage4_waitidle(struct savagefb_par *par)
 {
-        while ((savage_in32(0x48C60) & 0x00a00000) != 0x00a00000);
+        while ((savage_in32(0x48C60, par) & 0x00a00000) != 0x00a00000);
 }
 
 static void
 savage2000_waitidle(struct savagefb_par *par)
 {
-        while ((savage_in32(0x48C60) & 0x009fffff));
+        while ((savage_in32(0x48C60, par) & 0x009fffff));
 }
 
 
@@ -319,59 +318,64 @@ SavageSetup2DEngine (struct savagefb_par  *par)
         case S3_SAVAGE3D:
         case S3_SAVAGE_MX:
                 /* Disable BCI */
-                savage_out32(0x48C18, savage_in32(0x48C18) & 0x3FF0);
+                savage_out32(0x48C18, savage_in32(0x48C18, par) & 0x3FF0, par);
                 /* Setup BCI command overflow buffer */
-                savage_out32(0x48C14, (par->cob_offset >> 11) | (par->cob_index << 29));
+                savage_out32(0x48C14,
+                             (par->cob_offset >> 11) | (par->cob_index << 29),
+                             par);
                 /* Program shadow status update. */
-                savage_out32(0x48C10, 0x78207220);
-                savage_out32(0x48C0C, 0);
+                savage_out32(0x48C10, 0x78207220, par);
+                savage_out32(0x48C0C, 0, par);
                 /* Enable BCI and command overflow buffer */
-                savage_out32(0x48C18, savage_in32(0x48C18) | 0x0C);
+                savage_out32(0x48C18, savage_in32(0x48C18, par) | 0x0C, par);
                 break;
         case S3_SAVAGE4:
         case S3_PROSAVAGE:
         case S3_SUPERSAVAGE:
                 /* Disable BCI */
-                savage_out32(0x48C18, savage_in32(0x48C18) & 0x3FF0);
+                savage_out32(0x48C18, savage_in32(0x48C18, par) & 0x3FF0, par);
                 /* Program shadow status update */
-                savage_out32(0x48C10, 0x00700040);
-                savage_out32(0x48C0C, 0);
+                savage_out32(0x48C10, 0x00700040, par);
+                savage_out32(0x48C0C, 0, par);
                 /* Enable BCI without the COB */
-                savage_out32(0x48C18, savage_in32(0x48C18) | 0x08);
+                savage_out32(0x48C18, savage_in32(0x48C18, par) | 0x08, par);
                 break;
         case S3_SAVAGE2000:
                 /* Disable BCI */
-                savage_out32(0x48C18, 0);
+                savage_out32(0x48C18, 0, par);
                 /* Setup BCI command overflow buffer */
-                savage_out32(0x48C18, (par->cob_offset >> 7) | (par->cob_index));
+                savage_out32(0x48C18,
+                             (par->cob_offset >> 7) | (par->cob_index),
+                             par);
                 /* Disable shadow status update */
-                savage_out32(0x48A30, 0);
+                savage_out32(0x48A30, 0, par);
                 /* Enable BCI and command overflow buffer */
-                savage_out32(0x48C18, savage_in32(0x48C18) | 0x00280000 );
+                savage_out32(0x48C18, savage_in32(0x48C18, par) | 0x00280000,
+                             par);
                 break;
             default:
                 break;
         }
         /* Turn on 16-bit register access. */
-        vga_out8(0x3d4, 0x31);
-        vga_out8(0x3d5, 0x0c);
+        vga_out8(0x3d4, 0x31, par);
+        vga_out8(0x3d5, 0x0c, par);
 
         /* Set stride to use GBD. */
-        vga_out8 (0x3d4, 0x50);
-        vga_out8 (0x3d5, vga_in8 (0x3d5 ) | 0xC1);
+        vga_out8 (0x3d4, 0x50, par);
+        vga_out8 (0x3d5, vga_in8(0x3d5, par) | 0xC1, par);
 
         /* Enable 2D engine. */
-        vga_out8 (0x3d4, 0x40 );
-        vga_out8 (0x3d5, 0x01 );
+        vga_out8 (0x3d4, 0x40, par);
+        vga_out8 (0x3d5, 0x01, par);
 
-        savage_out32 (MONO_PAT_0, ~0);
-        savage_out32 (MONO_PAT_1, ~0);
+        savage_out32 (MONO_PAT_0, ~0, par);
+        savage_out32 (MONO_PAT_1, ~0, par);
 
         /* Setup plane masks */
-        savage_out32 (0x8128, ~0 ); /* enable all write planes */
-        savage_out32 (0x812C, ~0 ); /* enable all read planes */
-        savage_out16 (0x8134, 0x27 );
-        savage_out16 (0x8136, 0x07 );
+        savage_out32 (0x8128, ~0, par); /* enable all write planes */
+        savage_out32 (0x812C, ~0, par); /* enable all read planes */
+        savage_out16 (0x8134, 0x27, par);
+        savage_out16 (0x8136, 0x07, par);
 
         /* Now set the GBD */
         par->bci_ptr = 0;
@@ -489,8 +493,8 @@ static void SavagePrintRegs(void)
         for( i = 0; i < 0x70; i++ ) {
                 if( !(i % 16) )
                         printk(KERN_DEBUG "\nSR%xx ", i >> 4 );
-                vga_out8( 0x3c4, i );
-                printk(KERN_DEBUG " %02x", vga_in8(0x3c5) );
+                vga_out8( 0x3c4, i, par);
+                printk(KERN_DEBUG " %02x", vga_in8(0x3c5, par) );
         }
 
         printk(KERN_DEBUG "\n\nCR    x0 x1 x2 x3 x4 x5 x6 x7 x8 x9 xA xB xC "
@@ -499,8 +503,8 @@ static void SavagePrintRegs(void)
         for( i = 0; i < 0xB7; i++ ) {
                 if( !(i % 16) )
                         printk(KERN_DEBUG "\nCR%xx ", i >> 4 );
-                vga_out8( vgaCRIndex, i );
-                printk(KERN_DEBUG " %02x", vga_in8(vgaCRReg) );
+                vga_out8( vgaCRIndex, i, par);
+                printk(KERN_DEBUG " %02x", vga_in8(vgaCRReg, par) );
         }
 
         printk(KERN_DEBUG "\n\n");
@@ -513,152 +517,152 @@ static void savage_get_default_par(struct savagefb_par *par)
 {
         unsigned char cr3a, cr53, cr66;
 
-        vga_out16 (0x3d4, 0x4838);
-        vga_out16 (0x3d4, 0xa039);
-        vga_out16 (0x3c4, 0x0608);
-
-        vga_out8 (0x3d4, 0x66);
-        cr66 = vga_in8 (0x3d5);
-        vga_out8 (0x3d5, cr66 | 0x80);
-        vga_out8 (0x3d4, 0x3a);
-        cr3a = vga_in8 (0x3d5);
-        vga_out8 (0x3d5, cr3a | 0x80);
-        vga_out8 (0x3d4, 0x53);
-        cr53 = vga_in8 (0x3d5);
-        vga_out8 (0x3d5, cr53 & 0x7f);
-
-        vga_out8 (0x3d4, 0x66);
-        vga_out8 (0x3d5, cr66);
-        vga_out8 (0x3d4, 0x3a);
-        vga_out8 (0x3d5, cr3a);
-
-        vga_out8 (0x3d4, 0x66);
-        vga_out8 (0x3d5, cr66);
-        vga_out8 (0x3d4, 0x3a);
-        vga_out8 (0x3d5, cr3a);
+        vga_out16 (0x3d4, 0x4838, par);
+        vga_out16 (0x3d4, 0xa039, par);
+        vga_out16 (0x3c4, 0x0608, par);
+
+        vga_out8 (0x3d4, 0x66, par);
+        cr66 = vga_in8 (0x3d5, par);
+        vga_out8 (0x3d5, cr66 | 0x80, par);
+        vga_out8 (0x3d4, 0x3a, par);
+        cr3a = vga_in8 (0x3d5, par);
+        vga_out8 (0x3d5, cr3a | 0x80, par);
+        vga_out8 (0x3d4, 0x53, par);
+        cr53 = vga_in8 (0x3d5, par);
+        vga_out8 (0x3d5, cr53 & 0x7f, par);
+
+        vga_out8 (0x3d4, 0x66, par);
+        vga_out8 (0x3d5, cr66, par);
+        vga_out8 (0x3d4, 0x3a, par);
+        vga_out8 (0x3d5, cr3a, par);
+
+        vga_out8 (0x3d4, 0x66, par);
+        vga_out8 (0x3d5, cr66, par);
+        vga_out8 (0x3d4, 0x3a, par);
+        vga_out8 (0x3d5, cr3a, par);
 
         /* unlock extended seq regs */
-        vga_out8 (0x3c4, 0x08);
-        par->SR08 = vga_in8 (0x3c5);
-        vga_out8 (0x3c5, 0x06);
+        vga_out8 (0x3c4, 0x08, par);
+        par->SR08 = vga_in8 (0x3c5, par);
+        vga_out8 (0x3c5, 0x06, par);
 
         /* now save all the extended regs we need */
-        vga_out8 (0x3d4, 0x31);
-        par->CR31 = vga_in8 (0x3d5);
-        vga_out8 (0x3d4, 0x32);
-        par->CR32 = vga_in8 (0x3d5);
-        vga_out8 (0x3d4, 0x34);
-        par->CR34 = vga_in8 (0x3d5);
-        vga_out8 (0x3d4, 0x36);
-        par->CR36 = vga_in8 (0x3d5);
-        vga_out8 (0x3d4, 0x3a);
-        par->CR3A = vga_in8 (0x3d5);
-        vga_out8 (0x3d4, 0x40);
-        par->CR40 = vga_in8 (0x3d5);
-        vga_out8 (0x3d4, 0x42);
-        par->CR42 = vga_in8 (0x3d5);
-        vga_out8 (0x3d4, 0x45);
-        par->CR45 = vga_in8 (0x3d5);
-        vga_out8 (0x3d4, 0x50);
-        par->CR50 = vga_in8 (0x3d5);
-        vga_out8 (0x3d4, 0x51);
-        par->CR51 = vga_in8 (0x3d5);
-        vga_out8 (0x3d4, 0x53);
-        par->CR53 = vga_in8 (0x3d5);
-        vga_out8 (0x3d4, 0x58);
-        par->CR58 = vga_in8 (0x3d5);
-        vga_out8 (0x3d4, 0x60);
-        par->CR60 = vga_in8 (0x3d5);
-        vga_out8 (0x3d4, 0x66);
-        par->CR66 = vga_in8 (0x3d5);
-        vga_out8 (0x3d4, 0x67);
-        par->CR67 = vga_in8 (0x3d5);
-        vga_out8 (0x3d4, 0x68);
-        par->CR68 = vga_in8 (0x3d5);
-        vga_out8 (0x3d4, 0x69);
-        par->CR69 = vga_in8 (0x3d5);
-        vga_out8 (0x3d4, 0x6f);
-        par->CR6F = vga_in8 (0x3d5);
-
-        vga_out8 (0x3d4, 0x33);
-        par->CR33 = vga_in8 (0x3d5);
-        vga_out8 (0x3d4, 0x86);
-        par->CR86 = vga_in8 (0x3d5);
-        vga_out8 (0x3d4, 0x88);
-        par->CR88 = vga_in8 (0x3d5);
-        vga_out8 (0x3d4, 0x90);
-        par->CR90 = vga_in8 (0x3d5);
-        vga_out8 (0x3d4, 0x91);
-        par->CR91 = vga_in8 (0x3d5);
-        vga_out8 (0x3d4, 0xb0);
-        par->CRB0 = vga_in8 (0x3d5) | 0x80;
+        vga_out8 (0x3d4, 0x31, par);
+        par->CR31 = vga_in8 (0x3d5, par);
+        vga_out8 (0x3d4, 0x32, par);
+        par->CR32 = vga_in8 (0x3d5, par);
+        vga_out8 (0x3d4, 0x34, par);
+        par->CR34 = vga_in8 (0x3d5, par);
+        vga_out8 (0x3d4, 0x36, par);
+        par->CR36 = vga_in8 (0x3d5, par);
+        vga_out8 (0x3d4, 0x3a, par);
+        par->CR3A = vga_in8 (0x3d5, par);
+        vga_out8 (0x3d4, 0x40, par);
+        par->CR40 = vga_in8 (0x3d5, par);
+        vga_out8 (0x3d4, 0x42, par);
+        par->CR42 = vga_in8 (0x3d5, par);
+        vga_out8 (0x3d4, 0x45, par);
+        par->CR45 = vga_in8 (0x3d5, par);
+        vga_out8 (0x3d4, 0x50, par);
+        par->CR50 = vga_in8 (0x3d5, par);
+        vga_out8 (0x3d4, 0x51, par);
+        par->CR51 = vga_in8 (0x3d5, par);
+        vga_out8 (0x3d4, 0x53, par);
+        par->CR53 = vga_in8 (0x3d5, par);
+        vga_out8 (0x3d4, 0x58, par);
+        par->CR58 = vga_in8 (0x3d5, par);
+        vga_out8 (0x3d4, 0x60, par);
+        par->CR60 = vga_in8 (0x3d5, par);
+        vga_out8 (0x3d4, 0x66, par);
+        par->CR66 = vga_in8 (0x3d5, par);
+        vga_out8 (0x3d4, 0x67, par);
+        par->CR67 = vga_in8 (0x3d5, par);
+        vga_out8 (0x3d4, 0x68, par);
+        par->CR68 = vga_in8 (0x3d5, par);
+        vga_out8 (0x3d4, 0x69, par);
+        par->CR69 = vga_in8 (0x3d5, par);
+        vga_out8 (0x3d4, 0x6f, par);
+        par->CR6F = vga_in8 (0x3d5, par);
+
+        vga_out8 (0x3d4, 0x33, par);
+        par->CR33 = vga_in8 (0x3d5, par);
+        vga_out8 (0x3d4, 0x86, par);
+        par->CR86 = vga_in8 (0x3d5, par);
+        vga_out8 (0x3d4, 0x88, par);
+        par->CR88 = vga_in8 (0x3d5, par);
+        vga_out8 (0x3d4, 0x90, par);
+        par->CR90 = vga_in8 (0x3d5, par);
+        vga_out8 (0x3d4, 0x91, par);
+        par->CR91 = vga_in8 (0x3d5, par);
+        vga_out8 (0x3d4, 0xb0, par);
+        par->CRB0 = vga_in8 (0x3d5, par) | 0x80;
 
         /* extended mode timing regs */
-        vga_out8 (0x3d4, 0x3b);
-        par->CR3B = vga_in8 (0x3d5);
-        vga_out8 (0x3d4, 0x3c);
-        par->CR3C = vga_in8 (0x3d5);
-        vga_out8 (0x3d4, 0x43);
-        par->CR43 = vga_in8 (0x3d5);
-        vga_out8 (0x3d4, 0x5d);
-        par->CR5D = vga_in8 (0x3d5);
-        vga_out8 (0x3d4, 0x5e);
-        par->CR5E = vga_in8 (0x3d5);
-        vga_out8 (0x3d4, 0x65);
-        par->CR65 = vga_in8 (0x3d5);
+        vga_out8 (0x3d4, 0x3b, par);
+        par->CR3B = vga_in8 (0x3d5, par);
+        vga_out8 (0x3d4, 0x3c, par);
+        par->CR3C = vga_in8 (0x3d5, par);
+        vga_out8 (0x3d4, 0x43, par);
+        par->CR43 = vga_in8 (0x3d5, par);
+        vga_out8 (0x3d4, 0x5d, par);
+        par->CR5D = vga_in8 (0x3d5, par);
+        vga_out8 (0x3d4, 0x5e, par);
+        par->CR5E = vga_in8 (0x3d5, par);
+        vga_out8 (0x3d4, 0x65, par);
+        par->CR65 = vga_in8 (0x3d5, par);
 
         /* save seq extended regs for DCLK PLL programming */
-        vga_out8 (0x3c4, 0x0e);
-        par->SR0E = vga_in8 (0x3c5);
-        vga_out8 (0x3c4, 0x0f);
-        par->SR0F = vga_in8 (0x3c5);
-        vga_out8 (0x3c4, 0x10);
-        par->SR10 = vga_in8 (0x3c5);
-        vga_out8 (0x3c4, 0x11);
-        par->SR11 = vga_in8 (0x3c5);
-        vga_out8 (0x3c4, 0x12);
-        par->SR12 = vga_in8 (0x3c5);
-        vga_out8 (0x3c4, 0x13);
-        par->SR13 = vga_in8 (0x3c5);
-        vga_out8 (0x3c4, 0x29);
-        par->SR29 = vga_in8 (0x3c5);
-
-        vga_out8 (0x3c4, 0x15);
-        par->SR15 = vga_in8 (0x3c5);
-        vga_out8 (0x3c4, 0x30);
-        par->SR30 = vga_in8 (0x3c5);
-        vga_out8 (0x3c4, 0x18);
-        par->SR18 = vga_in8 (0x3c5);
+        vga_out8 (0x3c4, 0x0e, par);
+        par->SR0E = vga_in8 (0x3c5, par);
+        vga_out8 (0x3c4, 0x0f, par);
+        par->SR0F = vga_in8 (0x3c5, par);
+        vga_out8 (0x3c4, 0x10, par);
+        par->SR10 = vga_in8 (0x3c5, par);
+        vga_out8 (0x3c4, 0x11, par);
+        par->SR11 = vga_in8 (0x3c5, par);
+        vga_out8 (0x3c4, 0x12, par);
+        par->SR12 = vga_in8 (0x3c5, par);
+        vga_out8 (0x3c4, 0x13, par);
+        par->SR13 = vga_in8 (0x3c5, par);
+        vga_out8 (0x3c4, 0x29, par);
+        par->SR29 = vga_in8 (0x3c5, par);
+
+        vga_out8 (0x3c4, 0x15, par);
+        par->SR15 = vga_in8 (0x3c5, par);
+        vga_out8 (0x3c4, 0x30, par);
+        par->SR30 = vga_in8 (0x3c5, par);
+        vga_out8 (0x3c4, 0x18, par);
+        par->SR18 = vga_in8 (0x3c5, par);
 
         /* Save flat panel expansion regsters. */
         if (par->chip == S3_SAVAGE_MX) {
                 int i;
 
                 for (i = 0; i < 8; i++) {
-                        vga_out8 (0x3c4, 0x54+i);
-                        par->SR54[i] = vga_in8 (0x3c5);
+                        vga_out8 (0x3c4, 0x54+i, par);
+                        par->SR54[i] = vga_in8 (0x3c5, par);
                 }
         }
 
-        vga_out8 (0x3d4, 0x66);
-        cr66 = vga_in8 (0x3d5);
-        vga_out8 (0x3d5, cr66 | 0x80);
-        vga_out8 (0x3d4, 0x3a);
-        cr3a = vga_in8 (0x3d5);
-        vga_out8 (0x3d5, cr3a | 0x80);
+        vga_out8 (0x3d4, 0x66, par);
+        cr66 = vga_in8 (0x3d5, par);
+        vga_out8 (0x3d5, cr66 | 0x80, par);
+        vga_out8 (0x3d4, 0x3a, par);
+        cr3a = vga_in8 (0x3d5, par);
+        vga_out8 (0x3d5, cr3a | 0x80, par);
 
         /* now save MIU regs */
         if (par->chip != S3_SAVAGE_MX) {
-                par->MMPR0 = savage_in32(FIFO_CONTROL_REG);
-                par->MMPR1 = savage_in32(MIU_CONTROL_REG);
-                par->MMPR2 = savage_in32(STREAMS_TIMEOUT_REG);
-                par->MMPR3 = savage_in32(MISC_TIMEOUT_REG);
+                par->MMPR0 = savage_in32(FIFO_CONTROL_REG, par);
+                par->MMPR1 = savage_in32(MIU_CONTROL_REG, par);
+                par->MMPR2 = savage_in32(STREAMS_TIMEOUT_REG, par);
+                par->MMPR3 = savage_in32(MISC_TIMEOUT_REG, par);
         }
 
-        vga_out8 (0x3d4, 0x3a);
-        vga_out8 (0x3d5, cr3a);
-        vga_out8 (0x3d4, 0x66);
-        vga_out8 (0x3d5, cr66);
+        vga_out8 (0x3d4, 0x3a, par);
+        vga_out8 (0x3d5, cr3a, par);
+        vga_out8 (0x3d4, 0x66, par);
+        vga_out8 (0x3d5, cr66, par);
 }
 
 static void savage_update_var(struct fb_var_screeninfo *var, struct fb_videomode *modedb)
@@ -868,8 +872,8 @@ static int savagefb_decode_var (struct fb_var_screeninfo   *var,
          * match.  Fall back to traditional register-crunching.
          */
 
-        vga_out8 (0x3d4, 0x3a);
-        tmp = vga_in8 (0x3d5);
+        vga_out8 (0x3d4, 0x3a, par);
+        tmp = vga_in8 (0x3d5, par);
         if (1 /*FIXME:psav->pci_burst*/)
                 par->CR3A = (tmp & 0x7f) | 0x15;
         else
@@ -879,16 +883,16 @@ static int savagefb_decode_var (struct fb_var_screeninfo   *var,
         par->CR31 = 0x8c;
         par->CR66 = 0x89;
 
-        vga_out8 (0x3d4, 0x58);
-        par->CR58 = vga_in8 (0x3d5) & 0x80;
+        vga_out8 (0x3d4, 0x58, par);
+        par->CR58 = vga_in8 (0x3d5, par) & 0x80;
         par->CR58 |= 0x13;
 
         par->SR15 = 0x03 | 0x80;
         par->SR18 = 0x00;
         par->CR43 = par->CR45 = par->CR65 = 0x00;
 
-        vga_out8 (0x3d4, 0x40);
-        par->CR40 = vga_in8 (0x3d5) & ~0x01;
+        vga_out8 (0x3d4, 0x40, par);
+        par->CR40 = vga_in8 (0x3d5, par) & ~0x01;
 
         par->MMPR0 = 0x010400;
         par->MMPR1 = 0x00;
@@ -992,19 +996,19 @@ static int savagefb_decode_var (struct fb_var_screeninfo   *var,
 
         par->CR67 |= 1;
 
-        vga_out8(0x3d4, 0x36);
-        par->CR36 = vga_in8 (0x3d5);
-        vga_out8 (0x3d4, 0x68);
-        par->CR68 = vga_in8 (0x3d5);
+        vga_out8(0x3d4, 0x36, par);
+        par->CR36 = vga_in8 (0x3d5, par);
+        vga_out8 (0x3d4, 0x68, par);
+        par->CR68 = vga_in8 (0x3d5, par);
         par->CR69 = 0;
-        vga_out8 (0x3d4, 0x6f);
-        par->CR6F = vga_in8 (0x3d5);
-        vga_out8 (0x3d4, 0x86);
-        par->CR86 = vga_in8 (0x3d5);
-        vga_out8 (0x3d4, 0x88);
-        par->CR88 = vga_in8 (0x3d5) | 0x08;
-        vga_out8 (0x3d4, 0xb0);
-        par->CRB0 = vga_in8 (0x3d5) | 0x80;
+        vga_out8 (0x3d4, 0x6f, par);
+        par->CR6F = vga_in8 (0x3d5, par);
+        vga_out8 (0x3d4, 0x86, par);
+        par->CR86 = vga_in8 (0x3d5, par);
+        vga_out8 (0x3d4, 0x88, par);
+        par->CR88 = vga_in8 (0x3d5, par) | 0x08;
+        vga_out8 (0x3d4, 0xb0, par);
+        par->CRB0 = vga_in8 (0x3d5, par) | 0x80;
 
         return 0;
 }
@@ -1033,11 +1037,11 @@ static int savagefb_setcolreg(unsigned        regno,
 
         switch (info->var.bits_per_pixel) {
         case 8:
-                vga_out8 (0x3c8, regno);
+                vga_out8 (0x3c8, regno, par);
 
-                vga_out8 (0x3c9, red   >> 10);
-                vga_out8 (0x3c9, green >> 10);
-                vga_out8 (0x3c9, blue  >> 10);
+                vga_out8 (0x3c9, red   >> 10, par);
+                vga_out8 (0x3c9, green >> 10, par);
+                vga_out8 (0x3c9, blue  >> 10, par);
                 break;
 
         case 16:
@@ -1079,11 +1083,11 @@ static void savagefb_set_par_int (struct savagefb_par  *par)
 
         par->SavageWaitIdle (par);
 
-        vga_out8 (0x3c2, 0x23);
+        vga_out8 (0x3c2, 0x23, par);
 
-        vga_out16 (0x3d4, 0x4838);
-        vga_out16 (0x3d4, 0xa539);
-        vga_out16 (0x3c4, 0x0608);
+        vga_out16 (0x3d4, 0x4838, par);
+        vga_out16 (0x3d4, 0xa539, par);
+        vga_out16 (0x3c4, 0x0608, par);
 
         vgaHWProtect (par, 1);
 
@@ -1094,197 +1098,197 @@ static void savagefb_set_par_int (struct savagefb_par  *par)
          * switch to mode 3 here seems to eliminate the issue.
          */
 
-        VerticalRetraceWait();
-        vga_out8 (0x3d4, 0x67);
-        cr67 = vga_in8 (0x3d5);
-        vga_out8 (0x3d5, cr67/*par->CR67*/ & ~0x0c); /* no STREAMS yet */
+        VerticalRetraceWait(par);
+        vga_out8 (0x3d4, 0x67, par);
+        cr67 = vga_in8 (0x3d5, par);
+        vga_out8 (0x3d5, cr67/*par->CR67*/ & ~0x0c, par); /* no STREAMS yet */
 
-        vga_out8 (0x3d4, 0x23);
-        vga_out8 (0x3d5, 0x00);
-        vga_out8 (0x3d4, 0x26);
-        vga_out8 (0x3d5, 0x00);
+        vga_out8 (0x3d4, 0x23, par);
+        vga_out8 (0x3d5, 0x00, par);
+        vga_out8 (0x3d4, 0x26, par);
+        vga_out8 (0x3d5, 0x00, par);
 
         /* restore extended regs */
-        vga_out8 (0x3d4, 0x66);
-        vga_out8 (0x3d5, par->CR66);
-        vga_out8 (0x3d4, 0x3a);
-        vga_out8 (0x3d5, par->CR3A);
-        vga_out8 (0x3d4, 0x31);
-        vga_out8 (0x3d5, par->CR31);
-        vga_out8 (0x3d4, 0x32);
-        vga_out8 (0x3d5, par->CR32);
-        vga_out8 (0x3d4, 0x58);
-        vga_out8 (0x3d5, par->CR58);
-        vga_out8 (0x3d4, 0x53);
-        vga_out8 (0x3d5, par->CR53 & 0x7f);
-
-        vga_out16 (0x3c4, 0x0608);
+        vga_out8 (0x3d4, 0x66, par);
+        vga_out8 (0x3d5, par->CR66, par);
+        vga_out8 (0x3d4, 0x3a, par);
+        vga_out8 (0x3d5, par->CR3A, par);
+        vga_out8 (0x3d4, 0x31, par);
+        vga_out8 (0x3d5, par->CR31, par);
+        vga_out8 (0x3d4, 0x32, par);
+        vga_out8 (0x3d5, par->CR32, par);
+        vga_out8 (0x3d4, 0x58, par);
+        vga_out8 (0x3d5, par->CR58, par);
+        vga_out8 (0x3d4, 0x53, par);
+        vga_out8 (0x3d5, par->CR53 & 0x7f, par);
+
+        vga_out16 (0x3c4, 0x0608, par);
 
         /* Restore DCLK registers. */
 
-        vga_out8 (0x3c4, 0x0e);
-        vga_out8 (0x3c5, par->SR0E);
-        vga_out8 (0x3c4, 0x0f);
-        vga_out8 (0x3c5, par->SR0F);
-        vga_out8 (0x3c4, 0x29);
-        vga_out8 (0x3c5, par->SR29);
-        vga_out8 (0x3c4, 0x15);
-        vga_out8 (0x3c5, par->SR15);
+        vga_out8 (0x3c4, 0x0e, par);
+        vga_out8 (0x3c5, par->SR0E, par);
+        vga_out8 (0x3c4, 0x0f, par);
+        vga_out8 (0x3c5, par->SR0F, par);
+        vga_out8 (0x3c4, 0x29, par);
+        vga_out8 (0x3c5, par->SR29, par);
+        vga_out8 (0x3c4, 0x15, par);
+        vga_out8 (0x3c5, par->SR15, par);
 
         /* Restore flat panel expansion regsters. */
         if( par->chip == S3_SAVAGE_MX ) {
                 int i;
 
                 for( i = 0; i < 8; i++ ) {
-                        vga_out8 (0x3c4, 0x54+i);
-                        vga_out8 (0x3c5, par->SR54[i]);
+                        vga_out8 (0x3c4, 0x54+i, par);
+                        vga_out8 (0x3c5, par->SR54[i], par);
                 }
         }
 
         vgaHWRestore (par);
 
         /* extended mode timing registers */
-        vga_out8 (0x3d4, 0x53);
-        vga_out8 (0x3d5, par->CR53);
-        vga_out8 (0x3d4, 0x5d);
-        vga_out8 (0x3d5, par->CR5D);
-        vga_out8 (0x3d4, 0x5e);
-        vga_out8 (0x3d5, par->CR5E);
-        vga_out8 (0x3d4, 0x3b);
-        vga_out8 (0x3d5, par->CR3B);
-        vga_out8 (0x3d4, 0x3c);
-        vga_out8 (0x3d5, par->CR3C);
-        vga_out8 (0x3d4, 0x43);
-        vga_out8 (0x3d5, par->CR43);
-        vga_out8 (0x3d4, 0x65);
-        vga_out8 (0x3d5, par->CR65);
+        vga_out8 (0x3d4, 0x53, par);
+        vga_out8 (0x3d5, par->CR53, par);
+        vga_out8 (0x3d4, 0x5d, par);
+        vga_out8 (0x3d5, par->CR5D, par);
+        vga_out8 (0x3d4, 0x5e, par);
+        vga_out8 (0x3d5, par->CR5E, par);
+        vga_out8 (0x3d4, 0x3b, par);
+        vga_out8 (0x3d5, par->CR3B, par);
+        vga_out8 (0x3d4, 0x3c, par);
+        vga_out8 (0x3d5, par->CR3C, par);
+        vga_out8 (0x3d4, 0x43, par);
+        vga_out8 (0x3d5, par->CR43, par);
+        vga_out8 (0x3d4, 0x65, par);
+        vga_out8 (0x3d5, par->CR65, par);
 
         /* restore the desired video mode with cr67 */
-        vga_out8 (0x3d4, 0x67);
+        vga_out8 (0x3d4, 0x67, par);
         /* following part not present in X11 driver */
-        cr67 = vga_in8 (0x3d5) & 0xf;
-        vga_out8 (0x3d5, 0x50 | cr67);
+        cr67 = vga_in8 (0x3d5, par) & 0xf;
+        vga_out8 (0x3d5, 0x50 | cr67, par);
         udelay (10000);
-        vga_out8 (0x3d4, 0x67);
+        vga_out8 (0x3d4, 0x67, par);
         /* end of part */
-        vga_out8 (0x3d5, par->CR67 & ~0x0c);
+        vga_out8 (0x3d5, par->CR67 & ~0x0c, par);
 
         /* other mode timing and extended regs */
-        vga_out8 (0x3d4, 0x34);
-        vga_out8 (0x3d5, par->CR34);
-        vga_out8 (0x3d4, 0x40);
-        vga_out8 (0x3d5, par->CR40);
-        vga_out8 (0x3d4, 0x42);
-        vga_out8 (0x3d5, par->CR42);
-        vga_out8 (0x3d4, 0x45);
-        vga_out8 (0x3d5, par->CR45);
-        vga_out8 (0x3d4, 0x50);
-        vga_out8 (0x3d5, par->CR50);
-        vga_out8 (0x3d4, 0x51);
-        vga_out8 (0x3d5, par->CR51);
+        vga_out8 (0x3d4, 0x34, par);
+        vga_out8 (0x3d5, par->CR34, par);
+        vga_out8 (0x3d4, 0x40, par);
+        vga_out8 (0x3d5, par->CR40, par);
+        vga_out8 (0x3d4, 0x42, par);
+        vga_out8 (0x3d5, par->CR42, par);
+        vga_out8 (0x3d4, 0x45, par);
+        vga_out8 (0x3d5, par->CR45, par);
+        vga_out8 (0x3d4, 0x50, par);
+        vga_out8 (0x3d5, par->CR50, par);
+        vga_out8 (0x3d4, 0x51, par);
+        vga_out8 (0x3d5, par->CR51, par);
 
         /* memory timings */
-        vga_out8 (0x3d4, 0x36);
-        vga_out8 (0x3d5, par->CR36);
-        vga_out8 (0x3d4, 0x60);
-        vga_out8 (0x3d5, par->CR60);
-        vga_out8 (0x3d4, 0x68);
-        vga_out8 (0x3d5, par->CR68);
-        vga_out8 (0x3d4, 0x69);
-        vga_out8 (0x3d5, par->CR69);
-        vga_out8 (0x3d4, 0x6f);
-        vga_out8 (0x3d5, par->CR6F);
-
-        vga_out8 (0x3d4, 0x33);
-        vga_out8 (0x3d5, par->CR33);
-        vga_out8 (0x3d4, 0x86);
-        vga_out8 (0x3d5, par->CR86);
-        vga_out8 (0x3d4, 0x88);
-        vga_out8 (0x3d5, par->CR88);
-        vga_out8 (0x3d4, 0x90);
-        vga_out8 (0x3d5, par->CR90);
-        vga_out8 (0x3d4, 0x91);
-        vga_out8 (0x3d5, par->CR91);
+        vga_out8 (0x3d4, 0x36, par);
+        vga_out8 (0x3d5, par->CR36, par);
+        vga_out8 (0x3d4, 0x60, par);
+        vga_out8 (0x3d5, par->CR60, par);
+        vga_out8 (0x3d4, 0x68, par);
+        vga_out8 (0x3d5, par->CR68, par);
+        vga_out8 (0x3d4, 0x69, par);
+        vga_out8 (0x3d5, par->CR69, par);
+        vga_out8 (0x3d4, 0x6f, par);
+        vga_out8 (0x3d5, par->CR6F, par);
+
+        vga_out8 (0x3d4, 0x33, par);
+        vga_out8 (0x3d5, par->CR33, par);
+        vga_out8 (0x3d4, 0x86, par);
+        vga_out8 (0x3d5, par->CR86, par);
+        vga_out8 (0x3d4, 0x88, par);
+        vga_out8 (0x3d5, par->CR88, par);
+        vga_out8 (0x3d4, 0x90, par);
+        vga_out8 (0x3d5, par->CR90, par);
+        vga_out8 (0x3d4, 0x91, par);
+        vga_out8 (0x3d5, par->CR91, par);
 
         if (par->chip == S3_SAVAGE4) {
-                vga_out8 (0x3d4, 0xb0);
-                vga_out8 (0x3d5, par->CRB0);
+                vga_out8 (0x3d4, 0xb0, par);
+                vga_out8 (0x3d5, par->CRB0, par);
         }
 
-        vga_out8 (0x3d4, 0x32);
-        vga_out8 (0x3d5, par->CR32);
+        vga_out8 (0x3d4, 0x32, par);
+        vga_out8 (0x3d5, par->CR32, par);
 
         /* unlock extended seq regs */
-        vga_out8 (0x3c4, 0x08);
-        vga_out8 (0x3c5, 0x06);
+        vga_out8 (0x3c4, 0x08, par);
+        vga_out8 (0x3c5, 0x06, par);
 
         /* Restore extended sequencer regs for MCLK. SR10 == 255 indicates
          * that we should leave the default SR10 and SR11 values there.
          */
         if (par->SR10 != 255) {
-                vga_out8 (0x3c4, 0x10);
-                vga_out8 (0x3c5, par->SR10);
-                vga_out8 (0x3c4, 0x11);
-                vga_out8 (0x3c5, par->SR11);
+                vga_out8 (0x3c4, 0x10, par);
+                vga_out8 (0x3c5, par->SR10, par);
+                vga_out8 (0x3c4, 0x11, par);
+                vga_out8 (0x3c5, par->SR11, par);
         }
 
         /* restore extended seq regs for dclk */
-        vga_out8 (0x3c4, 0x0e);
-        vga_out8 (0x3c5, par->SR0E);
-        vga_out8 (0x3c4, 0x0f);
-        vga_out8 (0x3c5, par->SR0F);
-        vga_out8 (0x3c4, 0x12);
-        vga_out8 (0x3c5, par->SR12);
-        vga_out8 (0x3c4, 0x13);
-        vga_out8 (0x3c5, par->SR13);
-        vga_out8 (0x3c4, 0x29);
-        vga_out8 (0x3c5, par->SR29);
-
-        vga_out8 (0x3c4, 0x18);
-        vga_out8 (0x3c5, par->SR18);
+        vga_out8 (0x3c4, 0x0e, par);
+        vga_out8 (0x3c5, par->SR0E, par);
+        vga_out8 (0x3c4, 0x0f, par);
+        vga_out8 (0x3c5, par->SR0F, par);
+        vga_out8 (0x3c4, 0x12, par);
+        vga_out8 (0x3c5, par->SR12, par);
+        vga_out8 (0x3c4, 0x13, par);
+        vga_out8 (0x3c5, par->SR13, par);
+        vga_out8 (0x3c4, 0x29, par);
+        vga_out8 (0x3c5, par->SR29, par);
+
+        vga_out8 (0x3c4, 0x18, par);
+        vga_out8 (0x3c5, par->SR18, par);
 
         /* load new m, n pll values for dclk & mclk */
-        vga_out8 (0x3c4, 0x15);
-        tmp = vga_in8 (0x3c5) & ~0x21;
+        vga_out8 (0x3c4, 0x15, par);
+        tmp = vga_in8 (0x3c5, par) & ~0x21;
 
-        vga_out8 (0x3c5, tmp | 0x03);
-        vga_out8 (0x3c5, tmp | 0x23);
-        vga_out8 (0x3c5, tmp | 0x03);
-        vga_out8 (0x3c5, par->SR15);
+        vga_out8 (0x3c5, tmp | 0x03, par);
+        vga_out8 (0x3c5, tmp | 0x23, par);
+        vga_out8 (0x3c5, tmp | 0x03, par);
+        vga_out8 (0x3c5, par->SR15, par);
         udelay (100);
 
-        vga_out8 (0x3c4, 0x30);
-        vga_out8 (0x3c5, par->SR30);
-        vga_out8 (0x3c4, 0x08);
-        vga_out8 (0x3c5, par->SR08);
+        vga_out8 (0x3c4, 0x30, par);
+        vga_out8 (0x3c5, par->SR30, par);
+        vga_out8 (0x3c4, 0x08, par);
+        vga_out8 (0x3c5, par->SR08, par);
 
         /* now write out cr67 in full, possibly starting STREAMS */
-        VerticalRetraceWait();
-        vga_out8 (0x3d4, 0x67);
-        vga_out8 (0x3d5, par->CR67);
+        VerticalRetraceWait(par);
+        vga_out8 (0x3d4, 0x67, par);
+        vga_out8 (0x3d5, par->CR67, par);
 
-        vga_out8 (0x3d4, 0x66);
-        cr66 = vga_in8 (0x3d5);
-        vga_out8 (0x3d5, cr66 | 0x80);
-        vga_out8 (0x3d4, 0x3a);
-        cr3a = vga_in8 (0x3d5);
-        vga_out8 (0x3d5, cr3a | 0x80);
+        vga_out8 (0x3d4, 0x66, par);
+        cr66 = vga_in8 (0x3d5, par);
+        vga_out8 (0x3d5, cr66 | 0x80, par);
+        vga_out8 (0x3d4, 0x3a, par);
+        cr3a = vga_in8 (0x3d5, par);
+        vga_out8 (0x3d5, cr3a | 0x80, par);
 
         if (par->chip != S3_SAVAGE_MX) {
-                VerticalRetraceWait();
-                savage_out32 (FIFO_CONTROL_REG, par->MMPR0);
+                VerticalRetraceWait(par);
+                savage_out32 (FIFO_CONTROL_REG, par->MMPR0, par);
                 par->SavageWaitIdle (par);
-                savage_out32 (MIU_CONTROL_REG, par->MMPR1);
+                savage_out32 (MIU_CONTROL_REG, par->MMPR1, par);
                 par->SavageWaitIdle (par);
-                savage_out32 (STREAMS_TIMEOUT_REG, par->MMPR2);
+                savage_out32 (STREAMS_TIMEOUT_REG, par->MMPR2, par);
                 par->SavageWaitIdle (par);
-                savage_out32 (MISC_TIMEOUT_REG, par->MMPR3);
+                savage_out32 (MISC_TIMEOUT_REG, par->MMPR3, par);
         }
 
-        vga_out8 (0x3d4, 0x66);
-        vga_out8 (0x3d5, cr66);
-        vga_out8 (0x3d4, 0x3a);
-        vga_out8 (0x3d5, cr3a);
+        vga_out8 (0x3d4, 0x66, par);
+        vga_out8 (0x3d5, cr66, par);
+        vga_out8 (0x3d4, 0x3a, par);
+        vga_out8 (0x3d5, cr3a, par);
 
         SavageSetup2DEngine (par);
         vgaHWProtect (par, 0);
@@ -1299,10 +1303,10 @@ static void savagefb_update_start (struct savagefb_par      *par,
                 * ((var->bits_per_pixel+7) / 8)) >> 2;
 
         /* now program the start address registers */
-        vga_out16(0x3d4, (base & 0x00ff00) | 0x0c);
-        vga_out16(0x3d4, ((base & 0x00ff) << 8) | 0x0d);
-        vga_out8 (0x3d4, 0x69);
-        vga_out8 (0x3d5, (base & 0x7f0000) >> 16);
+        vga_out16(0x3d4, (base & 0x00ff00) | 0x0c, par);
+        vga_out16(0x3d4, ((base & 0x00ff) << 8) | 0x0d, par);
+        vga_out8 (0x3d4, 0x69, par);
+        vga_out8 (0x3d5, (base & 0x7f0000) >> 16, par);
 }
 
 
@@ -1406,12 +1410,12 @@ static int savagefb_blank(int blank, struct fb_info *info)
         u8 sr8 = 0, srd = 0;
 
         if (par->display_type == DISP_CRT) {
-                vga_out8(0x3c4, 0x08);
-                sr8 = vga_in8(0x3c5);
+                vga_out8(0x3c4, 0x08, par);
+                sr8 = vga_in8(0x3c5, par);
                 sr8 |= 0x06;
-                vga_out8(0x3c5, sr8);
-                vga_out8(0x3c4, 0x0d);
-                srd = vga_in8(0x3c5);
+                vga_out8(0x3c5, sr8, par);
+                vga_out8(0x3c4, 0x0d, par);
+                srd = vga_in8(0x3c5, par);
                 srd &= 0x03;
 
                 switch (blank) {
@@ -1429,8 +1433,8 @@ static int savagefb_blank(int blank, struct fb_info *info)
                         break;
                 }
 
-                vga_out8(0x3c4, 0x0d);
-                vga_out8(0x3c5, srd);
+                vga_out8(0x3c4, 0x0d, par);
+                vga_out8(0x3c5, srd, par);
         }
 
         if (par->display_type == DISP_LCD ||
@@ -1438,14 +1442,14 @@ static int savagefb_blank(int blank, struct fb_info *info)
                 switch(blank) {
                 case FB_BLANK_UNBLANK:
                 case FB_BLANK_NORMAL:
-                        vga_out8(0x3c4, 0x31); /* SR31 bit 4 - FP enable */
-                        vga_out8(0x3c5, vga_in8(0x3c5) | 0x10);
+                        vga_out8(0x3c4, 0x31, par); /* SR31 bit 4 - FP enable */
+                        vga_out8(0x3c5, vga_in8(0x3c5, par) | 0x10, par);
                         break;
                 case FB_BLANK_VSYNC_SUSPEND:
                 case FB_BLANK_HSYNC_SUSPEND:
                 case FB_BLANK_POWERDOWN:
-                        vga_out8(0x3c4, 0x31); /* SR31 bit 4 - FP enable */
-                        vga_out8(0x3c5, vga_in8(0x3c5) & ~0x10);
+                        vga_out8(0x3c4, 0x31, par); /* SR31 bit 4 - FP enable */
+                        vga_out8(0x3c5, vga_in8(0x3c5, par) & ~0x10, par);
                         break;
                 }
         }
@@ -1470,7 +1474,6 @@ static struct fb_ops savagefb_ops = {
         .fb_copyarea    = cfb_copyarea,
         .fb_imageblit   = cfb_imageblit,
 #endif
-        .fb_cursor      = soft_cursor,
 };
 
 /* --------------------------------------------------------------------- */
@@ -1499,15 +1502,15 @@ static void savage_enable_mmio (struct savagefb_par *par)
 
         DBG ("savage_enable_mmio\n");
 
-        val = vga_in8 (0x3c3);
-        vga_out8 (0x3c3, val | 0x01);
-        val = vga_in8 (0x3cc);
-        vga_out8 (0x3c2, val | 0x01);
+        val = vga_in8 (0x3c3, par);
+        vga_out8 (0x3c3, val | 0x01, par);
+        val = vga_in8 (0x3cc, par);
+        vga_out8 (0x3c2, val | 0x01, par);
 
         if (par->chip >= S3_SAVAGE4) {
-                vga_out8 (0x3d4, 0x40);
-                val = vga_in8 (0x3d5);
-                vga_out8 (0x3d5, val | 1);
+                vga_out8 (0x3d4, 0x40, par);
+                val = vga_in8 (0x3d5, par);
+                vga_out8 (0x3d5, val | 1, par);
         }
 }
 
@@ -1519,9 +1522,9 @@ static void savage_disable_mmio (struct savagefb_par *par)
         DBG ("savage_disable_mmio\n");
 
         if(par->chip >= S3_SAVAGE4 ) {
-                vga_out8 (0x3d4, 0x40);
-                val = vga_in8 (0x3d5);
-                vga_out8 (0x3d5, val | 1);
+                vga_out8 (0x3d4, 0x40, par);
+                val = vga_in8 (0x3d5, par);
+                vga_out8 (0x3d5, val | 1, par);
         }
 }
 
@@ -1641,30 +1644,30 @@ static int __devinit savage_init_hw (struct savagefb_par *par)
         DBG("savage_init_hw");
 
         /* unprotect CRTC[0-7] */
-        vga_out8(0x3d4, 0x11);
-        tmp = vga_in8(0x3d5);
-        vga_out8(0x3d5, tmp & 0x7f);
+        vga_out8(0x3d4, 0x11, par);
+        tmp = vga_in8(0x3d5, par);
+        vga_out8(0x3d5, tmp & 0x7f, par);
 
         /* unlock extended regs */
-        vga_out16(0x3d4, 0x4838);
-        vga_out16(0x3d4, 0xa039);
-        vga_out16(0x3c4, 0x0608);
+        vga_out16(0x3d4, 0x4838, par);
+        vga_out16(0x3d4, 0xa039, par);
+        vga_out16(0x3c4, 0x0608, par);
 
-        vga_out8(0x3d4, 0x40);
-        tmp = vga_in8(0x3d5);
-        vga_out8(0x3d5, tmp & ~0x01);
+        vga_out8(0x3d4, 0x40, par);
+        tmp = vga_in8(0x3d5, par);
+        vga_out8(0x3d5, tmp & ~0x01, par);
 
         /* unlock sys regs */
-        vga_out8(0x3d4, 0x38);
-        vga_out8(0x3d5, 0x48);
+        vga_out8(0x3d4, 0x38, par);
+        vga_out8(0x3d5, 0x48, par);
 
         /* Unlock system registers. */
-        vga_out16(0x3d4, 0x4838);
+        vga_out16(0x3d4, 0x4838, par);
 
         /* Next go on to detect amount of installed ram */
 
-        vga_out8(0x3d4, 0x36);            /* for register CR36 (CONFG_REG1), */
-        config1 = vga_in8(0x3d5);           /* get amount of vram installed */
+        vga_out8(0x3d4, 0x36, par);            /* for register CR36 (CONFG_REG1), */
+        config1 = vga_in8(0x3d5, par);    /* get amount of vram installed */
 
         /* Compute the amount of video memory and offscreen memory. */
 
@@ -1680,8 +1683,8 @@ static int __devinit savage_init_hw (struct savagefb_par *par)
                  * when it really means 8MB.  Why do it the same when you
                  * can do it different...
                  */
-                vga_out8(0x3d4, 0x68);  /* memory control 1 */
-                if( (vga_in8(0x3d5) & 0xC0) == (0x01 << 6) )
+                vga_out8(0x3d4, 0x68, par);     /* memory control 1 */
+                if( (vga_in8(0x3d5, par) & 0xC0) == (0x01 << 6) )
                         RamSavage4[1] = 8;
 
                 /*FALLTHROUGH*/
@@ -1710,13 +1713,13 @@ static int __devinit savage_init_hw (struct savagefb_par *par)
         printk (KERN_INFO "savagefb: probed videoram:  %dk\n", videoRam);
 
         /* reset graphics engine to avoid memory corruption */
-        vga_out8 (0x3d4, 0x66);
-        cr66 = vga_in8 (0x3d5);
-        vga_out8 (0x3d5, cr66 | 0x02);
+        vga_out8 (0x3d4, 0x66, par);
+        cr66 = vga_in8 (0x3d5, par);
+        vga_out8 (0x3d5, cr66 | 0x02, par);
         udelay (10000);
 
-        vga_out8 (0x3d4, 0x66);
-        vga_out8 (0x3d5, cr66 & ~0x02); /* clear reset flag */
+        vga_out8 (0x3d4, 0x66, par);
+        vga_out8 (0x3d5, cr66 & ~0x02, par);    /* clear reset flag */
         udelay (10000);
 
 
@@ -1724,13 +1727,13 @@ static int __devinit savage_init_hw (struct savagefb_par *par)
          * reset memory interface, 3D engine, AGP master, PCI master,
          * master engine unit, motion compensation/LPB
          */
-        vga_out8 (0x3d4, 0x3f);
-        cr3f = vga_in8 (0x3d5);
-        vga_out8 (0x3d5, cr3f | 0x08);
+        vga_out8 (0x3d4, 0x3f, par);
+        cr3f = vga_in8 (0x3d5, par);
+        vga_out8 (0x3d5, cr3f | 0x08, par);
         udelay (10000);
 
-        vga_out8 (0x3d4, 0x3f);
-        vga_out8 (0x3d5, cr3f & ~0x08); /* clear reset flags */
+        vga_out8 (0x3d4, 0x3f, par);
+        vga_out8 (0x3d5, cr3f & ~0x08, par);    /* clear reset flags */
         udelay (10000);
 
         /* Savage ramdac speeds */
@@ -1741,15 +1744,15 @@ static int __devinit savage_init_hw (struct savagefb_par *par)
         par->clock[3] = 220000;
 
         /* detect current mclk */
-        vga_out8(0x3c4, 0x08);
-        sr8 = vga_in8(0x3c5);
-        vga_out8(0x3c5, 0x06);
-        vga_out8(0x3c4, 0x10);
-        n = vga_in8(0x3c5);
-        vga_out8(0x3c4, 0x11);
-        m = vga_in8(0x3c5);
-        vga_out8(0x3c4, 0x08);
-        vga_out8(0x3c5, sr8);
+        vga_out8(0x3c4, 0x08, par);
+        sr8 = vga_in8(0x3c5, par);
+        vga_out8(0x3c5, 0x06, par);
+        vga_out8(0x3c4, 0x10, par);
+        n = vga_in8(0x3c5, par);
+        vga_out8(0x3c4, 0x11, par);
+        m = vga_in8(0x3c5, par);
+        vga_out8(0x3c4, 0x08, par);
+        vga_out8(0x3c5, sr8, par);
         m &= 0x7f;
         n1 = n & 0x1f;
         n2 = (n >> 5) & 0x03;
@@ -1763,10 +1766,10 @@ static int __devinit savage_init_hw (struct savagefb_par *par)
         if (par->chip == S3_SAVAGE4) {
                 unsigned char sr30 = 0x00;
 
-                vga_out8(0x3c4, 0x30);
+                vga_out8(0x3c4, 0x30, par);
                 /* clear bit 1 */
-                vga_out8(0x3c5, vga_in8(0x3c5) & ~0x02);
-                sr30 = vga_in8(0x3c5);
+                vga_out8(0x3c5, vga_in8(0x3c5, par) & ~0x02, par);
+                sr30 = vga_in8(0x3c5, par);
                 if (sr30 & 0x02 /*0x04 */) {
                         dvi = 1;
                         printk("savagefb: Digital Flat Panel Detected\n");
@@ -1783,12 +1786,12 @@ static int __devinit savage_init_hw (struct savagefb_par *par)
         /* Check LCD panel parrmation */
 
         if (par->display_type == DISP_LCD) {
-                unsigned char cr6b = VGArCR( 0x6b );
+                unsigned char cr6b = VGArCR( 0x6b, par);
 
-                int panelX = (VGArSEQ (0x61) +
-                              ((VGArSEQ (0x66) & 0x02) << 7) + 1) * 8;
-                int panelY = (VGArSEQ (0x69) +
-                              ((VGArSEQ (0x6e) & 0x70) << 4) + 1);
+                int panelX = (VGArSEQ (0x61, par) +
+                              ((VGArSEQ (0x66, par) & 0x02) << 7) + 1) * 8;
+                int panelY = (VGArSEQ (0x69, par) +
+                              ((VGArSEQ (0x6e, par) & 0x70) << 4) + 1);
 
                 char * sTechnology = "Unknown";
 
@@ -1810,9 +1813,9 @@ static int __devinit savage_init_hw (struct savagefb_par *par)
                         ActiveDUO = 0x80
                 };
 
-                if ((VGArSEQ (0x39) & 0x03) == 0) {
+                if ((VGArSEQ (0x39, par) & 0x03) == 0) {
                         sTechnology = "TFT";
-                } else if ((VGArSEQ (0x30) & 0x01) == 0) {
+                } else if ((VGArSEQ (0x30, par) & 0x01) == 0) {
                         sTechnology = "DSTN";
                 } else  {
                         sTechnology = "STN";
@@ -2049,24 +2052,11 @@ static int __devinit savagefb_probe (struct pci_dev* dev,
                              info->monspecs.modedb, info->monspecs.modedb_len,
                              NULL, 8);
         } else if (info->monspecs.modedb != NULL) {
-                struct fb_monspecs *specs = &info->monspecs;
-                struct fb_videomode modedb;
+                struct fb_videomode *modedb;
 
-                if (info->monspecs.misc & FB_MISC_1ST_DETAIL) {
-                        int i;
-
-                        for (i = 0; i < specs->modedb_len; i++) {
-                                if (specs->modedb[i].flag & FB_MODE_IS_FIRST) {
-                                        modedb = specs->modedb[i];
-                                        break;
-                                }
-                        }
-                } else {
-                        /* otherwise, get first mode in database */
-                        modedb = specs->modedb[0];
-                }
-
-                savage_update_var(&info->var, &modedb);
+                modedb = fb_find_best_display(&info->monspecs,
+                                              &info->modelist);
+                savage_update_var(&info->var, modedb);
         }
 
         /* maximize virtual vertical length */
diff --git a/drivers/video/sgivwfb.c b/drivers/video/sgivwfb.c
index cf5106eab2d5..2e8769dd345a 100644
--- a/drivers/video/sgivwfb.c
+++ b/drivers/video/sgivwfb.c
@@ -126,7 +126,6 @@ static struct fb_ops sgivwfb_ops = {
         .fb_fillrect    = cfb_fillrect,
         .fb_copyarea    = cfb_copyarea,
         .fb_imageblit   = cfb_imageblit,
-        .fb_cursor      = soft_cursor,
         .fb_mmap        = sgivwfb_mmap,
 };
 
@@ -751,10 +750,6 @@ int __init sgivwfb_setup(char *options)
 /*
  *  Initialisation
  */
-static void sgivwfb_release(struct device *device)
-{
-}
-
 static int __init sgivwfb_probe(struct device *device)
 {
         struct platform_device *dev = to_platform_device(device);
@@ -859,13 +854,7 @@ static struct device_driver sgivwfb_driver = {
         .remove = sgivwfb_remove,
 };
 
-static struct platform_device sgivwfb_device = {
-        .name   = "sgivwfb",
-        .id     = 0,
-        .dev    = {
-                .release = sgivwfb_release,
-        }
-};
+static struct platform_device *sgivwfb_device;
 
 int __init sgivwfb_init(void)
 {
@@ -880,9 +869,15 @@ int __init sgivwfb_init(void)
 #endif
         ret = driver_register(&sgivwfb_driver);
         if (!ret) {
-                ret = platform_device_register(&sgivwfb_device);
-                if (ret)
+                sgivwfb_device = platform_device_alloc("sgivwfb", 0);
+                if (sgivwfb_device) {
+                        ret = platform_device_add(sgivwfb_device);
+                } else
+                        ret = -ENOMEM;
+                if (ret) {
                         driver_unregister(&sgivwfb_driver);
+                        platform_device_put(sgivwfb_device);
+                }
         }
         return ret;
 }
@@ -894,7 +889,7 @@ MODULE_LICENSE("GPL");
 
 static void __exit sgivwfb_exit(void)
 {
-        platform_device_unregister(&sgivwfb_device);
+        platform_device_unregister(sgivwfb_device);
         driver_unregister(&sgivwfb_driver);
 }
 
diff --git a/drivers/video/sis/sis_main.c b/drivers/video/sis/sis_main.c
index 42c54b69726e..dea1a46c67c4 100644
--- a/drivers/video/sis/sis_main.c
+++ b/drivers/video/sis/sis_main.c
@@ -2002,7 +2002,9 @@ static struct fb_ops sisfb_ops = {
         .fb_fillrect    = fbcon_sis_fillrect,
         .fb_copyarea    = fbcon_sis_copyarea,
         .fb_imageblit   = cfb_imageblit,
+#ifdef CONFIG_FB_SOFT_CURSOR
         .fb_cursor      = soft_cursor,
+#endif
         .fb_sync        = fbcon_sis_sync,
 #ifdef SIS_NEW_CONFIG_COMPAT
         .fb_compat_ioctl= sisfb_compat_ioctl,
diff --git a/drivers/video/skeletonfb.c b/drivers/video/skeletonfb.c
index 7b43716ab665..a01e7ecc15ed 100644
--- a/drivers/video/skeletonfb.c
+++ b/drivers/video/skeletonfb.c
@@ -457,11 +457,8 @@ void xxxfb_imageblit(struct fb_info *p, const struct fb_image *image)
 }
 
 /**
- *      xxxfb_cursor -  REQUIRED function. If your hardware lacks support
- *                      for a cursor you can use the default cursor whose
- *                      function is called soft_cursor. It will always 
- *                      work since it uses xxxfb_imageblit function which 
- *                      is required.             
+ *      xxxfb_cursor -  OPTIONAL. If your hardware lacks support
+ *                      for a cursor, leave this field NULL.
  *
  *      @info: frame buffer structure that represents a single frame buffer
  *      @cursor: structure defining the cursor to draw.
@@ -663,7 +660,7 @@ static struct fb_ops xxxfb_ops = {
         .fb_fillrect    = xxxfb_fillrect,       /* Needed !!! */ 
         .fb_copyarea    = xxxfb_copyarea,       /* Needed !!! */ 
         .fb_imageblit   = xxxfb_imageblit,      /* Needed !!! */
-        .fb_cursor      = xxxfb_cursor,         /* Needed !!! */
+        .fb_cursor      = xxxfb_cursor,         /* Optional !!! */
         .fb_rotate      = xxxfb_rotate,
         .fb_poll        = xxxfb_poll,
         .fb_sync        = xxxfb_sync,
diff --git a/drivers/video/sstfb.c b/drivers/video/sstfb.c
index 663d53657fa4..e0f14df840d9 100644
--- a/drivers/video/sstfb.c
+++ b/drivers/video/sstfb.c
@@ -1382,7 +1382,6 @@ static struct fb_ops sstfb_ops = {
         .fb_fillrect    = cfb_fillrect, /* sstfb_fillrect */
         .fb_copyarea    = cfb_copyarea, /* sstfb_copyarea */
         .fb_imageblit   = cfb_imageblit,
-        .fb_cursor      = soft_cursor,
         .fb_ioctl       = sstfb_ioctl,
 };
 
diff --git a/drivers/video/stifb.c b/drivers/video/stifb.c
index 9e52794768e6..fbb17332afd7 100644
--- a/drivers/video/stifb.c
+++ b/drivers/video/stifb.c
@@ -1147,7 +1147,6 @@ static struct fb_ops stifb_ops = {
         .fb_fillrect    = cfb_fillrect,
         .fb_copyarea    = cfb_copyarea,
         .fb_imageblit   = cfb_imageblit,
-        .fb_cursor      = soft_cursor,
 };
 
 
diff --git a/drivers/video/tcx.c b/drivers/video/tcx.c
index 1986a8b3833c..59fff29bc02e 100644
--- a/drivers/video/tcx.c
+++ b/drivers/video/tcx.c
@@ -52,7 +52,6 @@ static struct fb_ops tcx_ops = {
         .fb_imageblit           = cfb_imageblit,
         .fb_mmap                = tcx_mmap,
         .fb_ioctl               = tcx_ioctl,
-        .fb_cursor              = soft_cursor,
 };
 
 /* THC definitions */
diff --git a/drivers/video/tdfxfb.c b/drivers/video/tdfxfb.c
index 7044226c5d4c..9d53387e6a66 100644
--- a/drivers/video/tdfxfb.c
+++ b/drivers/video/tdfxfb.c
@@ -184,7 +184,6 @@ static struct fb_ops tdfxfb_ops = {
         .fb_copyarea    = cfb_copyarea,
         .fb_imageblit   = cfb_imageblit,
 #endif
-        .fb_cursor      = soft_cursor,
 };
 
 /*
diff --git a/drivers/video/tgafb.c b/drivers/video/tgafb.c
index 9d9d2009ad8c..7398bd48ba6c 100644
--- a/drivers/video/tgafb.c
+++ b/drivers/video/tgafb.c
@@ -63,7 +63,6 @@ static struct fb_ops tgafb_ops = {
         .fb_fillrect            = tgafb_fillrect,
         .fb_copyarea            = tgafb_copyarea,
         .fb_imageblit           = tgafb_imageblit,
-        .fb_cursor              = soft_cursor,
 };
 
 
diff --git a/drivers/video/tridentfb.c b/drivers/video/tridentfb.c
index 81a6d9f188cf..9ac2d3171187 100644
--- a/drivers/video/tridentfb.c
+++ b/drivers/video/tridentfb.c
@@ -1293,7 +1293,6 @@ static struct fb_ops tridentfb_ops = {
         .fb_fillrect = tridentfb_fillrect,
         .fb_copyarea= tridentfb_copyarea,
         .fb_imageblit = cfb_imageblit,
-        .fb_cursor = soft_cursor,
 };
 
 module_init(tridentfb_init);
diff --git a/drivers/video/tx3912fb.c b/drivers/video/tx3912fb.c
index 39d9ca71856b..d904da44e1aa 100644
--- a/drivers/video/tx3912fb.c
+++ b/drivers/video/tx3912fb.c
@@ -89,7 +89,6 @@ static struct fb_ops tx3912fb_ops = {
         .fb_fillrect    = cfb_fillrect,
         .fb_copyarea    = cfb_copyarea,
         .fb_imageblit   = cfb_imageblit,
-        .fb_cursor      = soft_cursor,
 };
 
 static int tx3912fb_check_var(struct fb_var_screeninfo *var, struct fb_info *info)
diff --git a/drivers/video/valkyriefb.c b/drivers/video/valkyriefb.c
index 31a2bbc53974..ce97ec8eae97 100644
--- a/drivers/video/valkyriefb.c
+++ b/drivers/video/valkyriefb.c
@@ -135,7 +135,6 @@ static struct fb_ops valkyriefb_ops = {
         .fb_fillrect    = cfb_fillrect,
         .fb_copyarea    = cfb_copyarea,
         .fb_imageblit   = cfb_imageblit,
-        .fb_cursor      = soft_cursor,
 };
 
 /* Sets the video mode according to info->var */
diff --git a/drivers/video/vesafb.c b/drivers/video/vesafb.c
index 3cc23106641d..e25eae1a78c1 100644
--- a/drivers/video/vesafb.c
+++ b/drivers/video/vesafb.c
@@ -48,7 +48,7 @@ static struct fb_fix_screeninfo vesafb_fix __initdata = {
 };
 
 static int             inverse   = 0;
-static int             mtrr      = 3; /* default to write-combining */
+static int             mtrr      = 0; /* disable mtrr */
 static int             vram_remap __initdata = 0; /* Set amount of memory to be used */
 static int             vram_total __initdata = 0; /* Set total amount of memory */
 static int             pmi_setpal = 0;  /* pmi for palette changes ??? */
@@ -166,45 +166,39 @@ static int vesafb_setcolreg(unsigned regno, unsigned red, unsigned green,
         if (regno >= info->cmap.len)
                 return 1;
 
-        switch (info->var.bits_per_pixel) {
-        case 8:
+        if (info->var.bits_per_pixel == 8)
                 vesa_setpalette(regno,red,green,blue);
-                break;
-        case 16:
-                if (info->var.red.offset == 10) {
-                        /* 1:5:5:5 */
-                        ((u32*) (info->pseudo_palette))[regno] =        
+        else if (regno < 16) {
+                switch (info->var.bits_per_pixel) {
+                case 16:
+                        if (info->var.red.offset == 10) {
+                                /* 1:5:5:5 */
+                                ((u32*) (info->pseudo_palette))[regno] =
                                         ((red   & 0xf800) >>  1) |
                                         ((green & 0xf800) >>  6) |
                                         ((blue  & 0xf800) >> 11);
-                } else {
-                        /* 0:5:6:5 */
-                        ((u32*) (info->pseudo_palette))[regno] =        
+                        } else {
+                                /* 0:5:6:5 */
+                                ((u32*) (info->pseudo_palette))[regno] =
                                         ((red   & 0xf800)      ) |
                                         ((green & 0xfc00) >>  5) |
                                         ((blue  & 0xf800) >> 11);
+                        }
+                        break;
+                case 24:
+                case 32:
+                        red   >>= 8;
+                        green >>= 8;
+                        blue  >>= 8;
+                        ((u32 *)(info->pseudo_palette))[regno] =
+                                (red   << info->var.red.offset)   |
+                                (green << info->var.green.offset) |
+                                (blue  << info->var.blue.offset);
+                        break;
                 }
-                break;
-        case 24:
-                red   >>= 8;
-                green >>= 8;
-                blue  >>= 8;
-                ((u32 *)(info->pseudo_palette))[regno] =
-                        (red   << info->var.red.offset)   |
-                        (green << info->var.green.offset) |
-                        (blue  << info->var.blue.offset);
-                break;
-        case 32:
-                red   >>= 8;
-                green >>= 8;
-                blue  >>= 8;
-                ((u32 *)(info->pseudo_palette))[regno] =
-                        (red   << info->var.red.offset)   |
-                        (green << info->var.green.offset) |
-                        (blue  << info->var.blue.offset);
-                break;
-    }
-    return 0;
+        }
+
+        return 0;
 }
 
 static struct fb_ops vesafb_ops = {
@@ -215,7 +209,6 @@ static struct fb_ops vesafb_ops = {
         .fb_fillrect    = cfb_fillrect,
         .fb_copyarea    = cfb_copyarea,
         .fb_imageblit   = cfb_imageblit,
-        .fb_cursor      = soft_cursor,
 };
 
 static int __init vesafb_setup(char *options)
diff --git a/drivers/video/vfb.c b/drivers/video/vfb.c
index 92d46555dd86..8794dc5d2466 100644
--- a/drivers/video/vfb.c
+++ b/drivers/video/vfb.c
@@ -92,7 +92,6 @@ static struct fb_ops vfb_ops = {
         .fb_fillrect    = cfb_fillrect,
         .fb_copyarea    = cfb_copyarea,
         .fb_imageblit   = cfb_imageblit,
-        .fb_cursor      = soft_cursor,
         .fb_mmap        = vfb_mmap,
 };
 
diff --git a/drivers/video/vga16fb.c b/drivers/video/vga16fb.c
index b46454c55c91..690bb6fe8281 100644
--- a/drivers/video/vga16fb.c
+++ b/drivers/video/vga16fb.c
@@ -1326,7 +1326,6 @@ static struct fb_ops vga16fb_ops = {
         .fb_fillrect    = vga16fb_fillrect,
         .fb_copyarea    = vga16fb_copyarea,
         .fb_imageblit   = vga16fb_imageblit,
-        .fb_cursor      = soft_cursor,
 };
 
 #ifndef MODULE
diff --git a/drivers/video/w100fb.c b/drivers/video/w100fb.c
index cf8cdb108fd9..48e70f153c4b 100644
--- a/drivers/video/w100fb.c
+++ b/drivers/video/w100fb.c
@@ -397,7 +397,6 @@ static struct fb_ops w100fb_ops = {
         .fb_fillrect  = cfb_fillrect,
         .fb_copyarea  = cfb_copyarea,
         .fb_imageblit = cfb_imageblit,
-        .fb_cursor    = soft_cursor,
 };
 
 #ifdef CONFIG_PM
diff --git a/drivers/w1/w1_ds2433.c b/drivers/w1/w1_ds2433.c
index 279e0e0363d6..1e3d98aac12d 100644
--- a/drivers/w1/w1_ds2433.c
+++ b/drivers/w1/w1_ds2433.c
@@ -299,10 +299,8 @@ static int w1_f23_add_slave(struct w1_slave *sl)
 static void w1_f23_remove_slave(struct w1_slave *sl)
 {
 #ifdef CONFIG_W1_F23_CRC
-        if (sl->family_data) {
-                kfree(sl->family_data);
-                sl->family_data = NULL;
-        }
+        kfree(sl->family_data);
+        sl->family_data = NULL;
 #endif  /* CONFIG_W1_F23_CRC */
         sysfs_remove_bin_file(&sl->dev.kobj, &w1_f23_bin_attr);
 }